Move Cmd_Exec() from main.c to job.c and fix its prototype. This

results in a warning that will go away soon.

Patch:		7.198
Submitted by:	Max Okumoto <okumoto@ucsd.edu>

usr.bin/make/job.c

@@ -2851,3 +2851,113 @@ JobRestartJobs(void)
 		JobRestart(job);
 	}
 }
+
+/**
+ * Cmd_Exec
+ *	Execute the command in cmd, and return the output of that command
+ *	in a string.
+ *
+ * Results:
+ *	A string containing the output of the command, or the empty string
+ *	If error is not NULL, it contains the reason for the command failure
+ *
+ * Side Effects:
+ *	The string must be freed by the caller.
+ */
+Buffer *
+Cmd_Exec(const char *cmd, const char **error)
+{
+	int	fds[2];	/* Pipe streams */
+	int	cpid;	/* Child PID */
+	int	pid;	/* PID from wait() */
+	int	status;	/* command exit status */
+	Buffer	*buf;	/* buffer to store the result */
+	ssize_t	rcnt;
+
+	*error = NULL;
+	buf = Buf_Init(0);
+
+	if (shellPath == NULL)
+		Shell_Init();
+	/*
+	 * Open a pipe for fetching its output
+	 */
+	if (pipe(fds) == -1) {
+		*error = "Couldn't create pipe for \"%s\"";
+		return (buf);
+	}
+
+	/*
+	 * Fork
+	 */
+	switch (cpid = vfork()) {
+	  case 0:
+		/*
+		 * Close input side of pipe
+		 */
+		close(fds[0]);
+
+		/*
+		 * Duplicate the output stream to the shell's output, then
+		 * shut the extra thing down. Note we don't fetch the error
+		 * stream...why not? Why?
+		 */
+		dup2(fds[1], 1);
+		close(fds[1]);
+
+		{
+			char	*args[4];
+
+			/* Set up arguments for shell */
+			args[0] = shellName;
+			args[1] = "-c";
+			args[2] = cmd;
+			args[3] = NULL;
+
+			execv(shellPath, args);
+			_exit(1);
+			/*NOTREACHED*/
+		}
+
+	  case -1:
+		*error = "Couldn't exec \"%s\"";
+		return (buf);
+
+	  default:
+		/*
+		 * No need for the writing half
+		 */
+		close(fds[1]);
+
+		do {
+			char	result[BUFSIZ];
+
+			rcnt = read(fds[0], result, sizeof(result));
+			if (rcnt != -1)
+				Buf_AddBytes(buf, (size_t)rcnt, (Byte *)result);
+		} while (rcnt > 0 || (rcnt == -1 && errno == EINTR));
+
+		if (rcnt == -1)
+			*error = "Error reading shell's output for \"%s\"";
+
+		/*
+		 * Close the input side of the pipe.
+		 */
+		close(fds[0]);
+
+		/*
+		 * Wait for the process to exit.
+		 */
+		while (((pid = wait(&status)) != cpid) && (pid >= 0))
+			continue;
+
+		if (status)
+			*error = "\"%s\" returned non-zero status";
+
+		Buf_StripNewlines(buf);
+
+		break;
+	}
+	return (buf);
+}
+

usr.bin/make/job.h

@@ -53,6 +53,7 @@
 #include "sprite.h"
 
 struct GNode;
+struct Buffer;
 
 #define	TMPPAT	"/tmp/makeXXXXXXXXXX"
 
@@ -84,4 +85,6 @@ int Job_Finish(void);
 void Job_Wait(void);
 void Job_AbortAll(void);
 
+struct Buffer *Cmd_Exec(const char *, const char **);
+
 #endif /* job_h_4678dfd1 */

usr.bin/make/main.c

@@ -1127,115 +1127,6 @@ ReadMakefile(const char *p)
 	return (TRUE);
 }
 
-/**
- * Cmd_Exec
- *	Execute the command in cmd, and return the output of that command
- *	in a string.
- *
- * Results:
- *	A string containing the output of the command, or the empty string
- *	If error is not NULL, it contains the reason for the command failure
- *
- * Side Effects:
- *	The string must be freed by the caller.
- */
-Buffer *
-Cmd_Exec(char *cmd, const char **error)
-{
-	int	fds[2];	/* Pipe streams */
-	int	cpid;	/* Child PID */
-	int	pid;	/* PID from wait() */
-	int	status;	/* command exit status */
-	Buffer	*buf;	/* buffer to store the result */
-	ssize_t	rcnt;
-
-	*error = NULL;
-	buf = Buf_Init(0);
-
-	if (shellPath == NULL)
-		Shell_Init();
-	/*
-	 * Open a pipe for fetching its output
-	 */
-	if (pipe(fds) == -1) {
-		*error = "Couldn't create pipe for \"%s\"";
-		return (buf);
-	}
-
-	/*
-	 * Fork
-	 */
-	switch (cpid = vfork()) {
-	  case 0:
-		/*
-		 * Close input side of pipe
-		 */
-		close(fds[0]);
-
-		/*
-		 * Duplicate the output stream to the shell's output, then
-		 * shut the extra thing down. Note we don't fetch the error
-		 * stream...why not? Why?
-		 */
-		dup2(fds[1], 1);
-		close(fds[1]);
-
-		{
-			char	*args[4];
-
-			/* Set up arguments for shell */
-			args[0] = shellName;
-			args[1] = "-c";
-			args[2] = cmd;
-			args[3] = NULL;
-
-			execv(shellPath, args);
-			_exit(1);
-			/*NOTREACHED*/
-		}
-
-	  case -1:
-		*error = "Couldn't exec \"%s\"";
-		return (buf);
-
-	  default:
-		/*
-		 * No need for the writing half
-		 */
-		close(fds[1]);
-
-		do {
-			char	result[BUFSIZ];
-
-			rcnt = read(fds[0], result, sizeof(result));
-			if (rcnt != -1)
-				Buf_AddBytes(buf, (size_t)rcnt, (Byte *)result);
-		} while (rcnt > 0 || (rcnt == -1 && errno == EINTR));
-
-		if (rcnt == -1)
-			*error = "Error reading shell's output for \"%s\"";
-
-		/*
-		 * Close the input side of the pipe.
-		 */
-		close(fds[0]);
-
-		/*
-		 * Wait for the process to exit.
-		 */
-		while (((pid = wait(&status)) != cpid) && (pid >= 0))
-			continue;
-
-		if (status)
-			*error = "\"%s\" returned non-zero status";
-
-		Buf_StripNewlines(buf);
-
-		break;
-	}
-	return (buf);
-}
-
 /*
  * usage --
  *	exit with usage message

usr.bin/make/nonints.h

@@ -46,6 +46,5 @@ struct Buffer;
 
 void Main_ParseArgLine(char *, int);
 int Main_ParseWarn(const char *, int);
-Buffer *Cmd_Exec(char *, const char **);
 
 #endif /* nonints_h_33c5dafb */

usr.bin/make/var.c

@@ -95,6 +95,7 @@ __FBSDID("$FreeBSD$");
 #include "config.h"
 #include "globals.h"
 #include "GNode.h"
+#include "job.h"
 #include "make.h"
 #include "nonints.h"
 #include "parse.h"