Use new macros, HELP_OPTION_DESCRIPTION and VERSION_OPTION_DESCRIPTION

instead of hard-coding --help and --version descriptions.

diff --git a/src/chgrp.c b/src/chgrp.c
index 46fe034143df1ff1cd7744bfe5e3b67136e50cd3..a827f754860947ed17b1045ed9d7e6a4b6a6054e 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -147,10 +147,8 @@ Change the group membership of each FILE to GROUP.\n\
   -R, --recursive        operate on files and directories recursively\n\
   -v, --verbose          output a diagnostic for every file processed\n\
 "), stdout);
-      fputs (_("\
-      --help             display this help and exit\n\
-      --version          output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/chmod.c b/src/chmod.c
index 953bb79590954b92e42b238fa9ffed0db2fa5b4b..82cdacea9bc224d557b67dd14c49d60fbcebbba3 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -255,10 +255,8 @@ Change the mode of each FILE to MODE.\n\
       --reference=RFILE   use RFILE's mode instead of MODE values\n\
   -R, --recursive         change files and directories recursively\n\
 "), stdout);
-      fputs (_("\
-      --help              display this help and exit\n\
-      --version           output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n\

diff --git a/src/chown.c b/src/chown.c
index ce81ace3122b784975e90c8a2e590207bc7ad0f1..d7f3c982c776e3cc9f22977b8a7de476e12236d9 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -128,10 +128,8 @@ Change the owner and/or group of each FILE to OWNER and/or GROUP.\n\
   -R, --recursive        operate on files and directories recursively\n\
   -v, --verbose          output a diagnostic for every file processed\n\
 "), stdout);
-      fputs (_("\
-      --help             display this help and exit\n\
-      --version          output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 Owner is unchanged if missing.  Group is unchanged if missing, but changed\n\

diff --git a/src/cp.c b/src/cp.c
index 0cab4f5d2323ee2280d32cca84cd7dc75138d31b..6a16ba139513574529e30fd55b0a6a0b01f4ee81 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -225,10 +225,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -v, --verbose                explain what is being done\n\
   -x, --one-file-system        stay on this file system\n\
 "), stdout);
-      fputs (_("\
-      --help                   display this help and exit\n\
-      --version                output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 By default, sparse SOURCE files are detected by a crude heuristic and the\n\

diff --git a/src/dd.c b/src/dd.c
index 56db4fc1529e76b5f7851f432ae4b05fcff59fa7..f138f0f75ab259918de6ee634dd4dce84bbfff71 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -305,10 +305,8 @@ Copy a file, converting and formatting according to the options.\n\
   seek=BLOCKS     skip BLOCKS obs-sized blocks at start of output\n\
   skip=BLOCKS     skip BLOCKS ibs-sized blocks at start of input\n\
 "), stdout);
-      fputs (_("\
-      --help      display this help and exit\n\
-      --version   output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 BLOCKS and BYTES may be followed by the following multiplicative suffixes:\n\

diff --git a/src/df.c b/src/df.c
index cc126347de4b4203da8d242a7dcf2f5d207b252a..3d84fa54b878605b10d8b0def28681bce14c3de1 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -781,10 +781,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -x, --exclude-type=TYPE   limit listing to filesystems not of type TYPE\n\
   -v                    (ignored)\n\
 "), stdout);
-      fputs (_("\
-      --help            display this help and exit\n\
-      --version         output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/dircolors.c b/src/dircolors.c
index 9b0745f6abc51877b131b4afd866e56a5f2882f9..46ccc010e0fc8229fdb7a74077faef634fda819e 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -110,10 +110,8 @@ Determine format of output:\n\
   -c, --csh, --c-shell        output C shell code to set LS_COLORS\n\
   -p, --print-database        output defaults\n\
 "), stdout);
-      fputs (_("\
-      --help                  display this help and exit\n\
-      --version               output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 If FILE is specified, read it to determine which colors to use for which\n\

diff --git a/src/du.c b/src/du.c
index 09ace435d5a8843fca3fc55a25a88de063a24505..4aaf0540b6ddd8cfde15d189b0a3082d8f261801 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -222,10 +222,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
                           line argument;  --max-depth=0 is the same as\n\
                           --summarize\n\
 "), stdout);
-      fputs (_("\
-      --help            display this help and exit\n\
-      --version         output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/install.c b/src/install.c
index b0849fe9c64ecca1eef2dec789902e3fe1c2329a..8efb2acb23021b976f173124438b648acb1ace6e 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -634,10 +634,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -S, --suffix=SUFFIX override the usual backup suffix\n\
   -v, --verbose       print the name of each directory as it is created\n\
 "), stdout);
-      fputs (_("\
-      --help          display this help and exit\n\
-      --version       output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\

diff --git a/src/ln.c b/src/ln.c
index de088c6b305a1adf02cc5698efeb7e15030c2e4d..c3d51e996d6e8d605876c88a0a533c2e813eb634 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -372,10 +372,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
                                 the links\n\
   -v, --verbose               print name of each file before linking\n\
 "), stdout);
-      fputs (_("\
-      --help                  display this help and exit\n\
-      --version               output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\

diff --git a/src/ls.c b/src/ls.c
index faea02e3402b27709c0c5d6130fcf6d75785c31c..2416e1e2f515130391ed7c861a06a283bcac428b 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -3667,10 +3667,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -X                         sort alphabetically by entry extension\n\
   -1                         list one file per line\n\
 "), stdout);
-      fputs (_("\
-      --help                 display this help and exit\n\
-      --version              output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 By default, color is not used to distinguish types of files.  That is\n\

diff --git a/src/mkdir.c b/src/mkdir.c
index b3bfb5cda274b88addd46b1d34622a8d0a35e7ca..2b00c2f6d61453c1c07db48a9a98870de5552cdb 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -71,10 +71,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -p, --parents     no error if existing, make parent directories as needed\n\
   -v, --verbose     print a message for each created directory\n\
 "), stdout);
-      fputs (_("\
-      --help        display this help and exit\n\
-      --version     output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/mkfifo.c b/src/mkfifo.c
index 0eae7694390a726d9cc6d4e66cb8d70f9cad3c2d..9972030127af578afb7b77fea8965a929cc5fae2 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -63,10 +63,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       fputs (_("\
   -m, --mode=MODE   set permission mode (as in chmod), not a=rw - umask\n\
 "), stdout);
-      fputs (_("\
-      --help        display this help and exit\n\
-      --version     output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/mknod.c b/src/mknod.c
index 7e34bd4e6fbbe71e3c93da633509016e810f0903..810d63ef38bebd0167f1e1ea0c74b971a2e6ae18 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -73,10 +73,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
       fputs (_("\
   -m, --mode=MODE   set permission mode (as in chmod), not a=rw - umask\n\
 "), stdout);
-      fputs (_("\
-      --help        display this help and exit\n\
-      --version     output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 MAJOR MINOR are forbidden for TYPE p, mandatory otherwise.  TYPE may be:\n\

diff --git a/src/mv.c b/src/mv.c
index 30ac2ccf33d71a6522e0561d1e244000ad127c4a..a500d9f1c53473c872dfccb246f2a136b7327b66 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -362,12 +362,10 @@ Mandatory arguments to long options are mandatory for short options too.\n\
                                  destination file is missing\n\
   -v, --verbose                explain what is being done\n\
 "), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
-      --help                   display this help and exit\n\
-      --version                output version information and exit\n\
 \n\
-"), stdout);
-      fputs (_("\
 The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n\
 The version control method may be selected via the --backup option or through\n\
 the VERSION_CONTROL environment variable.  Here are the values:\n\

diff --git a/src/rm.c b/src/rm.c
index a3f214b66bde7267645fb4890b661ea22948feeb..9c105efe2ae6163c761e0b1a63e0f139c3deace5 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -94,10 +94,8 @@ Remove (unlink) the FILE(s).\n\
   -r, -R, --recursive   remove the contents of directories recursively\n\
   -v, --verbose         explain what is being done\n\
 "), stdout);
-      fputs (_("\
-      --help            display this help and exit\n\
-      --version         output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       printf (_("\
 \n\
 To remove a file whose name starts with a `-', for example `-foo',\n\

diff --git a/src/rmdir.c b/src/rmdir.c
index 8276816a6a0ec19c6b5a0b1fbd7a6612719936d8..cebeac31672d93ae3638c9bf22306bc26a1556b3 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -155,10 +155,8 @@ Remove the DIRECTORY(ies), if they are empty.\n\
                   similar to `rmdir a/b/c a/b a'.\n\
   -v, --verbose   output a diagnostic for every directory processed\n\
 "), stdout);
-      fputs (_("\
-      --help      display this help and exit\n\
-      --version   output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/shred.c b/src/shred.c
index 7bb3edf892dbf56eae9561515638aca125f3d44f..91ad58ea440896e77f623b7e13003d75807ac605 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -483,10 +483,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -z, --zero     add a final overwrite with zeros to hide shredding\n\
   -              shred standard output\n\
 "), stdout);
-      fputs (_("\
-      --help     display this help and exit\n\
-      --version  output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 Delete FILE(s) if --remove (-u) is specified.  The default is not to remove\n\

diff --git a/src/stat.c b/src/stat.c
index e65242c14ed223b95c3389b240cc98ed65b1b925..cd63fe20329e537f2c67d55c11d4601e11d33836 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -304,10 +304,8 @@ Display file or filesystem status.\n\
   -f, --filesystem     display filesystem status instead of file status\n\
   -t, --terse          print the information in terse form\n\
 "), stdout);
-      fputs (_("\
-      --help            display this help and exit\n\
-      --version         output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/sync.c b/src/sync.c
index 5c0ea52ecc001a98a59865f1c72cad0e0f58d3d4..40bb5715b74a6df45abc655f59b964368d439996 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -46,10 +46,8 @@ usage (int status)
 Force changed blocks to disk, update the super block.\n\
 \n\
 "), stdout);
-      fputs (_("\
-      --help        display this help and exit\n\
-      --version     output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       puts (_("\nReport bugs to <bug-fileutils@gnu.org>."));
     }
   exit (status);

diff --git a/src/touch.c b/src/touch.c
index 3590cb51bffc62cb9a774cce315c7221082abd14..e3ec8ae475687e1b7b8fa9bc8a84b4cd7ca6eace 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -248,10 +248,8 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   --time=WORD            set time given by WORD: access atime use (same as -a)\n\
                            modify mtime (same as -m)\n\
 "), stdout);
-      fputs (_("\
-      --help             display this help and exit\n\
-      --version          output version information and exit\n\
-"), stdout);
+      fputs (HELP_OPTION_DESCRIPTION, stdout);
+      fputs (VERSION_OPTION_DESCRIPTION, stdout);
       fputs (_("\
 \n\
 Note that the three time-date formats recognized for the -d and -t options\n\