Changeset 3140 for trunk/src/kmk/getopt.c

Timestamp:

Mar 14, 2018, 10:28:10 PM (7 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 4.2.1 (2e55f5e4abdc0e38c1d64be703b446695e70b3b6 / ​https://git.savannah.gnu.org/git/make.git).

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• getopt.c (modified) (11 diffs)

trunk/src/kmk/getopt.c

@@ -4 +4 @@
 before changing it!
 
-Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
-1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010 Free Software Foundation, Inc.
+Copyright (C) 1987-2016 Free Software Foundation, Inc.
 
 NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -84 +82 @@
 
 
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
+/* This version of `getopt' appears to the caller like standard Unix 'getopt'
    but it behaves differently for the user, since it allows the user
    to intersperse the options with the other arguments.
@@ -202 +200 @@
 # endif
 
+#ifndef KMK
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
-
 #ifndef getenv
 extern char *getenv ();
 #endif
+#endif /* !KMK */
 
 static char *
@@ -662 +661 @@
         {
           if (opterr)
-            fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+            fprintf (stderr, _("%s: option '%s' is ambiguous\n"),
                      argv[0], argv[optind]);
           nextchar += strlen (nextchar);
@@ -683 +682 @@
                 {
                   if (opterr)
-                    {
-                      if (argv[optind - 1][1] == '-')
-                        /* --option */
-                        fprintf (stderr,
-                         _("%s: option `--%s' doesn't allow an argument\n"),
-                         argv[0], pfound->name);
-                      else
-                        /* +option or -option */
-                        fprintf (stderr,
-                         _("%s: option `%c%s' doesn't allow an argument\n"),
-                         argv[0], argv[optind - 1][0], pfound->name);
-                    }
+                  { /* bird: disambiguate */
+                   if (argv[optind - 1][1] == '-')
+                    /* --option */
+                    fprintf (stderr,
+                     _("%s: option '--%s' doesn't allow an argument\n"),
+                     argv[0], pfound->name);
+                   else
+                    /* +option or -option */
+                    fprintf (stderr,
+                     _("%s: option '%c%s' doesn't allow an argument\n"),
+                     argv[0], argv[optind - 1][0], pfound->name);
+                  }
 
                   nextchar += strlen (nextchar);
@@ -710 +709 @@
                   if (opterr)
                     fprintf (stderr,
-                           _("%s: option `%s' requires an argument\n"),
+                           _("%s: option '%s' requires an argument\n"),
                            argv[0], argv[optind - 1]);
                   nextchar += strlen (nextchar);
@@ -739 +738 @@
               if (argv[optind][1] == '-')
                 /* --option */
-                fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+                fprintf (stderr, _("%s: unrecognized option '--%s'\n"),
                          argv[0], nextchar);
               else
                 /* +option or -option */
-                fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+                fprintf (stderr, _("%s: unrecognized option '%c%s'\n"),
                          argv[0], argv[optind][0], nextchar);
             }
@@ -849 +848 @@
           {
             if (opterr)
-              fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+              fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"),
                        argv[0], argv[optind]);
             nextchar += strlen (nextchar);
@@ -868 +867 @@
                     if (opterr)
                       fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
+%s: option '-W %s' doesn't allow an argument\n"),
                                argv[0], pfound->name);
 
@@ -883 +882 @@
                     if (opterr)
                       fprintf (stderr,
-                               _("%s: option `%s' requires an argument\n"),
+                               _("%s: option '%s' requires an argument\n"),
                                argv[0], argv[optind - 1]);
                     nextchar += strlen (nextchar);
@@ -1010 +1009 @@
 
         case 'c':
-          printf ("option c with value `%s'\n", optarg);
+          printf ("option c with value '%s'\n", optarg);
           break;