Now that gnulib's quote/quotearg use 'quotes', not `quotes' begin the process of updating coreutils and its tests to match that new behavior.
Blindly updating to latest from gnulib would have induced 87 test failures. >From 22af6d97526e52e1fc14a86d811c92e421a67577 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 7 Jan 2012 16:42:41 +0100 Subject: [PATCH 1/3] maint: factor out all `Try --help'-emitting statements * src/system.h (emit_try_help): New function. --- src/system.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/system.h b/src/system.h index 5f68af1..ff88cb4 100644 --- a/src/system.h +++ b/src/system.h @@ -556,6 +556,12 @@ emit_ancillary_info (void) "info coreutils '%s invocation'\n"), last_component (program_name)); } +static inline void +emit_try_help (void) +{ + fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name); +} + #include "inttostr.h" static inline char * -- 1.7.9.rc0.2.g4b783 >From 101d1203c667ec3ab54a026dde43117563d4e944 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 7 Jan 2012 16:54:26 +0100 Subject: [PATCH 2/3] maint: use new emit_try_help in place of equivalent fprintf Run this command: perl -0777 -pi -e \ 's/fprintf \(stderr, _\("Try `%s --help.*\n.*;/emit_try_help ();/m'\ src/*.c --- src/base64.c | 3 +-- src/basename.c | 3 +-- src/cat.c | 3 +-- src/chcon.c | 3 +-- src/chgrp.c | 3 +-- src/chmod.c | 3 +-- src/chown.c | 3 +-- src/chroot.c | 3 +-- src/cksum.c | 3 +-- src/comm.c | 3 +-- src/cp.c | 3 +-- src/csplit.c | 3 +-- src/cut.c | 3 +-- src/date.c | 3 +-- src/dd.c | 3 +-- src/df.c | 3 +-- src/dircolors.c | 3 +-- src/dirname.c | 3 +-- src/du.c | 3 +-- src/echo.c | 3 +-- src/env.c | 3 +-- src/expand.c | 3 +-- src/expr.c | 3 +-- src/factor.c | 3 +-- src/fmt.c | 3 +-- src/fold.c | 3 +-- src/getlimits.c | 3 +-- src/groups.c | 3 +-- src/head.c | 3 +-- src/hostid.c | 3 +-- src/hostname.c | 3 +-- src/id.c | 3 +-- src/install.c | 3 +-- src/join.c | 3 +-- src/kill.c | 3 +-- src/link.c | 3 +-- src/ln.c | 3 +-- src/logname.c | 3 +-- src/ls.c | 3 +-- src/md5sum.c | 3 +-- src/mkdir.c | 3 +-- src/mkfifo.c | 3 +-- src/mknod.c | 3 +-- src/mktemp.c | 3 +-- src/mv.c | 3 +-- src/nice.c | 3 +-- src/nl.c | 3 +-- src/nohup.c | 3 +-- src/nproc.c | 3 +-- src/od.c | 3 +-- src/paste.c | 3 +-- src/pathchk.c | 3 +-- src/pinky.c | 3 +-- src/pr.c | 3 +-- src/printenv.c | 3 +-- src/printf.c | 3 +-- src/ptx.c | 3 +-- src/pwd.c | 3 +-- src/readlink.c | 3 +-- src/realpath.c | 3 +-- src/rm.c | 3 +-- src/rmdir.c | 3 +-- src/runcon.c | 3 +-- src/seq.c | 3 +-- src/setuidgid.c | 3 +-- src/shred.c | 3 +-- src/shuf.c | 3 +-- src/sleep.c | 3 +-- src/sort.c | 3 +-- src/split.c | 3 +-- src/stat.c | 3 +-- src/stdbuf.c | 3 +-- src/stty.c | 3 +-- src/su.c | 3 +-- src/sum.c | 3 +-- src/sync.c | 3 +-- src/tac.c | 3 +-- src/tail.c | 3 +-- src/tee.c | 3 +-- src/test.c | 3 +-- src/timeout.c | 3 +-- src/touch.c | 3 +-- src/tr.c | 3 +-- src/truncate.c | 3 +-- src/tsort.c | 3 +-- src/tty.c | 3 +-- src/uname.c | 3 +-- src/unexpand.c | 3 +-- src/uniq.c | 3 +-- src/unlink.c | 3 +-- src/uptime.c | 3 +-- src/users.c | 3 +-- src/wc.c | 3 +-- src/who.c | 3 +-- src/whoami.c | 3 +-- src/yes.c | 3 +-- 96 files changed, 96 insertions(+), 192 deletions(-) diff --git a/src/base64.c b/src/base64.c index 7042267..caf4141 100644 --- a/src/base64.c +++ b/src/base64.c @@ -54,8 +54,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/basename.c b/src/basename.c index 5d339c2..a8e59c2 100644 --- a/src/basename.c +++ b/src/basename.c @@ -43,8 +43,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/cat.c b/src/cat.c index 33a94b6..9352fb2 100644 --- a/src/cat.c +++ b/src/cat.c @@ -82,8 +82,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/chcon.c b/src/chcon.c index 9066122..b62ed3a 100644 --- a/src/chcon.c +++ b/src/chcon.c @@ -345,8 +345,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/chgrp.c b/src/chgrp.c index c4e7b13..f4a2bf6 100644 --- a/src/chgrp.c +++ b/src/chgrp.c @@ -102,8 +102,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/chmod.c b/src/chmod.c index 316ee73..3fb9a82 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -365,8 +365,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/chown.c b/src/chown.c index 9e936a4..2f23b33 100644 --- a/src/chown.c +++ b/src/chown.c @@ -73,8 +73,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/chroot.c b/src/chroot.c index ec18794..4e34680 100644 --- a/src/chroot.c +++ b/src/chroot.c @@ -126,8 +126,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/cksum.c b/src/cksum.c index f529ccd..086d4e1 100644 --- a/src/cksum.c +++ b/src/cksum.c @@ -257,8 +257,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/comm.c b/src/comm.c index a958933..8fd6cb1 100644 --- a/src/comm.c +++ b/src/comm.c @@ -98,8 +98,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/cp.c b/src/cp.c index be4f25b..10ffc9c 100644 --- a/src/cp.c +++ b/src/cp.c @@ -150,8 +150,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/csplit.c b/src/csplit.c index 22c513a..607092a 100644 --- a/src/csplit.c +++ b/src/csplit.c @@ -1443,8 +1443,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/cut.c b/src/cut.c index 624e6ac..a820189 100644 --- a/src/cut.c +++ b/src/cut.c @@ -183,8 +183,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/date.c b/src/date.c index a7917cd..216d5db 100644 --- a/src/date.c +++ b/src/date.c @@ -117,8 +117,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/dd.c b/src/dd.c index d190439..261aee6 100644 --- a/src/dd.c +++ b/src/dd.c @@ -475,8 +475,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/df.c b/src/df.c index fae32cd..e3d55c4 100644 --- a/src/df.c +++ b/src/df.c @@ -840,8 +840,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); diff --git a/src/dircolors.c b/src/dircolors.c index 392c6ef..617e6d9 100644 --- a/src/dircolors.c +++ b/src/dircolors.c @@ -91,8 +91,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [FILE]\n"), program_name); diff --git a/src/dirname.c b/src/dirname.c index 5cb2809..07ac9d8 100644 --- a/src/dirname.c +++ b/src/dirname.c @@ -38,8 +38,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/du.c b/src/du.c index 07a339a..689e9bc 100644 --- a/src/du.c +++ b/src/du.c @@ -253,8 +253,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/echo.c b/src/echo.c index 89943a4..b909656 100644 --- a/src/echo.c +++ b/src/echo.c @@ -36,8 +36,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/env.c b/src/env.c index 0ca7d35..b725b41 100644 --- a/src/env.c +++ b/src/env.c @@ -46,8 +46,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/expand.c b/src/expand.c index c362d11..0eb6955 100644 --- a/src/expand.c +++ b/src/expand.c @@ -98,8 +98,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/expr.c b/src/expr.c index 9502ab3..f17d736 100644 --- a/src/expr.c +++ b/src/expr.c @@ -197,8 +197,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/factor.c b/src/factor.c index 43fbaa6..8a9720d 100644 --- a/src/factor.c +++ b/src/factor.c @@ -488,8 +488,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/fmt.c b/src/fmt.c index 61d5386..e8aaebf 100644 --- a/src/fmt.c +++ b/src/fmt.c @@ -263,8 +263,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [-WIDTH] [OPTION]... [FILE]...\n"), program_name); diff --git a/src/fold.c b/src/fold.c index acfa387..243156a 100644 --- a/src/fold.c +++ b/src/fold.c @@ -60,8 +60,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/getlimits.c b/src/getlimits.c index 749c263..1403ee5 100644 --- a/src/getlimits.c +++ b/src/getlimits.c @@ -59,8 +59,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/groups.c b/src/groups.c index c546214..aae6357 100644 --- a/src/groups.c +++ b/src/groups.c @@ -47,8 +47,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [USERNAME]...\n"), program_name); diff --git a/src/head.c b/src/head.c index c0f2bac..2ef3e92 100644 --- a/src/head.c +++ b/src/head.c @@ -99,8 +99,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/hostid.c b/src/hostid.c index 7f6a1f3..807363c 100644 --- a/src/hostid.c +++ b/src/hostid.c @@ -36,8 +36,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/hostname.c b/src/hostname.c index b18208e..27d8bbe 100644 --- a/src/hostname.c +++ b/src/hostname.c @@ -50,8 +50,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/id.c b/src/id.c index a01a1cc..8e0ca0b 100644 --- a/src/id.c +++ b/src/id.c @@ -75,8 +75,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [USERNAME]\n"), program_name); diff --git a/src/install.c b/src/install.c index ca34e77..45d5e0a 100644 --- a/src/install.c +++ b/src/install.c @@ -587,8 +587,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/join.c b/src/join.c index 763be6d..8473623 100644 --- a/src/join.c +++ b/src/join.c @@ -181,8 +181,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/kill.c b/src/kill.c index 0d09c2b..bdb1c5e 100644 --- a/src/kill.c +++ b/src/kill.c @@ -70,8 +70,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/link.c b/src/link.c index bfe89a9..74dfeb6 100644 --- a/src/link.c +++ b/src/link.c @@ -39,8 +39,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/ln.c b/src/ln.c index 7cceb5f..0c1cd85 100644 --- a/src/ln.c +++ b/src/ln.c @@ -329,8 +329,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/logname.c b/src/logname.c index 9418f66..62a6e9d 100644 --- a/src/logname.c +++ b/src/logname.c @@ -33,8 +33,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]\n"), program_name); diff --git a/src/ls.c b/src/ls.c index ec3bf56..b12f877 100644 --- a/src/ls.c +++ b/src/ls.c @@ -4642,8 +4642,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); diff --git a/src/md5sum.c b/src/md5sum.c index 5f8e55b..7024866 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -156,8 +156,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/mkdir.c b/src/mkdir.c index bedda69..a466841 100644 --- a/src/mkdir.c +++ b/src/mkdir.c @@ -50,8 +50,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... DIRECTORY...\n"), program_name); diff --git a/src/mkfifo.c b/src/mkfifo.c index b2d8db2..743ac4a 100644 --- a/src/mkfifo.c +++ b/src/mkfifo.c @@ -45,8 +45,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... NAME...\n"), program_name); diff --git a/src/mknod.c b/src/mknod.c index 57d8664..dd98b42 100644 --- a/src/mknod.c +++ b/src/mknod.c @@ -46,8 +46,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... NAME TYPE [MAJOR MINOR]\n"), diff --git a/src/mktemp.c b/src/mktemp.c index 7dd377f..9ae6538 100644 --- a/src/mktemp.c +++ b/src/mktemp.c @@ -62,8 +62,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [TEMPLATE]\n"), program_name); diff --git a/src/mv.c b/src/mv.c index 0c38de3..ef39883 100644 --- a/src/mv.c +++ b/src/mv.c @@ -278,8 +278,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/nice.c b/src/nice.c index e5c4a99..56b8249 100644 --- a/src/nice.c +++ b/src/nice.c @@ -66,8 +66,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION] [COMMAND [ARG]...]\n"), program_name); diff --git a/src/nl.c b/src/nl.c index 7546aaa..f3a5298 100644 --- a/src/nl.c +++ b/src/nl.c @@ -176,8 +176,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/nohup.c b/src/nohup.c index 159ff12..e19d294 100644 --- a/src/nohup.c +++ b/src/nohup.c @@ -47,8 +47,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/nproc.c b/src/nproc.c index 66fb2f1..d336054 100644 --- a/src/nproc.c +++ b/src/nproc.c @@ -50,8 +50,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]...\n"), program_name); diff --git a/src/od.c b/src/od.c index 8ef77bf..171e6c8 100644 --- a/src/od.c +++ b/src/od.c @@ -288,8 +288,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/paste.c b/src/paste.c index 789a9a0..3989f66 100644 --- a/src/paste.c +++ b/src/paste.c @@ -429,8 +429,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/pathchk.c b/src/pathchk.c index d35d609..b337a3b 100644 --- a/src/pathchk.c +++ b/src/pathchk.c @@ -83,8 +83,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... NAME...\n"), program_name); diff --git a/src/pinky.c b/src/pinky.c index 00d62069..6f0874d 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -496,8 +496,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [USER]...\n"), program_name); diff --git a/src/pr.c b/src/pr.c index 6a5b7d1..3e473fc 100644 --- a/src/pr.c +++ b/src/pr.c @@ -2762,8 +2762,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/printenv.c b/src/printenv.c index b236396..809f0e0 100644 --- a/src/printenv.c +++ b/src/printenv.c @@ -56,8 +56,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/printf.c b/src/printf.c index d956955..91091fd 100644 --- a/src/printf.c +++ b/src/printf.c @@ -82,8 +82,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/ptx.c b/src/ptx.c index 3d39076..668a31d 100644 --- a/src/ptx.c +++ b/src/ptx.c @@ -1811,8 +1811,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/pwd.c b/src/pwd.c index 593dce3..7b3ab73 100644 --- a/src/pwd.c +++ b/src/pwd.c @@ -50,8 +50,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]...\n"), program_name); diff --git a/src/readlink.c b/src/readlink.c index 4df0d09..5d8cfd9 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -56,8 +56,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... FILE\n"), program_name); diff --git a/src/realpath.c b/src/realpath.c index cb0ef2f..130a665 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -64,8 +64,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); diff --git a/src/rm.c b/src/rm.c index d1904a8..a5edfcf 100644 --- a/src/rm.c +++ b/src/rm.c @@ -128,8 +128,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); diff --git a/src/rmdir.c b/src/rmdir.c index c628ed0..f966ba2 100644 --- a/src/rmdir.c +++ b/src/rmdir.c @@ -158,8 +158,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... DIRECTORY...\n"), program_name); diff --git a/src/runcon.c b/src/runcon.c index 98a0bb0..a70ed79 100644 --- a/src/runcon.c +++ b/src/runcon.c @@ -77,8 +77,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/seq.c b/src/seq.c index 598c5a0..3276614 100644 --- a/src/seq.c +++ b/src/seq.c @@ -62,8 +62,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/setuidgid.c b/src/setuidgid.c index b339bda..39044ce 100644 --- a/src/setuidgid.c +++ b/src/setuidgid.c @@ -43,8 +43,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/shred.c b/src/shred.c index 2f7da9e..5494c2a 100644 --- a/src/shred.c +++ b/src/shred.c @@ -141,8 +141,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); diff --git a/src/shuf.c b/src/shuf.c index f57d31f..1f1fe97 100644 --- a/src/shuf.c +++ b/src/shuf.c @@ -42,8 +42,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/sleep.c b/src/sleep.c index d2a64c2..bae6fd5 100644 --- a/src/sleep.c +++ b/src/sleep.c @@ -39,8 +39,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/sort.c b/src/sort.c index 62db87d..dd7d563 100644 --- a/src/sort.c +++ b/src/sort.c @@ -386,8 +386,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/split.c b/src/split.c index 2eb343b..d0abd65 100644 --- a/src/split.c +++ b/src/split.c @@ -175,8 +175,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/stat.c b/src/stat.c index 3cbc0cb..0d40d99 100644 --- a/src/stat.c +++ b/src/stat.c @@ -1323,8 +1323,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); diff --git a/src/stdbuf.c b/src/stdbuf.c index cc6bd56..a4ec52e 100644 --- a/src/stdbuf.c +++ b/src/stdbuf.c @@ -84,8 +84,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s OPTION... COMMAND\n"), program_name); diff --git a/src/stty.c b/src/stty.c index 855aebc..fa48dbb 100644 --- a/src/stty.c +++ b/src/stty.c @@ -503,8 +503,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/su.c b/src/su.c index 7ad9c43..adac19f 100644 --- a/src/su.c +++ b/src/su.c @@ -365,8 +365,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name); diff --git a/src/sum.c b/src/sum.c index 12f3daf..5a03e4f 100644 --- a/src/sum.c +++ b/src/sum.c @@ -53,8 +53,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/sync.c b/src/sync.c index f395874..2a84f3d 100644 --- a/src/sync.c +++ b/src/sync.c @@ -34,8 +34,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]\n"), program_name); diff --git a/src/tac.c b/src/tac.c index 02c67c9..5c183f5 100644 --- a/src/tac.c +++ b/src/tac.c @@ -127,8 +127,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/tail.c b/src/tail.c index eae5741..123cfba 100644 --- a/src/tail.c +++ b/src/tail.c @@ -252,8 +252,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/tee.c b/src/tee.c index 9f85659..c832c7c 100644 --- a/src/tee.c +++ b/src/tee.c @@ -56,8 +56,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); diff --git a/src/test.c b/src/test.c index 51b6ee8..5bf712a 100644 --- a/src/test.c +++ b/src/test.c @@ -698,8 +698,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { fputs (_("\ diff --git a/src/timeout.c b/src/timeout.c index 17c5f21..ca8f0eb 100644 --- a/src/timeout.c +++ b/src/timeout.c @@ -198,8 +198,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/touch.c b/src/touch.c index 2fc15fe..70d7567 100644 --- a/src/touch.c +++ b/src/touch.c @@ -210,8 +210,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); diff --git a/src/tr.c b/src/tr.c index d2e70b5..5dc065c 100644 --- a/src/tr.c +++ b/src/tr.c @@ -280,8 +280,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/truncate.c b/src/truncate.c index 95df4f0..29cb2fa 100644 --- a/src/truncate.c +++ b/src/truncate.c @@ -90,8 +90,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s OPTION... FILE...\n"), program_name); diff --git a/src/tsort.c b/src/tsort.c index 73d9a10..d3532f9 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -76,8 +76,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/tty.c b/src/tty.c index bf75005..b5c163e 100644 --- a/src/tty.c +++ b/src/tty.c @@ -58,8 +58,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]...\n"), program_name); diff --git a/src/uname.c b/src/uname.c index a283df9..cb290e8 100644 --- a/src/uname.c +++ b/src/uname.c @@ -115,8 +115,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]...\n"), program_name); diff --git a/src/unexpand.c b/src/unexpand.c index 264d114..bdc6cbb 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -108,8 +108,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/uniq.c b/src/uniq.c index c05572b..e4a2d15 100644 --- a/src/uniq.c +++ b/src/uniq.c @@ -128,8 +128,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/unlink.c b/src/unlink.c index fd0be82..d246a86 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -39,8 +39,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/uptime.c b/src/uptime.c index b3b8fb1..16852e8 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -190,8 +190,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [FILE]\n"), program_name); diff --git a/src/users.c b/src/users.c index 810ce91..e956071 100644 --- a/src/users.c +++ b/src/users.c @@ -99,8 +99,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [FILE]\n"), program_name); diff --git a/src/wc.c b/src/wc.c index bdd893a..924732d 100644 --- a/src/wc.c +++ b/src/wc.c @@ -106,8 +106,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ diff --git a/src/who.c b/src/who.c index 68d679c..00d4637 100644 --- a/src/who.c +++ b/src/who.c @@ -643,8 +643,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [ FILE | ARG1 ARG2 ]\n"), program_name); diff --git a/src/whoami.c b/src/whoami.c index fd093f7..1525ec5 100644 --- a/src/whoami.c +++ b/src/whoami.c @@ -39,8 +39,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]...\n"), program_name); diff --git a/src/yes.c b/src/yes.c index 41dc5c3..535c13f 100644 --- a/src/yes.c +++ b/src/yes.c @@ -35,8 +35,7 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("\ -- 1.7.9.rc0.2.g4b783 >From 2e870665301417ce36e9fc00621dfa2e7827d474 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Sat, 7 Jan 2012 17:10:50 +0100 Subject: [PATCH 3/3] maint: update quoting of "Try `prog --help'" to "Try 'prog --help'" Automatically adjust both the source (now in only one place) and all tests that expect the resulting output via this: git grep -l 'Try.*--help' src/system.h tests \ | xargs perl -pi -e 's/Try \\?`(\S+ --help)/'\''$1/' --- src/system.h | 2 +- tests/du/files0-from | 2 +- tests/ls/time-style-diag | 2 +- tests/misc/basename | 4 ++-- tests/misc/comm | 6 +++--- tests/misc/cut | 2 +- tests/misc/dirname | 4 ++-- tests/misc/expr | 2 +- tests/misc/factor | 2 +- tests/misc/fmt | 2 +- tests/misc/invalid-opt | 2 +- tests/misc/mktemp | 4 ++-- tests/misc/printf-cov | 2 +- tests/misc/seq | 2 +- tests/misc/sort-files0-from | 2 +- tests/misc/tsort | 2 +- tests/misc/uniq | 2 +- tests/misc/wc-files0-from | 2 +- tests/mv/diag | 4 ++-- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/system.h b/src/system.h index ff88cb4..f9a6981 100644 --- a/src/system.h +++ b/src/system.h @@ -559,7 +559,7 @@ emit_ancillary_info (void) static inline void emit_try_help (void) { - fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name); + fprintf (stderr, _("'%s --help' for more information.\n"), program_name); } #include "inttostr.h" diff --git a/tests/du/files0-from b/tests/du/files0-from index d617540..4a783d3 100755 --- a/tests/du/files0-from +++ b/tests/du/files0-from @@ -32,7 +32,7 @@ my @Tests = ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, {ERR => "$prog: extra operand `no-such'\n" . "file operands cannot be combined with --files0-from\n" - . "Try `$prog --help' for more information.\n"} + . "'$prog --help' for more information.\n"} ], # missing input file diff --git a/tests/ls/time-style-diag b/tests/ls/time-style-diag index 00a0c20..e0edfcc 100755 --- a/tests/ls/time-style-diag +++ b/tests/ls/time-style-diag @@ -30,7 +30,7 @@ Valid arguments are: - [posix-]iso - [posix-]locale - +FORMAT (e.g., +%H:%M) for a `date'-style format -Try `ls --help' for more information. +'ls --help' for more information. EOF compare exp err || fail=1 diff --git a/tests/misc/basename b/tests/misc/basename index 9006e60..ae40434 100755 --- a/tests/misc/basename +++ b/tests/misc/basename @@ -33,9 +33,9 @@ my $prog = 'basename'; my @Tests = ( ['fail-1', {ERR => "$prog: missing operand\n" - . "Try `$prog --help' for more information.\n"}, {EXIT => '1'}], + . "'$prog --help' for more information.\n"}, {EXIT => '1'}], ['fail-2', qw(a b c), {ERR => "$prog: extra operand `c'\n" - . "Try `$prog --help' for more information.\n"}, {EXIT => '1'}], + . "'$prog --help' for more information.\n"}, {EXIT => '1'}], ['a', qw(d/f), {OUT => 'f'}], ['b', qw(/d/f), {OUT => 'f'}], diff --git a/tests/misc/comm b/tests/misc/comm index ed56740..673f232 100755 --- a/tests/misc/comm +++ b/tests/misc/comm @@ -58,17 +58,17 @@ my @Tests = # invalid missing command line argument (1) ['missing-arg1', $inputs[0], {EXIT=>1}, {ERR => "$prog: missing operand after `a'\n" - . "Try `$prog --help' for more information.\n"}], + . "'$prog --help' for more information.\n"}], # invalid missing command line argument (both) ['missing-arg2', {EXIT=>1}, {ERR => "$prog: missing operand\n" - . "Try `$prog --help' for more information.\n"}], + . "'$prog --help' for more information.\n"}], # invalid extra command line argument ['extra-arg', @inputs, 'no-such', {EXIT=>1}, {ERR => "$prog: extra operand `no-such'\n" - . "Try `$prog --help' for more information.\n"}], + . "'$prog --help' for more information.\n"}], # out-of-order input ['ooo', {IN=>{a=>"1\n3"}}, {IN=>{b=>"3\n2"}}, {EXIT=>1}, diff --git a/tests/misc/cut b/tests/misc/cut index 0114d65..91d59ec 100755 --- a/tests/misc/cut +++ b/tests/misc/cut @@ -28,7 +28,7 @@ my $mb_locale = $ENV{LOCALE_FR_UTF8}; and $mb_locale = 'C'; my $prog = 'cut'; -my $try = "Try \`$prog --help' for more information.\n"; +my $try = "'$prog --help' for more information.\n"; my $from_1 = "$prog: fields and positions are numbered from 1\n$try"; my $inval = "$prog: invalid byte or field list\n$try"; my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try"; diff --git a/tests/misc/dirname b/tests/misc/dirname index 2e6c8cc..1becb6a 100755 --- a/tests/misc/dirname +++ b/tests/misc/dirname @@ -34,9 +34,9 @@ my $prog = 'dirname'; my @Tests = ( ['fail-1', {ERR => "$prog: missing operand\n" - . "Try `$prog --help' for more information.\n"}, {EXIT => '1'}], + . "'$prog --help' for more information.\n"}, {EXIT => '1'}], ['fail-2', qw(a b), {ERR => "$prog: extra operand `b'\n" - . "Try `$prog --help' for more information.\n"}, {EXIT => '1'}], + . "'$prog --help' for more information.\n"}, {EXIT => '1'}], ['a', qw(d/f), {OUT => 'd'}], ['b', qw(/d/f), {OUT => '/d'}], diff --git a/tests/misc/expr b/tests/misc/expr index 9cc1f9d..c48cfbe 100755 --- a/tests/misc/expr +++ b/tests/misc/expr @@ -159,7 +159,7 @@ my @Tests = ['fail-b', '9 9', {ERR => "$prog: syntax error\n"}, {EXIT => 2}], ['fail-c', {ERR => "$prog: missing operand\n" - . "Try `$prog --help' for more information.\n"}, + . "'$prog --help' for more information.\n"}, {EXIT => 2}], ['bignum-add', "$big + 1", {OUT => $big_p1}], diff --git a/tests/misc/factor b/tests/misc/factor index 6c11c70..ddead42 100755 --- a/tests/misc/factor +++ b/tests/misc/factor @@ -59,7 +59,7 @@ my @Tests = ['z', '-1', {ERR_SUBST => q!s/'1'/1/!}, # map newer glibc diagnostic to expected. {ERR => "$prog: invalid option -- 1\n" - . "Try `$prog --help' for more information.\n"}, + . "'$prog --help' for more information.\n"}, {EXIT => 1}], ['cont', 'a 4', {OUT => "4: 2 2\n"}, diff --git a/tests/misc/fmt b/tests/misc/fmt index 29858fe..0d4dc92 100755 --- a/tests/misc/fmt +++ b/tests/misc/fmt @@ -37,7 +37,7 @@ my @Tests = ['obs-1', '-c -72', {ERR => "fmt: invalid option -- 7; -WIDTH is recognized only when it" . " is the first\noption; use -w N instead\n" - . "Try `fmt --help' for more information.\n" }, {EXIT => 1}], + . "'fmt --help' for more information.\n" }, {EXIT => 1}], # With --prefix=P, do not remove leading space on lines without the prefix. ['pfx-1', qw (-p '>'), diff --git a/tests/misc/invalid-opt b/tests/misc/invalid-opt index 68e61df..5fda496 100755 --- a/tests/misc/invalid-opt +++ b/tests/misc/invalid-opt @@ -65,7 +65,7 @@ foreach my $prog (@built_programs) $prog eq '[' and next; - my $try = "Try \`$prog --help' for more information.\n"; + my $try = "'$prog --help' for more information.\n"; my $x = $exit_status{$prog}; defined $x or $x = 1; diff --git a/tests/misc/mktemp b/tests/misc/mktemp index 1bef533..ba22d72 100755 --- a/tests/misc/mktemp +++ b/tests/misc/mktemp @@ -57,7 +57,7 @@ my @Tests = # ['too-many', 'a b', {ERR=>"$prog: too many templates\n" - . "Try `$prog --help' for more information.\n"}, {EXIT => 1} ], + . "'$prog --help' for more information.\n"}, {EXIT => 1} ], ['too-many-q', '-q a b', {EXIT => 1} ], ['too-few-x', 'foo.XX', {EXIT => 1}, @@ -164,7 +164,7 @@ my @Tests = ['suffix9f', 'aXXXX --suffix=b', {EXIT=>1}, {ENV=>"POSIXLY_CORRECT=1"}, {ERR=>"$prog: too many templates\n" - . "Try `$prog --help' for more information.\n"}], + . "'$prog --help' for more information.\n"}], ['suffix10f', 'aXXb', {EXIT => 1}, {ERR=>"$prog: too few X's in template `aXXb'\n"}], diff --git a/tests/misc/printf-cov b/tests/misc/printf-cov index 892cb01..f522e80 100755 --- a/tests/misc/printf-cov +++ b/tests/misc/printf-cov @@ -19,7 +19,7 @@ use strict; my $prog = 'printf'; -my $try = "Try \`$prog --help' for more information.\n"; +my $try = "'$prog --help' for more information.\n"; my $pow_2_31 = 2**31; # Turn off localization of executable's output. diff --git a/tests/misc/seq b/tests/misc/seq index dabdccf..8d7f4e8 100755 --- a/tests/misc/seq +++ b/tests/misc/seq @@ -24,7 +24,7 @@ use strict; @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; my $prog = 'seq'; -my $try_help = "Try `$prog --help' for more information.\n"; +my $try_help = "'$prog --help' for more information.\n"; my $locale = $ENV{LOCALE_FR_UTF8}; ! defined $locale || $locale eq 'none' diff --git a/tests/misc/sort-files0-from b/tests/misc/sort-files0-from index ebabae3..51ef905 100755 --- a/tests/misc/sort-files0-from +++ b/tests/misc/sort-files0-from @@ -32,7 +32,7 @@ my @Tests = ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>2}, {ERR => "$prog: extra operand `no-such'\n" . "file operands cannot be combined with --files0-from\n" - . "Try `$prog --help' for more information.\n"} + . "'$prog --help' for more information.\n"} ], # missing input file diff --git a/tests/misc/tsort b/tests/misc/tsort index 0bc2a2c..b928760 100755 --- a/tests/misc/tsort +++ b/tests/misc/tsort @@ -55,7 +55,7 @@ my @Tests = ['only-one', {IN => {f => ""}}, {IN => {g => ""}}, {EXIT => 1}, {ERR => "tsort: extra operand `g'\n" - . "Try `tsort --help' for more information.\n"}], + . "'tsort --help' for more information.\n"}], ); my $save_temps = $ENV{DEBUG}; diff --git a/tests/misc/uniq b/tests/misc/uniq index 5083be5..0b3c023 100755 --- a/tests/misc/uniq +++ b/tests/misc/uniq @@ -21,7 +21,7 @@ use strict; my $limits = getlimits (); my $prog = 'uniq'; -my $try = "Try \`$prog --help' for more information.\n"; +my $try = "'$prog --help' for more information.\n"; # Turn off localization of executable's output. @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3; diff --git a/tests/misc/wc-files0-from b/tests/misc/wc-files0-from index 4d21b7b..e490108 100755 --- a/tests/misc/wc-files0-from +++ b/tests/misc/wc-files0-from @@ -32,7 +32,7 @@ my @Tests = ['f-extra-arg', '--files0-from=- no-such', {IN=>"a"}, {EXIT=>1}, {ERR => "$prog: extra operand `no-such'\n" . "file operands cannot be combined with --files0-from\n" - . "Try `$prog --help' for more information.\n"} + . "'$prog --help' for more information.\n"} ], # missing input file diff --git a/tests/mv/diag b/tests/mv/diag index f30ba92..39cc6e7 100755 --- a/tests/mv/diag +++ b/tests/mv/diag @@ -36,9 +36,9 @@ mv --target=f2 f1 >> out 2>&1 && fail=1 cat > exp <<\EOF mv: missing file operand -Try `mv --help' for more information. +'mv --help' for more information. mv: missing destination file operand after `no-file' -Try `mv --help' for more information. +'mv --help' for more information. mv: target `f1' is not a directory mv: target `f2' is not a directory EOF -- 1.7.9.rc0.2.g4b783
