doc: use ASCII in .texi files where UTF-8 isn't needed

[gnulib.git] / lib / sh-quote.c

diff --git a/lib/sh-quote.c b/lib/sh-quote.c
index 40fbdfe..a97be57 100644 (file)
--- a/lib/sh-quote.c
+++ b/lib/sh-quote.c
@@ -1,11 +1,11 @@
 /* Shell quoting.
-   Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
@@ -44,7 +43,7 @@ shell_quote_length (const char *string)
   if (sh_quoting_options == NULL)
     init_sh_quoting_options ();
   return quotearg_buffer (NULL, 0, string, strlen (string),
-                          sh_quoting_options);
+                           sh_quoting_options);
 }
 
 /* Copies the quoted string to p and returns the incremented p.
@@ -55,7 +54,7 @@ shell_quote_copy (char *p, const char *string)
   if (sh_quoting_options == NULL)
     init_sh_quoting_options ();
   return p + quotearg_buffer (p, (size_t)(-1), string, strlen (string),
-                             sh_quoting_options);
+                              sh_quoting_options);
 }
 
 /* Returns the freshly allocated quoted string.  */
@@ -70,35 +69,35 @@ shell_quote (const char *string)
 /* Returns a freshly allocated string containing all argument strings, quoted,
    separated through spaces.  */
 char *
-shell_quote_argv (char **argv)
+shell_quote_argv (char * const *argv)
 {
   if (*argv != NULL)
     {
-      char **argp;
+      char * const *argp;
       size_t length;
       char *command;
       char *p;
 
       length = 0;
       for (argp = argv; ; )
-       {
-         length += shell_quote_length (*argp) + 1;
-         argp++;
-         if (*argp == NULL)
-           break;
-       }
+        {
+          length += shell_quote_length (*argp) + 1;
+          argp++;
+          if (*argp == NULL)
+            break;
+        }
 
       command = XNMALLOC (length, char);
 
       p = command;
       for (argp = argv; ; )
-       {
-         p = shell_quote_copy (p, *argp);
-         argp++;
-         if (*argp == NULL)
-           break;
-         *p++ = ' ';
-       }
+        {
+          p = shell_quote_copy (p, *argp);
+          argp++;
+          if (*argp == NULL)
+            break;
+          *p++ = ' ';
+        }
       *p = '\0';
 
       return command;