Use PROGRAM_NAME in place of string in parse_long_options call.

diff --git a/src/cat.c b/src/cat.c
index 503efe7e54ec081e78d11ed32852c0dcf7ce2cb2..38596731c2b70438d5121e6b0ccde8ca26c5a0d4 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -534,7 +534,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "cat", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Torbjorn Granlund and Richard M. Stallman", usage);
 
   /* Parse command line options.  */

diff --git a/src/cksum.c b/src/cksum.c
index 2f3cf38c8981aaf8b8235aed7fcb17ef71f5cf45..60ed6d4c8da881741bc024991600f2487add2c79 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -290,7 +290,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "cksum", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Q. Frank Xia", usage);
 
   have_read_stdin = 0;

diff --git a/src/comm.c b/src/comm.c
index 774aee07f8ba732c6e84a1f100ac2abd73d0ed3a..504a15763e4501275a30c2f2718a57086d0d7ebd 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -217,7 +217,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "comm", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Richard Stallman and David MacKenzie", usage);
 
   only_file_1 = 1;

diff --git a/src/csplit.c b/src/csplit.c
index b993ecd3742745845281fc0990f2b8143bbfa71f..9e1148c6f0e8eee9cff563566406f8ff5871cf16 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -1375,7 +1375,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "csplit", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Stuart Kemp and David MacKenzie", usage);
 
   global_argv = argv;

diff --git a/src/cut.c b/src/cut.c
index 05bf8433d3e4b596d108405de1bd228c13d2bc63..94360c1e047397f0a1773e4136279b02148dd714 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -692,7 +692,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "cut", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "David Ihnat, David MacKenzie, and Jim Meyering", usage);
 
   operating_mode = undefined_mode;

diff --git a/src/expand.c b/src/expand.c
index b1c448ea9d48b676cb0c660cedb135d83e14c39a..d4484842bb3a8cbe7de90fa69250cb8e60794ab5 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -336,7 +336,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "expand", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "David MacKenzie", usage);
 
   while ((c = getopt_long (argc, argv, "it:,0123456789", longopts, NULL)) != -1)

diff --git a/src/fmt.c b/src/fmt.c
index 81f69175430fa591baa760e0930d980606f44713..bc1a97a877568336b984f161916df3843ddef298 100644 (file)
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -313,7 +313,7 @@ main (register int argc, register char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "fmt", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Ross Paterson", usage);
 
   crown = tagged = split = uniform = FALSE;

diff --git a/src/fold.c b/src/fold.c
index a3c387ec98b11ec6e441ac1bc2e2da0fb8a268be..630a2f8c45df4625a6c8ab89ac4f7f4359b918a1 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -239,7 +239,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "fold", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "David MacKenzie", usage);
 
   break_spaces = count_bytes = have_read_stdin = 0;

diff --git a/src/head.c b/src/head.c
index ad03cdd4a338dae2147f043e614aff9072572a74..3a890dfa5082e5fee0274b02f2b4b757631e77d5 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -264,7 +264,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "head", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "David MacKenzie", usage);
 
   have_read_stdin = 0;

diff --git a/src/join.c b/src/join.c
index e74bbab678162712bf7195e7ab8ed6464768cefa..8073a56364ef42d3bd4d5cffd06fdda3355195e2 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -740,7 +740,7 @@ main (int argc, char **argv)
      it may be increased.  */
   uni_blank.nfields = 1;
 
-  parse_long_options (argc, argv, "join", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Mike Haertel", usage);
 
   nfiles = 0;

diff --git a/src/md5sum.c b/src/md5sum.c
index c0973fb00b9b171bccd5117afbe8deb5c00056ce..93ae441341b5d0209e2909279f4e0d6d02218799 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -475,7 +475,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "md5sum", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Ulrich Drepper", usage);
 
   while ((opt = getopt_long (argc, argv, "bctw", long_options, NULL)) != -1)

diff --git a/src/nl.c b/src/nl.c
index b0b3c85dd07c0bec95428072d57f2718c188d8f4..6f686875dec156fee5ce43861304f82be485b258 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -448,7 +448,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "nl", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Scott Bartram and David MacKenzie", usage);
 
   have_read_stdin = 0;

diff --git a/src/od.c b/src/od.c
index dd2176282c0149678200fbafa22454882535ad4f..42a2cd956c1218344c58841a3983f602e7aa15c0 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -1596,7 +1596,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "od", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Jim Meyering", usage);
 
   err = 0;

diff --git a/src/paste.c b/src/paste.c
index bdf31ccdeaa656276155c9e01ad7cb26d330ffe2..d3a648883643b89630ec030c87bb6c4f313f941e 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -434,7 +434,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "paste", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "David M. Ihnat", usage);
 
   have_read_stdin = 0;

diff --git a/src/pr.c b/src/pr.c
index 43ab930eae93f67e4868008079ef875a1069bdb3..87729d4a08f92785bc88c9ecac70a4db686bd1af 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -825,7 +825,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "pr", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Pete TerMaat and Roland Huebner", usage);
 
   n_files = 0;

diff --git a/src/ptx.c b/src/ptx.c
index 75c4f94b0d92ed9adcfa3223448dd8f81c36af4e..06a315b9a01a456ad72c7ecaad14cb5ec7d3bdf5 100644 (file)
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -1966,7 +1966,7 @@ main (int argc, char **argv)
   setchrclass (NULL);
 #endif
 
-  parse_long_options (argc, argv, "ptx", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "François Pinard", usage);
 
   while (optchar = getopt_long (argc, argv, "ACF:GM:ORS:TW:b:i:fg:o:trw:",

diff --git a/src/sort.c b/src/sort.c
index 20c05e152e492e1ecd56c0bd94eedee2ae41fec4..c0c98ead781b86778ca83ad795b42528296b73c4 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -2528,7 +2528,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "sort", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Mike Haertel", usage);
 
   have_read_stdin = 0;

diff --git a/src/split.c b/src/split.c
index 9a0407c5164e637c04d3f2ad1a4e54e2dd7fdeb0..a350aa8759516b6bafd7fc0ff0391f48d718b6ed 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -345,7 +345,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "split", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Torbjorn Granlund and Richard M. Stallman", usage);
 
   /* Parse command line options.  */

diff --git a/src/sum.c b/src/sum.c
index c2c7fc076adf183dbed6f85d2d1542caf499e242..8a76c23e0cf077d49b8c1467cfecb930246b61f3 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -212,7 +212,7 @@ main (int argc, char **argv)
 
   have_read_stdin = 0;
 
-  parse_long_options (argc, argv, "sum", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Kayvan Aghaiepour and David MacKenzie", usage);
 
   while ((optc = getopt_long (argc, argv, "rs", longopts, NULL)) != -1)

diff --git a/src/tac.c b/src/tac.c
index ca640b81e798c836274c6a1a432ae892af2440f1..dca32bde45fdf1ecbbea84cc8bcaadf7e434b10e 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -612,7 +612,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "tac", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Jay Lepreau and David MacKenzie", usage);
 
   errors = 0;

diff --git a/src/tail.c b/src/tail.c
index 09ef59edaf2938c720519d6b20a7c889b5be3de3..0f0177a551ad1d90c5b1183ca108add2cba8290c 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -1340,7 +1340,7 @@ main (int argc, char **argv)
 
   have_read_stdin = 0;
 
-  parse_long_options (argc, argv, "tail", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
            "Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering",
                      usage);
 

diff --git a/src/tr.c b/src/tr.c
index 75c763a10b3c11c4efb2c70e0324dc44b9ed415a..8e52293e7400f6daae3247a8c88c00f69b6a3704 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -1801,7 +1801,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "tr", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Jim Meyering", usage);
 
   while ((c = getopt_long (argc, argv, "cdst", long_options, NULL)) != -1)

diff --git a/src/tsort.c b/src/tsort.c
index 3cf94799e27f8fa7e9a9debbe2e0d26f90f3828c..e7fdc349e6d0250db31f056fe28019d24644ba8e 100644 (file)
--- a/src/tsort.c
+++ b/src/tsort.c
@@ -459,7 +459,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "tsort", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Mark Kettenis", usage);
 
   while ((opt = getopt_long (argc, argv, "", long_options, NULL)) != -1)

diff --git a/src/unexpand.c b/src/unexpand.c
index e9ed348eab5c8a92ec559befb6c3706fded62374..22fa0fd664cbb34255bd48c656f7a50edc50c24d 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -387,7 +387,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "unexpand", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "David MacKenzie", usage);
 
   have_read_stdin = 0;

diff --git a/src/uniq.c b/src/uniq.c
index b08f190f866f7e70d71ee3427fbebdb590257099..c3457c302b1e98684ef31335b9b315337014c2aa 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -287,7 +287,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "uniq", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Richard Stallman and David MacKenzie", usage);
 
   skip_chars = 0;

diff --git a/src/wc.c b/src/wc.c
index 9750a774b2458f070a6d81c711f4ae135d4038b1..db2365c96f1b9eabc1d5f616e49b3c74190f1738 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -300,7 +300,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "wc", GNU_PACKAGE, VERSION,
+  parse_long_options (argc, argv, PROGRAM_NAME, GNU_PACKAGE, VERSION,
                      "Paul Rubin and David MacKenzie", usage);
 
   exit_status = 0;