Changeset 2b3dd78 in mainline for uspace/lib/c/generic/getopt.c

Timestamp:

2018-01-31T12:02:00Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/c/generic/getopt.c (modified) (4 diffs)

uspace/lib/c/generic/getopt.c

@@ -49 +49 @@
 int     optopt = '?';           /* character checked for validity */
 int     optreset;               /* reset getopt */
-const char *optarg;             /* argument associated with option */
+char    *optarg;                /* argument associated with option */
 
 
@@ -67 +67 @@
 #define INORDER (int)1
 
-#define EMSG    ""
+static char EMSG[] = "";
 
 static int getopt_internal(int, char **, const char *);
@@ -73 +73 @@
 static void permute_args(int, int, int, char **);
 
-static const char *place = EMSG; /* option letter processing */
+static char *place = EMSG; /* option letter processing */
 
 /* XXX: set optreset to 1 rather than these two */
@@ -336 +336 @@
         if (retval == -2) {
                 char *current_argv;
-                const char *has_equal;
+                char *has_equal;
                 size_t current_argv_len;
                 int i, ambiguous, match;