X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=lib%2Fprepargs.c;h=0c85bd445395a571d2d26b0b3758eb00671fb85c;hb=4aa85f09e755fc827cd5ab6225f20c83cd42245d;hp=9b30d2493bffad74ef5718e50985b916b4e05b92;hpb=eb3ba7cb06fdd0f8627b8f117d8453e297e18b64;p=debian%2Ftar diff --git a/lib/prepargs.c b/lib/prepargs.c index 9b30d249..0c85bd44 100644 --- a/lib/prepargs.c +++ b/lib/prepargs.c @@ -1,5 +1,5 @@ /* Parse arguments from a string and prepend them to an argv. - Copyright 1999-2001, 2007, 2013 Free Software Foundation, Inc. + Copyright 1999-2001, 2007, 2013-2014 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 @@ -29,16 +29,6 @@ #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) -#endif - -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) - /* 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. @@ -53,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; @@ -64,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'; }