Adapt hash_command_output() to use split_into_strings()

diff --git a/src/hashutil.cpp b/src/hashutil.cpp
index 0e13b00ccf9dc7c711132e6c43266d7c84d1c155..f9c0920043b8ca4ad1d0c26fc04ab09cb8c95e63 100644 (file)
--- a/src/hashutil.cpp
+++ b/src/hashutil.cpp
@@ -433,17 +433,11 @@ hash_multicommand_output(struct hash* hash,
                          const char* commands,
                          const char* compiler)
 {
-  char* command_string = x_strdup(commands);
-  char* p = command_string;
-  char* command;
-  char* saveptr = nullptr;
   bool ok = true;
-  while ((command = strtok_r(p, ";", &saveptr))) {
-    if (!hash_command_output(hash, command, compiler)) {
+  for (const std::string& cmd : Util::split_into_strings(commands, ";")) {
+    if (!hash_command_output(hash, cmd.c_str(), compiler)) {
       ok = false;
     }
-    p = nullptr;
   }
-  free(command_string);
   return ok;
 }