X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=lib%2Fprepargs.c;h=068688b1afdf902310718cbf4a8e9a5a396e476a;hb=7f21a4d3f55cf36cd6a5cb13bc51e88a68c2e097;hp=25dd6014fcdca07fe74e91281fb23dfeb051ca0f;hpb=e7d0a7724b70b13eaee2c732de8d3696220dd91e;p=chaz%2Ftar
diff --git a/lib/prepargs.c b/lib/prepargs.c
index 25dd601..068688b 100644
--- a/lib/prepargs.c
+++ b/lib/prepargs.c
@@ -1,9 +1,9 @@
/* Parse arguments from a string and prepend them to an argv.
- Copyright 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1999-2001, 2007, 2013 Free Software Foundation, Inc.
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)
+ the Free Software Foundation; either version 3, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
@@ -12,9 +12,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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert . */
@@ -25,22 +23,16 @@
#include
#include
-#include
-
-/* IN_CTYPE_DOMAIN (C) is nonzero if the unsigned char C can safely be given
- as an argument to macros like "isspace". */
-#ifdef STDC_HEADERS
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) ((c) <= 0177)
+#if HAVE_STRING_H
+# include
#endif
-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+#include
/* Find the white-space-separated options specified by OPTIONS, and
using BUF to store copies of these options, set ARGV[0], ARGV[1],
etc. to the option copies. Return the number N of options found.
- Do not set ARGV[N] to NULL. If ARGV is NULL, do not store ARGV[0]
+ Do not set ARGV[N]. If ARGV is null, do not store ARGV[0]
etc. Backslash can be used to escape whitespace (and backslashes). */
static int
prepend_args (char const *options, char *buf, char **argv)
@@ -51,7 +43,7 @@ prepend_args (char const *options, char *buf, char **argv)
for (;;)
{
- while (ISSPACE ((unsigned char) *o))
+ while (isspace ((unsigned char) *o))
o++;
if (!*o)
return n;
@@ -62,7 +54,7 @@ prepend_args (char const *options, char *buf, char **argv)
do
if ((*b++ = *o++) == '\\' && *o)
b[-1] = *o++;
- while (*o && ! ISSPACE ((unsigned char) *o));
+ while (*o && ! isspace ((unsigned char) *o));
*b++ = '\0';
}
@@ -77,7 +69,7 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
if (options)
{
char *buf = xmalloc (strlen (options) + 1);
- int prepended = prepend_args (options, buf, (char **) NULL);
+ int prepended = prepend_args (options, buf, (char **) 0);
int argc = *pargc;
char * const *argv = *pargv;
char **pp = (char **) xmalloc ((prepended + argc + 1) * sizeof *pp);