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 9fb86659a48502946b4292eb36ea7afafb0c2883..b6dc494cfc6e047b7f46311d9139a84b8cfda6e7 100644 (file)
--- 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 79ed2526dcee86605dc7f09afc840d806870081c..f7fb82d009a101abb9dc44929cd3c40bac1e4f99 100644 (file)
--- 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 3e6b2a1cf4a31c167424b23524ac8c9ebb94178a..9d3ed88afce20a0ff59fc517d216eb3878c45951 100644 (file)
--- 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 e33fd3495dc81ae1ff53583bfc8dcdb4d1f89395..6a654678d943b450e9eabaa06837877792ea535b 100644 (file)
--- 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 2dabfa0792207e77c0eea21443cdb31fe92ed7a7..095c187539a0f8d7d8cc5a2c4d55158f74a09d3c 100644 (file)
--- 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)