The R Project SVN – R – Diff – /branches/R-exp-R5/src/main/sysutils.c

+    }
     UNPROTECT(1);
     return (ans);
+}
-#ifdef HAVE_POPEN
 FILE *R_popen(const char *command, const char *type)
+{
     FILE *fp;
 #ifdef __APPLE_CC__
     /* Luke recommends this to fix PR#1140 */
 #else
     fp = popen(command, type);
 #endif
     return fp;
+}
-#endif /* HAVE_POPEN */
 int R_system(const char *command)
+{
-    int val;
+    int res;
 #ifdef __APPLE_CC__
     /* Luke recommends this to fix PR#1140 */
     sigset_t ss;
     sigemptyset(&ss);
     sigaddset(&ss, SIGPROF);
 #ifdef HAVE_AQUA
     char *cmdcpy;
     if(useaqua) {
 	/* FIXME, is Cocoa's interface not const char*? */
 	cmdcpy = acopy_string(command);
-	val = ptr_CocoaSystem(cmdcpy);
+	res = ptr_CocoaSystem(cmdcpy);
+    }
     else
 #endif
-    val = system(command);
+    res = system(command);
     sigprocmask(SIG_UNBLOCK, &ss, NULL);
 #else
-    val = system(command);
+    res = system(command);
 #endif
+#ifdef HAVE_SYS_WAIT_H
+	if (WIFEXITED(res)) res = WEXITSTATUS(res);
+	else res = 0;
+#else
+	/* assume that this is shifted if a multiple of 256 */
+	if ((res % 256) == 0) res = res/256;
+#endif
-    return val;
+    return res;
+}
 #if defined(__APPLE__)
 # include <crt_externs.h>
 # define environ (*_NSGetEnviron())

The R Project SVN R