Changeset 629 for trunk/src/ash/eval.c

Timestamp:

Nov 26, 2006, 12:47:02 PM (19 years ago)

Author:

bird

Message:

porting in progress.

File:

• trunk/src/ash/eval.c (modified) (5 diffs)

trunk/src/ash/eval.c

@@ -51 +51 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#ifdef HAVE_SYSCTL_H
 #include <sys/sysctl.h>
+#endif
 
 /*
@@ -604 +606 @@
 syspath(void)
 {
+#ifdef CTL_USER
         static char *sys_path = NULL;
         static int mib[] = {CTL_USER, USER_CS_PATH};
+#endif 
 #ifdef PC_PATH_SEP
         static char def_path[] = "PATH=/usr/bin;/bin;/usr/sbin;/sbin";
@@ -611 +615 @@
         static char def_path[] = "PATH=/usr/bin:/bin:/usr/sbin:/sbin";
 #endif
+#ifdef CTL_USER
         size_t len;
 
@@ -625 +630 @@
         }
         return sys_path;
+#else
+    return def_path;
+#endif 
 }
 
@@ -1009 +1017 @@
                         optptr = NULL;
                         /* and getopt */
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
                         optreset = 1;
                         optind = 1;
+#else
+                        optind = 0; /* init */
+#endif
+
                         exitstatus = cmdentry.u.bltin(argc, argv);
                 } else {