From: Bruno Haible <bruno@clisp.org>
Date: Sat, 28 Jun 2025 00:12:58 +0000 (+0200)
Subject: msgconv, msgen, msgfilter, msggrep, msgmerge: The option '-n' takes no argument.
X-Git-Tag: v0.26~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8caa0b51ba44b79e70dde21fa3a1268916da1dc2;p=thirdparty%2Fgettext.git

msgconv, msgen, msgfilter, msggrep, msgmerge: The option '-n' takes no argument.

This was a regression from 2014-03-24.

* gettext-tools/src/msgconv.c (main): Change "n:" to "n" in getopt_long
argument.
* gettext-tools/src/msgen.c (main): Likewise.
* gettext-tools/src/msgfilter.c (main): Likewise.
* gettext-tools/src/msggrep.c (main): Likewise.
* gettext-tools/src/msgmerge.c (main): Likewise.
---

diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index 9fb86659a..b6dc494cf 100644
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -130,7 +130,7 @@ main (int argc, char **argv)
   output_file = NULL;
   input_file = NULL;
 
-  while ((opt = getopt_long (argc, argv, "D:eEFhin:o:pPst:Vw:", long_options,
+  while ((opt = getopt_long (argc, argv, "D:eEFhino:pPst:Vw:", long_options,
                              NULL))
          != EOF)
     switch (opt)
diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index 79ed2526d..f7fb82d00 100644
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -132,7 +132,7 @@ main (int argc, char **argv)
   output_file = NULL;
 
   while ((opt = getopt_long (argc, argv,
-                             "D:eEFhin:o:pPsVw:",
+                             "D:eEFhino:pPsVw:",
                              long_options, NULL)) != EOF)
     switch (opt)
       {
diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index 3e6b2a1cf..9d3ed88af 100644
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -166,7 +166,7 @@ main (int argc, char **argv)
 
   /* The '+' in the options string causes option parsing to terminate when
      the first non-option, i.e. the subprogram name, is encountered.  */
-  while ((opt = getopt_long (argc, argv, "+D:EFhi:n:o:pPsVw:", long_options,
+  while ((opt = getopt_long (argc, argv, "+D:EFhi:no:pPsVw:", long_options,
                              NULL))
          != EOF)
     switch (opt)
diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index e33fd3495..6a654678d 100644
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -191,7 +191,7 @@ main (int argc, char **argv)
       gt->case_insensitive = false;
     }
 
-  while ((opt = getopt_long (argc, argv, "CD:e:Ef:FhiJKM:n:N:o:pPTvVw:X",
+  while ((opt = getopt_long (argc, argv, "CD:e:Ef:FhiJKM:nN:o:pPTvVw:X",
                              long_options, NULL))
          != EOF)
     switch (opt)
diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index 2dabfa079..095c18753 100644
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -218,7 +218,7 @@ main (int argc, char **argv)
   output_file = NULL;
   color = NULL;
 
-  while ((opt = getopt_long (argc, argv, "C:D:eEFhimn:No:pPqsUvVw:",
+  while ((opt = getopt_long (argc, argv, "C:D:eEFhimnNo:pPqsUvVw:",
                              long_options, NULL))
          != EOF)
     switch (opt)