maint: ` → 'HEADmaster

Prefer ' to ` for quoting, as per current GNU coding standards.
* am/rmt.m4 (PU_RMT):
* paxlib/names.c (safer_name_suffix):
Use ' not ` in diagnostics and output comments.

10 files changed, 43 insertions, 45 deletions

diff --git a/ChangeLog.CVS b/ChangeLog.CVS
index 54d23d1..dd7993e 100644
--- a/ChangeLog.CVS
+++ b/ChangeLog.CVS
@@ -9,7 +9,7 @@
 2007-12-05  Sergey Poznyakoff  <[email protected]>
 
 	Changes needed for cpio mingw build:
-	
+
 	* lib/system.h: Include pwd.h and grp.h if the corresponding HAVE_
 	preprocessor symbols are defined.
 	* m4/system.m4 (AC_CHECK_HEADERS_ONCE): Add pwd.h and grp.h.
@@ -72,7 +72,7 @@
 	* paxlib/error.c (read_fatal_details): Fix wording of the error
 	message.
 	* tests/genfile.c: Implement new option --seek (similar
-	to `dd seek=')
+	to 'dd seek=')
 
 2006-11-29  Paul Eggert  <[email protected]>
 
@@ -398,7 +398,7 @@
 
 2005-02-03  Sergey Poznyakoff  <[email protected]>
 
-	* tests/genfile.c: New mode `--stat' prints selected
+	* tests/genfile.c: New mode '--stat' prints selected
 	fields from struct stat for existing files.
 	Improved help output.
 
diff --git a/README-alpha b/README-alpha
index 2ae681e..8f04260 100644
--- a/README-alpha
+++ b/README-alpha
@@ -10,7 +10,7 @@ README.
 
     If you are taking source from CVS, you will need to have automake,
 and autoconf installed to bootstrap the package. See the chapter
-`Building' for the detailed instructions. After bootstrapping, there
+'Building' for the detailed instructions. After bootstrapping, there
 should be a file 'INSTALL' with generic installation
 instructions. Package-specific installation instructions are set forth
 in the file README.
diff --git a/README-hacking b/README-hacking
index 6ad3aa4..f8569ca 100644
--- a/README-hacking
+++ b/README-hacking
@@ -6,20 +6,20 @@ this package.
 You need the following packages to build the Git version of GNU
 paxutils.  We do not make any efforts to accommodate older versions of
 these packages, so please make sure that you have the latest stable
-version. 
+version.
 
 - Automake <http://www.gnu.org/software/automake/>
 - Autoconf <http://www.gnu.org/software/autoconf/>
 - M4 <http://www.gnu.org/software/m4/>
 - Texinfo <http://www.gnu.org/software/texinfo>
-- Gnulib <http://www.gnu.org/software/gnulib> 
+- Gnulib <http://www.gnu.org/software/gnulib>
 - Git <http://git.or.cz>
 
 * Bootstrapping
 
 Obviously, if you are reading these notes, you did manage to clone
 paxutils from Git. The next step is to get other files needed to build,
-which are extracted from other source packages: 
+which are extracted from other source packages:
 
 1. Change to the source tree directory
 
@@ -27,7 +27,7 @@ which are extracted from other source packages:
 
 2. Run
 
-   ./bootstrap 
+   ./bootstrap
 
 Once done, proceed as described in the file README (section
 INSTALLATION).
@@ -36,15 +36,15 @@ Normally you will have to run bootstrap only once. However, if you
 intend to hack on GNU paxutils, you might need to run it again later. In
 this case, you will probably want to save some time and bandwidth by
 avoiding downloading the same files again. If so, create in GNU paxutils
-root directory the file named `.bootstrap' with the following
+root directory the file named '.bootstrap' with the following
 contents:
 
    --gnulib-srcdir=$HOME/gnulib
 
-Replace `$HOME/gnulib' with the actual directory where the Gnulib
+Replace '$HOME/gnulib' with the actual directory where the Gnulib
 sources reside.
-   
-For more information about `bootstrap', run `bootstrap --help'.
+
+For more information about 'bootstrap', run 'bootstrap --help'.
 
 
 * Copyright information
@@ -67,5 +67,3 @@ mode: outline
 paragraph-separate: "[	^L]*$"
 version-control: never
 End:
-
-
diff --git a/am/rmt.m4 b/am/rmt.m4
index 5a83a7a..5acb706 100644
--- a/am/rmt.m4
+++ b/am/rmt.m4
@@ -37,7 +37,7 @@ AC_DEFUN([PU_RMT],[
 
 
   AC_ARG_VAR([DEFAULT_RMT_DIR],
-             [Define full file name of the directory where to install `rmt'. (default: $(libexecdir))])
+             [Define full file name of the directory where to install 'rmt'. (default: $(libexecdir))])
   if test "x$DEFAULT_RMT_DIR" != x; then
 	DEFAULT_RMT_COMMAND=$DEFAULT_RMT_DIR/rmt
   else
@@ -47,7 +47,7 @@ AC_DEFUN([PU_RMT],[
   AC_MSG_CHECKING([whether to build rmt])
   AC_ARG_WITH([rmt],
               AS_HELP_STRING([--with-rmt=FILE],
-                             [Use FILE as the default `rmt' program. Do not build included copy of `rmt'.]),
+                             [Use FILE as the default 'rmt' program. Do not build included copy of 'rmt'.]),
               [case $withval in
 	       yes|no) AC_MSG_ERROR([Invalid argument to --with-rmt]);;
 	       /*)     DEFAULT_RMT_COMMAND=$withval
diff --git a/lib/rmt.h b/lib/rmt.h
index a095323..de233f6 100644
--- a/lib/rmt.h
+++ b/lib/rmt.h
@@ -33,7 +33,7 @@ _GL_INLINE_HEADER_BEGIN
 #endif
 
 /* A filename is remote if it contains a colon not preceded by a slash,
-   to take care of `/:/' which is a shorthand for `/.../<CELL-NAME>/fs'
+   to take care of '/:/' which is a shorthand for '/.../<CELL-NAME>/fs'
    on machines running OSF's Distributing Computing Environment (DCE) and
    Distributed File System (DFS).  However, when --force-local, a
    filename is never remote.  */
diff --git a/paxlib/error.c b/paxlib/error.c
index ebdbf99..130bc9a 100644
--- a/paxlib/error.c
+++ b/paxlib/error.c
@@ -98,10 +98,10 @@ pax_decode_mode (mode_t mode, char *string)
 void
 call_arg_error (char const *call, char const *name)
 {
-  /* TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
+  /* TRANSLATORS: %s after 'Cannot' is a function name, e.g. 'Cannot open'.
      Directly translating this to another language will not work, first because
      %s itself is not translated.
-     Translate it as `%s: Function %s failed'. */
+     Translate it as '%s: Function %s failed'. */
   paxerror (errno, _("%s: Cannot %s"), quotearg_colon (name), call);
 }
 
@@ -110,10 +110,10 @@ call_arg_error (char const *call, char const *name)
 void
 call_arg_fatal (char const *call, char const *name)
 {
-  /* TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
+  /* TRANSLATORS: %s after 'Cannot' is a function name, e.g. 'Cannot open'.
      Directly translating this to another language will not work, first because
      %s itself is not translated.
-     Translate it as `%s: Function %s failed'. */
+     Translate it as '%s: Function %s failed'. */
   paxfatal (errno, _("%s: Cannot %s"), quotearg_colon (name),  call);
 }
 
@@ -122,10 +122,10 @@ call_arg_fatal (char const *call, char const *name)
 void
 call_arg_warn (char const *call, char const *name)
 {
-  /* TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
+  /* TRANSLATORS: %s after 'Cannot' is a function name, e.g. 'Cannot open'.
      Directly translating this to another language will not work, first because
      %s itself is not translated.
-     Translate it as `%s: Function %s failed'. */
+     Translate it as '%s: Function %s failed'. */
   paxwarn (errno, _("%s: Warning: Cannot %s"), quotearg_colon (name), call);
 }
 
diff --git a/paxlib/names.c b/paxlib/names.c
index d118c48..3a25034 100644
--- a/paxlib/names.c
+++ b/paxlib/names.c
@@ -122,8 +122,8 @@ safer_name_suffix (char const *file_name, bool link_target,
 	    {
 	      static char const *const diagnostic[] =
 	      {
-		N_("Removing leading `%s' from member names"),
-		N_("Removing leading `%s' from hard link targets")
+		N_("Removing leading '%s' from member names"),
+		N_("Removing leading '%s' from hard link targets")
 	      };
 	      paxwarn (0, _(diagnostic[link_target]), prefix);
 	    }
@@ -136,8 +136,8 @@ safer_name_suffix (char const *file_name, bool link_target,
 	{
 	  static char const *const diagnostic[] =
 	  {
-	    N_("Substituting `.' for empty member name"),
-	    N_("Substituting `.' for empty hard link target")
+	    N_("Substituting '.' for empty member name"),
+	    N_("Substituting '.' for empty hard link target")
 	  };
 	  paxwarn (0, "%s", _(diagnostic[link_target]));
 	}
diff --git a/paxlib/tar.h b/paxlib/tar.h
index d3d4588..3125a4c 100644
--- a/paxlib/tar.h
+++ b/paxlib/tar.h
@@ -79,9 +79,9 @@ struct posix_header
 /* tar Header Block, GNU extensions.  */
 
 /* In GNU tar, SYMTYPE is for to symbolic links, and CONTTYPE is for
-   contiguous files, so maybe disobeying the `reserved' comment in POSIX
+   contiguous files, so maybe disobeying the 'reserved' comment in POSIX
    header description.  I suspect these were meant to be used this way, and
-   should not have really been `reserved' in the published standards.  */
+   should not have really been 'reserved' in the published standards.  */
 
 /* *BEWARE* *BEWARE* *BEWARE* that the following information is still
    boiling, and may change.  Even if the OLDGNU format description should be
diff --git a/tests/argcv.c b/tests/argcv.c
index f417a50..5e58c8b 100644
--- a/tests/argcv.c
+++ b/tests/argcv.c
@@ -135,7 +135,7 @@ xtonum (const char *src, int base, idx_t cnt)
   char *p;
   char tmp[4]; /* At most three characters + zero */
 
-  /* Notice: No use to check `cnt'. It should be either 2 or 3 */
+  /* Notice: No use to check 'cnt'. It should be either 2 or 3 */
   strncpy (tmp, src, cnt);
   tmp[cnt] = '\0';
   long int val = strtol (tmp, &p, base);
diff --git a/tests/genfile.c b/tests/genfile.c
index 32245ce..dac7c9d 100644
--- a/tests/genfile.c
+++ b/tests/genfile.c
@@ -378,7 +378,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 	char *p;
 	checkpoint = strtoimax (arg, &p, 0);
 	if (checkpoint < 0 || *p)
-	  argp_error (state, _("Error parsing number near `%s'"), p);
+	  argp_error (state, _("Error parsing number near '%s'"), p);
       }
       break;
 
@@ -443,7 +443,7 @@ generate_simple_file (char *filename)
     {
       fp = fopen (filename, seek_offset ? "rb+" : "wb");
       if (!fp)
-	error (EXIT_FAILURE, errno, _("cannot open `%s'"), filename);
+	error (EXIT_FAILURE, errno, _("cannot open '%s'"), filename);
     }
   else
     fp = stdout;
@@ -486,7 +486,7 @@ generate_files_from_list ()
   struct obstack stk;
 
   if (!fp)
-    error (EXIT_FAILURE, errno, _("cannot open `%s'"), files_from);
+    error (EXIT_FAILURE, errno, _("cannot open '%s'"), files_from);
 
   obstack_init (&stk);
   while (!read_name_from_file (fp, &stk))
@@ -594,7 +594,7 @@ generate_sparse_file (int argc, char **argv)
     flags |= O_TRUNC;
   fd = open (file_name, flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
   if (fd < 0)
-    error (EXIT_FAILURE, errno, _("cannot open `%s'"), file_name);
+    error (EXIT_FAILURE, errno, _("cannot open '%s'"), file_name);
 
   buffer = ximalloc (block_size);
 
@@ -694,13 +694,13 @@ print_stat (const char *name)
 	      if (*q)
 		{
 		  printf ("\n");
-		  error (EXIT_USAGE, 0, _("incorrect mask (near `%s')"), q);
+		  error (EXIT_USAGE, 0, _("incorrect mask (near '%s')"), q);
 		}
 	    }
 	  else if (p[4])
 	    {
 	      printf ("\n");
-	      error (EXIT_USAGE, 0, _("Unknown field `%s'"), p);
+	      error (EXIT_USAGE, 0, _("Unknown field '%s'"), p);
 	    }
 	  printf ("%0jo", val);
 	}
@@ -733,7 +733,7 @@ print_stat (const char *name)
       else
 	{
 	  printf ("\n");
-	  error (EXIT_USAGE, 0, _("Unknown field `%s'"), p);
+	  error (EXIT_USAGE, 0, _("Unknown field '%s'"), p);
 	}
       p = strtok (nullptr, ",");
       if (p)
@@ -753,7 +753,7 @@ set_times (char const *name)
 		 no_dereference_option ? AT_SYMLINK_NOFOLLOW : 0)
       < 0)
     {
-      error (EXIT_FAILURE, errno, _("cannot set time on `%s'"), name);
+      error (EXIT_FAILURE, errno, _("cannot set time on '%s'"), name);
     }
 }
 
@@ -775,7 +775,7 @@ exec_checkpoint (struct action *p)
 		       no_dereference_option ? AT_SYMLINK_NOFOLLOW : 0)
 	    < 0)
 	  {
-	    error (0, errno, _("cannot set time on `%s'"), p->name);
+	    error (0, errno, _("cannot set time on '%s'"), p->name);
 	    break;
 	  }
       }
@@ -786,7 +786,7 @@ exec_checkpoint (struct action *p)
 	FILE *fp = fopen (p->name, "ab");
 	if (!fp)
 	  {
-	    error (0, errno, _("cannot open `%s'"), p->name);
+	    error (0, errno, _("cannot open '%s'"), p->name);
 	    break;
 	  }
 
@@ -800,12 +800,12 @@ exec_checkpoint (struct action *p)
 	int fd = open (p->name, O_RDWR | O_BINARY);
 	if (fd < 0)
 	  {
-	    error (0, errno, _("cannot open `%s'"), p->name);
+	    error (0, errno, _("cannot open '%s'"), p->name);
 	    break;
 	  }
 	if (ftruncate (fd, p->size) < 0)
 	  {
-	    error (0, errno, _("cannot truncate `%s'"), p->name);
+	    error (0, errno, _("cannot truncate '%s'"), p->name);
 	    break;
 	  }
 	close (fd);
@@ -821,14 +821,14 @@ exec_checkpoint (struct action *p)
       {
 	struct stat st;
 	if (stat (p->name, &st))
-	  error (0, errno, _("cannot stat `%s'"), p->name);
+	  error (0, errno, _("cannot stat '%s'"), p->name);
 	else if (S_ISDIR (st.st_mode))
 	  {
 	    if (rmdir (p->name))
-	      error (0, errno, _("cannot remove directory `%s'"), p->name);
+	      error (0, errno, _("cannot remove directory '%s'"), p->name);
 	  }
 	else if (unlink (p->name))
-	  error (0, errno, _("cannot unlink `%s'"), p->name);
+	  error (0, errno, _("cannot unlink '%s'"), p->name);
       }
       break;