Changeset 422af2b in mainline

Timestamp:

2012-05-12T21:48:24Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

68f57e1

Parents:

af42a2b

Message:

Properly wrap getopt* in libposix

Location:

uspace/lib/posix

Files:

• getopt.c (modified) (1 diff)
• unistd.h (modified) (2 diffs)

uspace/lib/posix/getopt.c

@@ -42 +42 @@
     const char *opt_string, const struct option *long_opts, int *long_index)
 {
-        return getopt_long(argc, argv, opt_string, long_opts, long_index);
+        int rc = getopt_long(argc, argv, opt_string, long_opts, long_index);
+        posix_optarg = (char *) optarg;
+        return rc;
 }
 
+int posix_getopt(int argc, char * const argv[], const char *opt_string)
+{
+        int rc = getopt(argc, argv, opt_string);
+        posix_optarg = (char *) optarg;
+        return rc;
+}

uspace/lib/posix/unistd.h

@@ -45 +45 @@
 extern char *posix_optarg;
 extern int optind, opterr, optopt;
-extern int getopt(int, char * const [], const char *);
+extern int posix_getopt(int, char * const [], const char *);
 
 /* Environment */
@@ -143 +143 @@
 
 #ifndef LIBPOSIX_INTERNAL
+        #define getopt posix_getopt
         #define optarg posix_optarg