Changeset 945

Timestamp:

Jan 11, 2004, 4:18:28 PM (22 years ago)

Author:

bird

Message:

Use the getopt_long.c getopt().

Location:

trunk/src/emx/src/lib/bsd/stdlib

Files:

• getopt.c (deleted)
• getopt_long.c (modified) (7 diffs, 1 prop)

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

@@ -52 +52 @@
 #include <string.h>
 
+#ifdef __EMX__
+#define REPLACE_GETOPT
+#endif
+
 /* not part of the original file */
 #ifndef _DIAGASSERT
@@ -130 +134 @@
                 c = a % b;
         }
-           
+        
         return b;
 }
@@ -231 +235 @@
                         if (IN_ORDER) {
                                 /*
-                                 * GNU extension: 
+                                 * GNU extension:
                                  * return non-option as argument to option 1
                                  */
@@ -277 +281 @@
         if (optchar == 'W' && oli[1] == ';') {          /* -W long-option */
                 /* XXX: what if no long options provided (called by getopt)? */
-                if (*place) 
+                if (*place)
                         return -2;
 
@@ -327 +331 @@
  */
 int
-getopt(nargc, nargv, options)
+_STD(getopt)(nargc, nargv, options)
         int nargc;
         char * const *nargv;
@@ -404 +408 @@
                 } else
                         current_argv_len = strlen(current_argv);
-            
+        
                 for (i = 0; long_options[i].name; i++) {
                         /* find matching long option */
@@ -485 +489 @@
                         *long_options[match].flag = long_options[match].val;
                         retval = 0;
-                } else 
+                } else
                         retval = long_options[match].val;
                 if (idx)