Changeset 927 for trunk/src

Timestamp:

Jan 2, 2004, 8:17:21 PM (22 years ago)

Author:

bird

Message:

Initial porting.

Location:

trunk/src/emx/src/lib/bsd

Files:

• gen/getprogname.c (modified) (1 diff, 1 prop)
• gen/setprogname.c (modified) (2 diffs, 1 prop)
• stdlib/getopt.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/bsd/gen/getprogname.c

@@ -8 +8 @@
 #include "libc_private.h"
 
+#ifdef __EMX__
+#define INCL_BASE
+#define INCL_FSMACROS
+#include <os2emx.h>
+#include <string.h>
+const char *__progname = NULL;
+#endif
+
 __weak_reference(_getprogname, getprogname);
+
 
 const char *
 _getprogname(void)
 {
+#ifdef __EMX__
+    /*
+     * On demand initiation.
+     * THREADS: The assignment isn't safe.
+     * THREADS: pib_pchcmd is pointing into environment space which in theory
+     *          can be changed by any other thread while we're parsing it.
+     */
+    if (!__progname)
+    {
+        char *psz, *psz2;
+        PTIB ptib;
+        PPIB ppib;
+        FS_VAR();
 
+        FS_SAVE();
+        DosGetInfoBlocks(&ptib, &ppib);
+        FS_RESTORE();
+
+        psz = ppib->pib_pchcmd;
+        psz2 = strlen(psz) + psz;
+        while (psz2 >= psz)
+        {
+            if (*psz2 == '\\' || *psz2 == '/' || *psz2 == ':')
+                break;
+            psz2--;
+        }
+        psz2++;
+        /* This is in the volatile env. block - dupe it. */
+        __progname = strdup(psz2);
+    }
+#endif
         return (__progname);
 }

trunk/src/emx/src/lib/bsd/gen/setprogname.c

@@ -10 +10 @@
 setprogname(const char *progname)
 {
-        const char *p;
-
+    const char *p;
+#ifdef __EMX__
+    p = strlen(progname) + progname;
+    while (p >= progname)
+    {
+        if (*p == '\\' || *p == '/' || *p == ':')
+        {
+            __progname = p + 1;
+            return;
+        }
+        p--;
+    }
+    __progname = progname;
+    return;
+#else
         p = strrchr(progname, '/');
         if (p != NULL)
@@ -17 +30 @@
         else
                 __progname = progname;
+#endif
 }

trunk/src/emx/src/lib/bsd/stdlib/getopt.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "un-namespace.h"
 
@@ -61 +62 @@
  */
 int
-getopt(nargc, nargv, ostr)
+_STD(getopt)(nargc, nargv, ostr)
         int nargc;
         char * const *nargv;