/* Shell quoting.
- Copyright (C) 2001-2004 Free Software Foundation, Inc.
+ Copyright (C) 2001-2004, 2006, 2009-2011 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
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "sh-quote.h"
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.
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. */
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 = (char *) xmalloc (length);
+ 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;