Factor out various ways to execute subprocesses into separate functions. This is so that they can be implemented properly for Windows. For now, though, they are left in blaze_util.cc since the Windows implementations aren't there yet. -- MOS_MIGRATED_REVID=120709884
diff --git a/src/main/cpp/blaze_util.h b/src/main/cpp/blaze_util.h index e0d1b2b..86a8256 100644 --- a/src/main/cpp/blaze_util.h +++ b/src/main/cpp/blaze_util.h
@@ -82,12 +82,11 @@ // Enable messages mostly of interest to developers. bool VerboseLogging(); -// Read the JVM version from a file descriptor. The fd should point -// to the output of a "java -version" execution and is supposed to contains -// a string of the form 'version "version-number"' in the first 255 bytes. -// If the string is found, version-number is returned, else the empty string -// is returned. -string ReadJvmVersion(int fd); +// Read the JVM version from a string. The string should contain the output of a +// "java -version" execution and is supposed to contain a string of the form +// 'version "version-number"' in the first 255 bytes. If the string is found, +// version-number is returned, else the empty string is returned. +string ReadJvmVersion(const string& version_string); // Get the version string from the given java executable. The java executable // is supposed to output a string in the form '.*version ".*".*'. This method