1 files changed, 22 insertions, 19 deletions

diff --git a/gl/getopt.c b/gl/getopt.c
index 1e2441c4..6b155e6c 100644
--- a/gl/getopt.c
+++ b/gl/getopt.c
@@ -1,5 +1,5 @@
 /* Getopt for GNU.
-   Copyright (C) 1987-2023 Free Software Foundation, Inc.
+   Copyright (C) 1987-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
@@ -21,7 +21,7 @@
 # include <config.h>
 #endif
 
-#include "getopt.h"
+#include <getopt.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -42,7 +42,7 @@
 # define funlockfile(fp) _IO_funlockfile (fp)
 #else
 # include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext ("gnulib", msgid)
 /* When used standalone, flockfile and funlockfile might not be
    available.  */
 # if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \
@@ -223,8 +223,9 @@ process_long_option (int argc, char **argv, const char *optstring,
     {
       /* Didn't find an exact match, so look for abbreviations.  */
       unsigned char *ambig_set = NULL;
-      int ambig_malloced = 0;
-      int ambig_fallback = 0;
+      /* Use simpler fallback diagnostic if ambig_set == &ambig_fallback.  */
+      unsigned char ambig_fallback;
+      void *ambig_malloced = NULL;
       int indfound = -1;
 
       for (p = longopts, option_index = 0; p->name; p++, option_index++)
@@ -242,39 +243,42 @@ process_long_option (int argc, char **argv, const char *optstring,
                      || pfound->val != p->val)
               {
                 /* Second or later nonexact match found.  */
-                if (!ambig_fallback)
+                if (ambig_set != &ambig_fallback)
                   {
                     if (!print_errors)
                       /* Don't waste effort tracking the ambig set if
                          we're not going to print it anyway.  */
-                      ambig_fallback = 1;
+                      ambig_set = &ambig_fallback;
                     else if (!ambig_set)
                       {
                         if (__libc_use_alloca (n_options))
                           ambig_set = alloca (n_options);
-                        else if ((ambig_set = malloc (n_options)) == NULL)
-                          /* Fall back to simpler error message.  */
-                          ambig_fallback = 1;
                         else
-                          ambig_malloced = 1;
+                          {
+                            ambig_malloced = malloc (n_options);
+                            /* Fall back to simpler diagnostic if
+                               memory allocation fails.  */
+                            ambig_set = (ambig_malloced ? ambig_malloced
+                                         : &ambig_fallback);
+                          }
 
-                        if (ambig_set)
+                        if (ambig_set != &ambig_fallback)
                           {
                             memset (ambig_set, 0, n_options);
                             ambig_set[indfound] = 1;
                           }
                       }
-                    if (ambig_set)
+                    if (ambig_set && ambig_set != &ambig_fallback)
                       ambig_set[option_index] = 1;
                   }
               }
           }
 
-      if (ambig_set || ambig_fallback)
+      if (ambig_set)
         {
           if (print_errors)
             {
-              if (ambig_fallback)
+              if (ambig_set == &ambig_fallback)
                 fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"),
                          argv[0], prefix, d->__nextchar);
               else
@@ -296,8 +300,7 @@ process_long_option (int argc, char **argv, const char *optstring,
                   funlockfile (stderr);
                 }
             }
-          if (ambig_malloced)
-            free (ambig_set);
+          free (ambig_malloced);
           d->__nextchar += strlen (d->__nextchar);
           d->optind++;
           d->optopt = 0;
@@ -720,7 +723,7 @@ _getopt_internal (int argc, char **argv, const char *optstring,
   return result;
 }
 
-/* glibc gets a LSB-compliant getopt and a POSIX-complaint __posix_getopt.
+/* glibc gets a LSB-compliant getopt and a POSIX-compliant __posix_getopt.
    Standalone applications just get a POSIX-compliant getopt.
    POSIX and LSB both require these functions to take 'char *const *argv'
    even though this is incorrect (because of the permutation).  */
@@ -729,7 +732,7 @@ _getopt_internal (int argc, char **argv, const char *optstring,
   NAME (int argc, char *const *argv, const char *optstring)     \
   {                                                             \
     return _getopt_internal (argc, (char **)argv, optstring,    \
-                             0, 0, 0, POSIXLY_CORRECT);         \
+                             NULL, NULL, 0, POSIXLY_CORRECT);   \
   }
 
 #ifdef _LIBC