(main): update --version output to conform to coding standard

diff --git a/src/basename.c b/src/basename.c
index 30670a00909a64cefec399205a2692386497670a..55ae9ffdf5d34c0989e0976a072a6610027eca0a 100644 (file)
--- a/src/basename.c
+++ b/src/basename.c
@@ -93,7 +93,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "basename", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "basename", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1 || argc > 3)
     {

diff --git a/src/chroot.c b/src/chroot.c
index 477125e426a982e80d52f4851bef54642e9bf02c..a4d066f715a6eb4b6daefe1811347d647432760b 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -58,7 +58,7 @@ main (int argc, char **argv)
 {
   program_name = argv[0];
 
-  parse_long_options (argc, argv, "chroot", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "chroot", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     {

diff --git a/src/date.c b/src/date.c
index 1d4ac5add2635f0a67dca6539870a3b005a307eb..92655a734af1f7f8f7083f62e2ce815066163179 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -198,7 +198,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("date - %s\n", PACKAGE_VERSION);
+      printf ("date (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/dirname.c b/src/dirname.c
index 199c525fbe35fb55e25266a237c67d049bef8d8a..b201b29afbf028e97e5e0f764a966267e4d6b3d9 100644 (file)
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "dirname", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "dirname", GNU_PACKAGE, VERSION, usage);
 
   if (argc != 2)
     {

diff --git a/src/echo.c b/src/echo.c
index 06d72064dfa17f67f78575e1be06a8bbd1936f7f..466b7e0149d5397d5e5761d86f70871c24e3a5a7 100644 (file)
--- a/src/echo.c
+++ b/src/echo.c
@@ -112,7 +112,7 @@ main (int argc, char **argv)
 
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
-    parse_long_options (argc, argv, "echo", PACKAGE_VERSION, usage);
+    parse_long_options (argc, argv, "echo", GNU_PACKAGE, VERSION, usage);
 
 /* System V machines already have a /bin/sh with a v9 behaviour.  We
    use the identical behaviour for these machines so that the

diff --git a/src/env.c b/src/env.c
index 3d22f64eff8a1d81a51667456ddcceb7774db955..b5a234c9513b4899ff48a4366e6cfa19744008ab 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -140,7 +140,7 @@ main (register int argc, register char **argv, char **envp)
 
   if (show_version)
     {
-      printf ("env - %s\n", PACKAGE_VERSION);
+      printf ("env (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/expr.c b/src/expr.c
index a82ea9c7c5513af3917620661821d2b57d714155..fa980f6f2a7c6bba227868322076cee6530be550 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -161,7 +161,7 @@ main (int argc, char **argv)
 
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
-    parse_long_options (argc, argv, "expr", PACKAGE_VERSION, usage);
+    parse_long_options (argc, argv, "expr", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     {

diff --git a/src/factor.c b/src/factor.c
index 89df403241078f5c3c192797b94ceaac52d53f77..3b8b9eef58b1ab240c44628dea0ad8d99493beb3 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -182,7 +182,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "factor", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "factor", GNU_PACKAGE, VERSION, usage);
 
   fail = 0;
   if (argc == 1)

diff --git a/src/hostname.c b/src/hostname.c
index 590f79eb3f11a9573327443bdb5cdbe08aef4c5c..df80cddd32517fc9a8db1befcd0130fa5f2fe5b1 100644 (file)
--- a/src/hostname.c
+++ b/src/hostname.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "hostname", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "hostname", GNU_PACKAGE, VERSION, usage);
 
 #ifdef HAVE_SETHOSTNAME
   if (argc == 2)

diff --git a/src/id.c b/src/id.c
index e5d8e62138417a8e7a376e58f9aca33ecef33527..8a25392f27992831b0a9d2954d0d910c8548346c 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -133,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("id - %s\n", PACKAGE_VERSION);
+      printf ("id (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/logname.c b/src/logname.c
index 4d10ac4edb40413d16ac5b09f4674c187f9a4ca9..a582bbdc11a4cfaaad801683b27f0fc9c110929c 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -83,7 +83,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("logname - %s\n", PACKAGE_VERSION);
+      printf ("logname (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/nice.c b/src/nice.c
index bd09a204a2b7075b27c0ecf54b754b598ec3e766..b81b78bf7bd2995d8b84a26e88bb5c7f64ef7ff8 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -65,7 +65,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "nice", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "nice", GNU_PACKAGE, VERSION, usage);
 
   for (optind = 1; optind < argc; /* empty */)
     {

diff --git a/src/pathchk.c b/src/pathchk.c
index 5fd4ef21980a21760bfd5bfe77f8b1feff8baa4b..5939f156c971bd84e267270b197b9358503cb6d5 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -142,7 +142,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("pathchk - %s\n", PACKAGE_VERSION);
+      printf ("pathchk (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/printenv.c b/src/printenv.c
index d4c81a5194330008473b078acf0b669fa647eb3b..804f8595010d3be8c09cbdddd900541e002cd9f2 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -101,7 +101,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("printenv - %s\n", PACKAGE_VERSION);
+      printf ("printenv (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/printf.c b/src/printf.c
index 4c327500846f20c5e8adf224732dd84ad4126f96..15339e84846454fce044d42018a0b486645e9cbd 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -140,7 +140,7 @@ main (int argc, char **argv)
 
   /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
   if (getenv ("POSIXLY_CORRECT") == NULL)
-    parse_long_options (argc, argv, "printf", PACKAGE_VERSION, usage);
+    parse_long_options (argc, argv, "printf", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     {

diff --git a/src/pwd.c b/src/pwd.c
index 406cd65bb1d095fb1ba455c1b25abe5126e4ae47..065c14f7075104f7f84c88d11f40e97893e6cb5d 100644 (file)
--- a/src/pwd.c
+++ b/src/pwd.c
@@ -60,7 +60,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "pwd", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "pwd", GNU_PACKAGE, VERSION, usage);
 
   if (argc != 1)
     error (0, 0, _("ignoring non-option arguments"));

diff --git a/src/seq.c b/src/seq.c
index 402550163f5b7ceb8d74f0cfe0ad57d4908e7c6c..fb0f114831833d5d2e306b9817132ca874e88985 100644 (file)
--- a/src/seq.c
+++ b/src/seq.c
@@ -162,7 +162,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("seq - %s\n", PACKAGE_VERSION);
+      printf ("seq (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/sleep.c b/src/sleep.c
index 5e5c8e199f8e9e4e437ecb18e10c72a6699e664b..625ecf9dd618de792e1275f937c1f3502814f14d 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -87,7 +87,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("sleep - %s\n", PACKAGE_VERSION);
+      printf ("sleep (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/stty.c b/src/stty.c
index a6fb7f573769acbbfe6d53914a66b38eba261958..a5632d690bc6b5be357468844b2ce985e144c10d 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -650,7 +650,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "stty", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "stty", GNU_PACKAGE, VERSION, usage);
 
   output_type = changed;
   verbose_output = 0;

diff --git a/src/su.c b/src/su.c
index bca680beec2a7f77077f11d49bdb1146e2bca2e6..e8096e745ef12e8a1f1aaa1104b9fbe9146f1b3b 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -491,7 +491,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("su - %s\n", PACKAGE_VERSION);
+      printf ("su (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/tee.c b/src/tee.c
index 44c49de55db07f430f0877a913f0c68eeeaed667..458c50ba489052ae08a9c5455b9078fc9e8999bf 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -114,7 +114,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tee - %s\n", PACKAGE_VERSION);
+      printf ("tee (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/test.c b/src/test.c
index e5d6d41b6499c0c4baeb4467511f244fb52020ad..c4fbb3f992fb3bac67a7ff136ce3f77cfd2b1efa 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1076,7 +1076,7 @@ main (int margc, char **margv)
     {
       /* Don't recognize --help or --version if POSIXLY_CORRECT is set.  */
       if (getenv ("POSIXLY_CORRECT") == NULL)
-       parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
+       parse_long_options (argc, argv, COMMAND_NAME, GNU_PACKAGE, VERSION, usage);
 
       --margc;
 
@@ -1093,7 +1093,7 @@ main (int margc, char **margv)
   if (pos >= argc)
     test_exit (SHELL_BOOLEAN (FALSE));
 
-  parse_long_options (argc, argv, COMMAND_NAME, PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, COMMAND_NAME, GNU_PACKAGE, VERSION, usage);
   value = posixtest ();
 
   if (pos != argc)

diff --git a/src/tty.c b/src/tty.c
index 193bb5e5c640f9dfa0cdffb8ce72a5b432cada22..f5039a296f36c365e13bbe1d4dbfef54af4d0abb 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("tty - %s\n", PACKAGE_VERSION);
+      printf ("tty (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/uname.c b/src/uname.c
index 583031eed8d698cfa922deaf2c74413d65687a67..ed5c1f62637126a231d586f102fe4e2ab5e5f3af 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -133,7 +133,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("uname - %s\n", PACKAGE_VERSION);
+      printf ("uname (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/who-users.c b/src/who-users.c
index ebf0c1920565ebe73f42a63a99f2abf80e31c967..1041641943073547d6a90bd67030785c05602991 100644 (file)
--- a/src/who-users.c
+++ b/src/who-users.c
@@ -728,7 +728,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("%s - %s\n", COMMAND_NAME, PACKAGE_VERSION);
+      printf ("%s - %s\n", COMMAND_NAME, GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/whoami.c b/src/whoami.c
index 8a7159d5b5c56c14d945ee9907d07f01b1ca0e9d..632c7aaae31db33b1fdf14cd560b69a674c89a74 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -88,7 +88,7 @@ main (int argc, char **argv)
 
   if (show_version)
     {
-      printf ("whoami - %s\n", PACKAGE_VERSION);
+      printf ("whoami (%s) %s\n", GNU_PACKAGE, VERSION);
       exit (0);
     }
 

diff --git a/src/yes.c b/src/yes.c
index 0a1171c5aac02eb37ff4eac99ea129f36bd99a34..67e70a14a26374781f4f78601955811e4c4a789d 100644 (file)
--- a/src/yes.c
+++ b/src/yes.c
@@ -55,7 +55,7 @@ main (int argc, char **argv)
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
-  parse_long_options (argc, argv, "yes", PACKAGE_VERSION, usage);
+  parse_long_options (argc, argv, "yes", GNU_PACKAGE, VERSION, usage);
 
   if (argc == 1)
     while (1)