X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsh-quote.c;h=a35a574c990f205e505152628bc1f849d2ce13e9;hb=ef3f971ddf9b91cc6ea3af6e46532ea6b804b9ce;hp=e349f403e592437c57fd3d64b400e62e344f7bc4;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/sh-quote.c b/lib/sh-quote.c index e349f403e..a35a574c9 100644 --- a/lib/sh-quote.c +++ b/lib/sh-quote.c @@ -1,5 +1,5 @@ /* Shell quoting. - Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2012 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify @@ -43,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. @@ -54,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. */ @@ -80,24 +80,24 @@ shell_quote_argv (char **argv) 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;