From: mar <mar>
Date: Tue, 22 Sep 1992 14:16:03 +0000 (+0000)
Subject: make it  compile on AIX
X-Git-Tag: release77~399
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/984bd8efca31e25058e1eb24c79bf6540e92b479

make it  compile on AIX
---

diff --git a/update/exec_002.c b/update/exec_002.c
index 887c4b13..eea17735 100644
--- a/update/exec_002.c
+++ b/update/exec_002.c
@@ -24,19 +24,27 @@ extern CONNECTION conn;
 extern int code, errno, uid;
 extern char *whoami;
 
+#if defined(vax) || defined(ibm032)
+#define WEXITSTATUS(waitb) ((waitb).w_retcode)
+#endif
+
 
 int
 exec_002(str)
     char *str;
 {
+#ifdef _AIX
+    int waitb;
+#else
     union wait waitb;
+#endif
     int n, pid, mask;
 
     if (config_lookup("noexec")) {
 	code = EPERM;
 	code = send_object(conn, (char *)&code, INTEGER_T);
 	com_err(whoami, code, "Not allowed to execute");
-	return;
+	return(0);
     }
     str += 8;
     while (*str == ' ')
@@ -52,7 +60,7 @@ exec_002(str)
 	code = send_object(conn, (char *)&n, INTEGER_T);
 	if (code)
 	    exit(1);
-	return;
+	return(0);
     case 0:
 	if (setuid(uid) < 0) {
 	    com_err(whoami, errno, "Unable to setuid to %d\n", uid);
@@ -71,10 +79,11 @@ exec_002(str)
 	    n = wait(&waitb);
 	} while (n != -1 && n != pid);
 	sigsetmask(mask);
-	if (waitb.w_status) {
-	    n = waitb.w_retcode + ERROR_TABLE_BASE_sms;
+	if (WEXITSTATUS(waitb)) {
+	    n = WEXITSTATUS(waitb) + ERROR_TABLE_BASE_sms;
 	    log_priority = log_ERROR;
-	    com_err(whoami, n, " child exited with status %d", waitb.w_retcode);
+	    com_err(whoami, n, " child exited with status %d",
+		    WEXITSTATUS(waitb));
 	    code = send_object(conn, (char *)&n, INTEGER_T);
 	    if (code) {
 		exit(1);