.

diff --git a/src/date.c b/src/date.c
index 3b2959565a90123c6818b088b1640ce45bc7cdce..69e866574fb98a1ef2a1a527e4cfd5d084a62c32 100644 (file)
--- a/src/date.c
+++ b/src/date.c
@@ -144,7 +144,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("date - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/env.c b/src/env.c
index db40c615664f6626dfc896410d5f8783bc591b3f..dc3f10ed39998a11c5e83fae3dec7a4b08a1fa38 100644 (file)
--- a/src/env.c
+++ b/src/env.c
@@ -151,7 +151,7 @@ main (argc, argv, envp)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("env - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/groups.sh b/src/groups.sh
index 7d84058699bbd7c9d05ccb4cb95dd0eac50e0567..bbe56aae60b4e3d21b3c53859c5a38ab73a5e7e8 100755 (executable)
--- a/src/groups.sh
+++ b/src/groups.sh
@@ -22,6 +22,26 @@
 # it to be somewhere else in PATH if not installed yet.
 PATH=@bindir@:$PATH
 
+usage="Usage: $0 [OPTION]... [USERNAME]...
+
+  --help      display this help and exit
+  --version   output version information and exit
+
+Same as id -Gn.  If no USERNAME, use current process."
+
+case $# in
+  1 )
+    case "z${1}" in 
+      z--help )
+        echo "$usage"; exit 0 ;;
+      z--version )
+        echo "groups - @VERSION@"; exit 0 ;;
+      * ) ;;
+    esac
+    ;;
+  * ) ;;
+esac
+
 if [ $# -eq 0 ]; then
   id -Gn
 else

diff --git a/src/id.c b/src/id.c
index 957e4aa984335ec89dac364d8259822112394637..2b9e13710ccc936562c2f7ac0cd3e818a6cc26e8 100644 (file)
--- a/src/id.c
+++ b/src/id.c
@@ -150,7 +150,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("id - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/logname.c b/src/logname.c
index 413b22fcd1085fe021760587beaa40d0521bf99c..a7b3675fac8bfc6ac574ff59adf37f0d7e84a6c9 100644 (file)
--- a/src/logname.c
+++ b/src/logname.c
@@ -92,7 +92,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("logname - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/nice.c b/src/nice.c
index a0814651fe5a589719b98ece2023f4b842ce1e70..0d3dcbb76921e057dc81f589b80a0d583bd902a3 100644 (file)
--- a/src/nice.c
+++ b/src/nice.c
@@ -110,7 +110,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("nice - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/nohup.sh b/src/nohup.sh
index 00908b5ba8e6a11c335a0d48ee44fa82ed675c06..3eae667471652bacff13c05cc268930c9a85a8e8 100755 (executable)
--- a/src/nohup.sh
+++ b/src/nohup.sh
@@ -22,11 +22,35 @@
 # it to be somewhere else in PATH if not installed yet.
 PATH=@bindir@:$PATH
 
+usage="Usage: $0 COMMAND [ARG]...
+  or:  $0 OPTION"
+
+usage_try="
+Try \`$0 --help' for more information."
+
+usage_help="
+  --help      display this help and exit
+  --version   output version information and exit"
+
 if [ $# -eq 0 ]; then
-  echo "Usage: nohup command [arg...]" 2>&1
+  echo >&2 "$usage"
+  echo >&2 "$usage_try"
   exit 1
 fi
 
+case $# in
+  1 )
+    case "z${1}" in 
+      z--help )
+        echo "$usage"; echo "$usage_help"; exit 0 ;;
+      z--version )
+        echo "nohup - @VERSION@"; exit 0 ;;
+      * ) ;;
+    esac
+    ;;
+  * ) ;;
+esac
+
 trap "" 1
 oldmask=`umask`; umask 077
 # Only redirect the output if the user didn't already do it.

diff --git a/src/pathchk.c b/src/pathchk.c
index 0a0d40a7fbb0578822aca8a64a3b58d3b4692efd..b509102adc96b9c88ec3ec751ef45477bd05424c 100644 (file)
--- a/src/pathchk.c
+++ b/src/pathchk.c
@@ -152,7 +152,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("pathchk - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/printenv.c b/src/printenv.c
index b5e3c8940b64523bf69f8b80a48f44f2772f528e..f7118ab774419ce36089639500e543099e7cc013 100644 (file)
--- a/src/printenv.c
+++ b/src/printenv.c
@@ -114,7 +114,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("printenv - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/sleep.c b/src/sleep.c
index b7a2a1e23e145c018e6d5b35582f96c0d8e36124..7172866b889eb01de7063b0f4dea18fbac5aad67 100644 (file)
--- a/src/sleep.c
+++ b/src/sleep.c
@@ -99,7 +99,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("sleep - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/su.c b/src/su.c
index 2f7e0ec1abbddd241b2f620a369d0b2a4ac70208..96785fbb22fcbb74caedd2bb13488be00c822d7b 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -247,7 +247,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("su - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/tee.c b/src/tee.c
index 707de908cd3caf588676b3aa68aac7e5eef65f28..e9407e8000ab4aa7f9f3f4024032259d29823ff7 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -122,7 +122,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("tee - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/tty.c b/src/tty.c
index a7a100af287b7d16e44952b33dd11043360826de..4f49897e26c3490ac66c2f24469ea0f46d70c3fd 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -94,7 +94,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("tty - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/uname.c b/src/uname.c
index e63c2298afb236f716890ad6e0999b7db399b542..4f0fda9bb3e5290ad530383fbb9bcf221bcc7124 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -143,7 +143,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("uname - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/who.c b/src/who.c
index 1acf7f2774ec52724b814fc041012d10ad102fc5..548beb75ca6d4b5c8b0cfa2926803839005a8121 100644 (file)
--- a/src/who.c
+++ b/src/who.c
@@ -188,7 +188,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("who - %s\n", version_string);
       exit (0);
     }
 

diff --git a/src/whoami.c b/src/whoami.c
index 833ae1421373bde83fdce6d8f6523b032bf0c5b8..68d715350224f8c459ee3ca47c74ea83abe1eed0 100644 (file)
--- a/src/whoami.c
+++ b/src/whoami.c
@@ -99,7 +99,7 @@ main (argc, argv)
 
   if (show_version)
     {
-      printf ("%s\n", version_string);
+      printf ("whoami - %s\n", version_string);
       exit (0);
     }