summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-01-09 21:33:37 +0100
committerJim Meyering <meyering@redhat.com>2012-01-09 21:49:51 +0100
commit84e742fab42ac270a1cbc548d4a6f6ac82c8124a (patch)
tree70e5bdbca6ff8ca06b9477e8ee2d4fedc8dbe99e
parent8ac05f82a263364310dc9d8bfd734c478c03fbdd (diff)
downloadcoreutils-84e742fab42ac270a1cbc548d4a6f6ac82c8124a.tar.xz
maint: prep for global quoting changes: handle irregular cases manually
* src/chroot.c (usage): Change ``...'' to '...', and describe the default more accurately (also adding quotes): s,/bin/sh,'/bin/sh -i', * src/join.c (usage): Change ` ...'' ' to "...''". * src/fmt.c (isopen): Change `' to '` in list of bytes, so that a subsequent change can safely perform the `...' to '...' conversion. * src/truncate.c (main): Tweak quoting in comments to use '...', not `...`, for consistency with the rest of comments in coreutils.
-rw-r--r--src/chroot.c2
-rw-r--r--src/fmt.c2
-rw-r--r--src/join.c4
-rw-r--r--src/truncate.c8
4 files changed, 8 insertions, 8 deletions
diff --git a/src/chroot.c b/src/chroot.c
index 4e3468076..a56da9ec8 100644
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -148,7 +148,7 @@ Run COMMAND with root directory set to NEWROOT.\n\
fputs (VERSION_OPTION_DESCRIPTION, stdout);
fputs (_("\
\n\
-If no command is given, run ``${SHELL} -i'' (default: /bin/sh).\n\
+If no command is given, run '${SHELL} -i' (default: '/bin/sh -i').\n\
"), stdout);
emit_ancillary_info ();
}
diff --git a/src/fmt.c b/src/fmt.c
index e8aaebfd6..42e7bbc7c 100644
--- a/src/fmt.c
+++ b/src/fmt.c
@@ -116,7 +116,7 @@ typedef long int COST;
/* Extra ctype(3)-style macros. */
-#define isopen(c) (strchr ("([`'\"", c) != NULL)
+#define isopen(c) (strchr ("(['`\"", c) != NULL)
#define isclose(c) (strchr (")]'\"", c) != NULL)
#define isperiod(c) (strchr (".?!", c) != NULL)
diff --git a/src/join.c b/src/join.c
index 84736230a..171206262 100644
--- a/src/join.c
+++ b/src/join.c
@@ -226,8 +226,8 @@ separated by CHAR. If FORMAT is the keyword 'auto', then the first\n\
line of each file determines the number of fields output for each line.\n\
\n\
Important: FILE1 and FILE2 must be sorted on the join fields.\n\
-E.g., use ` sort -k 1b,1 ' if `join' has no options,\n\
-or use ` join -t '' ' if `sort' has no options.\n\
+E.g., use \"sort -k 1b,1\" if `join' has no options,\n\
+or use \"join -t ''\" if `sort' has no options.\n\
Note, comparisons honor the rules specified by `LC_COLLATE'.\n\
If the input is not sorted and some lines cannot be joined, a\n\
warning message will be given.\n\
diff --git a/src/truncate.c b/src/truncate.c
index 29cb2fa36..5bc541c97 100644
--- a/src/truncate.c
+++ b/src/truncate.c
@@ -366,10 +366,10 @@ main (int argc, char **argv)
{
if ((fd = open (fname, oflags, omode)) == -1)
{
- /* `truncate -s0 -c no-such-file` shouldn't gen error
- `truncate -s0 no-such-dir/file` should gen ENOENT error
- `truncate -s0 no-such-dir/` should gen EISDIR error
- `truncate -s0 .` should gen EISDIR error */
+ /* 'truncate -s0 -c no-such-file' shouldn't gen error
+ 'truncate -s0 no-such-dir/file' should gen ENOENT error
+ 'truncate -s0 no-such-dir/' should gen EISDIR error
+ 'truncate -s0 .' should gen EISDIR error */
if (!(no_create && errno == ENOENT))
{
error (0, errno, _("cannot open %s for writing"),