1997-08-22 00:57:35 +02:00
|
|
|
/* Create and destroy argument vectors (argv's)
|
2001-10-07 16:45:04 +02:00
|
|
|
Copyright (C) 1992, 2001 Free Software Foundation, Inc.
|
1997-08-22 00:57:35 +02:00
|
|
|
Written by Fred Fish @ Cygnus Support
|
|
|
|
|
|
|
|
This file is part of the libiberty library.
|
|
|
|
Libiberty is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
Libiberty is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with libiberty; see the file COPYING.LIB. If
|
|
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
|
|
/* Create and destroy argument vectors. An argument vector is simply an
|
|
|
|
array of string pointers, terminated by a NULL pointer. */
|
|
|
|
|
|
|
|
#include "ansidecl.h"
|
|
|
|
#include "libiberty.h"
|
|
|
|
|
safe-ctype.h: New file.
include:
* safe-ctype.h: New file.
libiberty:
* safe-ctype.c: New file.
* Makefile.in (CFILES): Add safe-ctype.c.
(REQUIRED_OFILES): Add safe-ctype.o.
* argv.c: Define ISBLANK and use it, not isspace.
* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use
uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c)
before calling TOLOWER(c)/TOUPPER(c).
gcc:
* Makefile.in (HOST_RTL): Add safe-ctype.o.
(safe-ctype.o): New rule.
* system.h: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros.
* cpphash.h: Zap IStable and related macros. Define is_* in
terms of safe-ctype.h macros.
* cppinit.c: Delete the IStable and all related code.
* tradcpp.c: Delete is_idchar, is_idstart, is_hor_space, and
is_space arrays. Delete initialize_char_syntax. Change all
references to the above arrays to use macros instead.
* tradcpp.h: Define is_idchar, is_idstart, is_space, and
is_nvspace in terms of safe_ctype.h's macros.
* tradcif.y: is_idchar, is_idstart are macros not arrays.
* config/i370/i370.c, config/winnt/dirent.c,
config/winnt/fixinc-nt.c, config/winnt/ld.c:
Use uppercase ctype macros. If we included ctype.h,
include safe-ctype.h instead.
* fixinc/fixfixes.c: Use uppercase ctype macros. Don't test
ISLOWER(c) before calling TOUPPER(c).
* fixinc/fixincl.c (extract_quoted_files): Simplify out some gunk.
* fixinc/gnu-regex.c: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros. Don't test ISUPPER(x) before calling TOLOWER(x).
gcc/ch:
* lex.c: Don't bother checking whether ISUPPER(c) before
calling TOLOWER(c). Don't bother checking whether isascii(c)
before testing ISSPACE(c); ISSPACE(c) includes '\n'.
gcc/f:
* Make-lang.in: Link f/fini with safe-ctype.o.
* bad.c: Don't test ISUPPER(c) || ISLOWER(c) before calling TOUPPER(c).
* com.c: Use TOUPPER, not ffesrc_toupper.
* fini.c: Don't test ISALPHA(c) before calling TOUPPER(c)/TOLOWER(c).
* intrin.c: Don't test IN_CTYPE_DOMAIN(c).
* src.c: Delete ffesrc_toupper_ and ffesrc_tolower_ and their
initializing code; use TOUPPER and TOLOWER instead of
ffesrc_toupper and ffesrc_tolower.
* src.h: Don't declare ffesrc_toupper_ or ffesrc_tolower_.
Don't define ffesrc_toupper or ffesrc_tolower.
gcc/java:
* jvgenmain.c: Use ISPRINT not isascii.
From-SVN: r38124
2000-12-08 04:00:26 +01:00
|
|
|
#define ISBLANK(ch) ((ch) == ' ' || (ch) == '\t')
|
1997-08-22 00:57:35 +02:00
|
|
|
|
|
|
|
/* Routines imported from standard C runtime libraries. */
|
|
|
|
|
|
|
|
#ifdef __STDC__
|
|
|
|
|
|
|
|
#include <stddef.h>
|
1999-07-14 19:29:38 +02:00
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
1997-08-22 00:57:35 +02:00
|
|
|
|
|
|
|
#else /* !__STDC__ */
|
|
|
|
|
|
|
|
#if !defined _WIN32 || defined __GNUC__
|
|
|
|
extern char *memcpy (); /* Copy memory region */
|
|
|
|
extern int strlen (); /* Count length of string */
|
|
|
|
extern char *malloc (); /* Standard memory allocater */
|
|
|
|
extern char *realloc (); /* Standard memory reallocator */
|
|
|
|
extern void free (); /* Free malloc'd memory */
|
|
|
|
extern char *strdup (); /* Duplicate a string */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* __STDC__ */
|
|
|
|
|
|
|
|
|
|
|
|
#ifndef NULL
|
|
|
|
#define NULL 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef EOS
|
|
|
|
#define EOS '\0'
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define INITIAL_MAXARGC 8 /* Number of args + NULL in initial argv */
|
|
|
|
|
|
|
|
|
1997-10-14 21:10:45 +02:00
|
|
|
/*
|
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@deftypefn Extension char** dupargv (char **@var{vector})
|
1997-10-14 21:10:45 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
Duplicate an argument vector. Simply scans through @var{vector},
|
|
|
|
duplicating each argument until the terminating @code{NULL} is found.
|
argv.c, [...]: Improve manual formatting.
* argv.c, asprintf.c, choose-temp.c, concat.c, cplus-dem.c,
ffs.c, fnmatch.txh, getruntime.c, make-temp-file.c,
mkstemps.c, pexecute.c, random.c, strsitnal.c, vasprintf.c:
Improve manual formatting.
* functions.texi: Regenerate.
From-SVN: r46323
2001-10-17 23:15:41 +02:00
|
|
|
Returns a pointer to the argument vector if successful. Returns
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@code{NULL} if there is insufficient memory to complete building the
|
|
|
|
argument vector.
|
1997-10-14 21:10:45 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@end deftypefn
|
1997-10-14 21:10:45 +02:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
char **
|
|
|
|
dupargv (argv)
|
|
|
|
char **argv;
|
|
|
|
{
|
|
|
|
int argc;
|
|
|
|
char **copy;
|
|
|
|
|
|
|
|
if (argv == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* the vector */
|
|
|
|
for (argc = 0; argv[argc] != NULL; argc++);
|
|
|
|
copy = (char **) malloc ((argc + 1) * sizeof (char *));
|
|
|
|
if (copy == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* the strings */
|
|
|
|
for (argc = 0; argv[argc] != NULL; argc++)
|
|
|
|
{
|
|
|
|
int len = strlen (argv[argc]);
|
|
|
|
copy[argc] = malloc (sizeof (char *) * (len + 1));
|
|
|
|
if (copy[argc] == NULL)
|
|
|
|
{
|
|
|
|
freeargv (copy);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strcpy (copy[argc], argv[argc]);
|
|
|
|
}
|
|
|
|
copy[argc] = NULL;
|
|
|
|
return copy;
|
|
|
|
}
|
|
|
|
|
1997-08-22 00:57:35 +02:00
|
|
|
/*
|
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@deftypefn Extension void freeargv (char **@var{vector})
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
Free an argument vector that was built using @code{buildargv}. Simply
|
|
|
|
scans through @var{vector}, freeing the memory for each argument until
|
|
|
|
the terminating @code{NULL} is found, and then frees @var{vector}
|
|
|
|
itself.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@end deftypefn
|
1997-08-22 00:57:35 +02:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
void freeargv (vector)
|
|
|
|
char **vector;
|
|
|
|
{
|
|
|
|
register char **scan;
|
|
|
|
|
|
|
|
if (vector != NULL)
|
|
|
|
{
|
|
|
|
for (scan = vector; *scan != NULL; scan++)
|
|
|
|
{
|
|
|
|
free (*scan);
|
|
|
|
}
|
|
|
|
free (vector);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@deftypefn Extension char** buildargv (char *@var{sp})
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
Given a pointer to a string, parse the string extracting fields
|
|
|
|
separated by whitespace and optionally enclosed within either single
|
|
|
|
or double quotes (which are stripped off), and build a vector of
|
|
|
|
pointers to copies of the string for each field. The input string
|
|
|
|
remains unchanged. The last element of the vector is followed by a
|
|
|
|
@code{NULL} element.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
All of the memory for the pointer array and copies of the string
|
|
|
|
is obtained from @code{malloc}. All of the memory can be returned to the
|
|
|
|
system with the single function call @code{freeargv}, which takes the
|
|
|
|
returned result of @code{buildargv}, as it's argument.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
argv.c, [...]: Improve manual formatting.
* argv.c, asprintf.c, choose-temp.c, concat.c, cplus-dem.c,
ffs.c, fnmatch.txh, getruntime.c, make-temp-file.c,
mkstemps.c, pexecute.c, random.c, strsitnal.c, vasprintf.c:
Improve manual formatting.
* functions.texi: Regenerate.
From-SVN: r46323
2001-10-17 23:15:41 +02:00
|
|
|
Returns a pointer to the argument vector if successful. Returns
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@code{NULL} if @var{sp} is @code{NULL} or if there is insufficient
|
|
|
|
memory to complete building the argument vector.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
If the input is a null string (as opposed to a @code{NULL} pointer),
|
|
|
|
then buildarg returns an argument vector that has one arg, a null
|
|
|
|
string.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
@end deftypefn
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
The memory for the argv array is dynamically expanded as necessary.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
In order to provide a working buffer for extracting arguments into,
|
|
|
|
with appropriate stripping of quotes and translation of backslash
|
|
|
|
sequences, we allocate a working buffer at least as long as the input
|
|
|
|
string. This ensures that we always have enough space in which to
|
|
|
|
work, since the extracted arg is never larger than the input string.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
Makefile.in (TEXIFILES): Add fnmatch.txh.
* Makefile.in (TEXIFILES): Add fnmatch.txh.
(maint-undoc): New.
maint-tool: Add "undoc" tool.
* alloca.c, argv.c, asprintf.c, choose-temp.c, concat.c,
fdmatch.c, ffs.c, getruntime.c, insque.c, lbasename.c,
make-temp-file.c, mkstemps.c, pexecute.c, random.c, spaces.c,
strerror.s, strsignal.c, strtol.c, vasprintf.c: Add or update
documentation.
* fnmatch.txh: New.
* functions.texi: Regenerate.
From-SVN: r46274
2001-10-16 04:50:13 +02:00
|
|
|
The argument vector is always kept terminated with a @code{NULL} arg
|
|
|
|
pointer, so it can be passed to @code{freeargv} at any time, or
|
|
|
|
returned, as appropriate.
|
1997-08-22 00:57:35 +02:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
char **buildargv (input)
|
2001-10-07 16:45:04 +02:00
|
|
|
const char *input;
|
1997-08-22 00:57:35 +02:00
|
|
|
{
|
|
|
|
char *arg;
|
|
|
|
char *copybuf;
|
|
|
|
int squote = 0;
|
|
|
|
int dquote = 0;
|
|
|
|
int bsquote = 0;
|
|
|
|
int argc = 0;
|
|
|
|
int maxargc = 0;
|
|
|
|
char **argv = NULL;
|
|
|
|
char **nargv;
|
|
|
|
|
|
|
|
if (input != NULL)
|
|
|
|
{
|
1998-12-22 07:57:17 +01:00
|
|
|
copybuf = (char *) alloca (strlen (input) + 1);
|
1997-08-22 00:57:35 +02:00
|
|
|
/* Is a do{}while to always execute the loop once. Always return an
|
|
|
|
argv, even for null strings. See NOTES above, test case below. */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
/* Pick off argv[argc] */
|
safe-ctype.h: New file.
include:
* safe-ctype.h: New file.
libiberty:
* safe-ctype.c: New file.
* Makefile.in (CFILES): Add safe-ctype.c.
(REQUIRED_OFILES): Add safe-ctype.o.
* argv.c: Define ISBLANK and use it, not isspace.
* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use
uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c)
before calling TOLOWER(c)/TOUPPER(c).
gcc:
* Makefile.in (HOST_RTL): Add safe-ctype.o.
(safe-ctype.o): New rule.
* system.h: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros.
* cpphash.h: Zap IStable and related macros. Define is_* in
terms of safe-ctype.h macros.
* cppinit.c: Delete the IStable and all related code.
* tradcpp.c: Delete is_idchar, is_idstart, is_hor_space, and
is_space arrays. Delete initialize_char_syntax. Change all
references to the above arrays to use macros instead.
* tradcpp.h: Define is_idchar, is_idstart, is_space, and
is_nvspace in terms of safe_ctype.h's macros.
* tradcif.y: is_idchar, is_idstart are macros not arrays.
* config/i370/i370.c, config/winnt/dirent.c,
config/winnt/fixinc-nt.c, config/winnt/ld.c:
Use uppercase ctype macros. If we included ctype.h,
include safe-ctype.h instead.
* fixinc/fixfixes.c: Use uppercase ctype macros. Don't test
ISLOWER(c) before calling TOUPPER(c).
* fixinc/fixincl.c (extract_quoted_files): Simplify out some gunk.
* fixinc/gnu-regex.c: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros. Don't test ISUPPER(x) before calling TOLOWER(x).
gcc/ch:
* lex.c: Don't bother checking whether ISUPPER(c) before
calling TOLOWER(c). Don't bother checking whether isascii(c)
before testing ISSPACE(c); ISSPACE(c) includes '\n'.
gcc/f:
* Make-lang.in: Link f/fini with safe-ctype.o.
* bad.c: Don't test ISUPPER(c) || ISLOWER(c) before calling TOUPPER(c).
* com.c: Use TOUPPER, not ffesrc_toupper.
* fini.c: Don't test ISALPHA(c) before calling TOUPPER(c)/TOLOWER(c).
* intrin.c: Don't test IN_CTYPE_DOMAIN(c).
* src.c: Delete ffesrc_toupper_ and ffesrc_tolower_ and their
initializing code; use TOUPPER and TOLOWER instead of
ffesrc_toupper and ffesrc_tolower.
* src.h: Don't declare ffesrc_toupper_ or ffesrc_tolower_.
Don't define ffesrc_toupper or ffesrc_tolower.
gcc/java:
* jvgenmain.c: Use ISPRINT not isascii.
From-SVN: r38124
2000-12-08 04:00:26 +01:00
|
|
|
while (ISBLANK (*input))
|
1997-08-22 00:57:35 +02:00
|
|
|
{
|
|
|
|
input++;
|
|
|
|
}
|
|
|
|
if ((maxargc == 0) || (argc >= (maxargc - 1)))
|
|
|
|
{
|
|
|
|
/* argv needs initialization, or expansion */
|
|
|
|
if (argv == NULL)
|
|
|
|
{
|
|
|
|
maxargc = INITIAL_MAXARGC;
|
|
|
|
nargv = (char **) malloc (maxargc * sizeof (char *));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
maxargc *= 2;
|
|
|
|
nargv = (char **) realloc (argv, maxargc * sizeof (char *));
|
|
|
|
}
|
|
|
|
if (nargv == NULL)
|
|
|
|
{
|
|
|
|
if (argv != NULL)
|
|
|
|
{
|
|
|
|
freeargv (argv);
|
|
|
|
argv = NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
argv = nargv;
|
|
|
|
argv[argc] = NULL;
|
|
|
|
}
|
|
|
|
/* Begin scanning arg */
|
|
|
|
arg = copybuf;
|
|
|
|
while (*input != EOS)
|
|
|
|
{
|
safe-ctype.h: New file.
include:
* safe-ctype.h: New file.
libiberty:
* safe-ctype.c: New file.
* Makefile.in (CFILES): Add safe-ctype.c.
(REQUIRED_OFILES): Add safe-ctype.o.
* argv.c: Define ISBLANK and use it, not isspace.
* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use
uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c)
before calling TOLOWER(c)/TOUPPER(c).
gcc:
* Makefile.in (HOST_RTL): Add safe-ctype.o.
(safe-ctype.o): New rule.
* system.h: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros.
* cpphash.h: Zap IStable and related macros. Define is_* in
terms of safe-ctype.h macros.
* cppinit.c: Delete the IStable and all related code.
* tradcpp.c: Delete is_idchar, is_idstart, is_hor_space, and
is_space arrays. Delete initialize_char_syntax. Change all
references to the above arrays to use macros instead.
* tradcpp.h: Define is_idchar, is_idstart, is_space, and
is_nvspace in terms of safe_ctype.h's macros.
* tradcif.y: is_idchar, is_idstart are macros not arrays.
* config/i370/i370.c, config/winnt/dirent.c,
config/winnt/fixinc-nt.c, config/winnt/ld.c:
Use uppercase ctype macros. If we included ctype.h,
include safe-ctype.h instead.
* fixinc/fixfixes.c: Use uppercase ctype macros. Don't test
ISLOWER(c) before calling TOUPPER(c).
* fixinc/fixincl.c (extract_quoted_files): Simplify out some gunk.
* fixinc/gnu-regex.c: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros. Don't test ISUPPER(x) before calling TOLOWER(x).
gcc/ch:
* lex.c: Don't bother checking whether ISUPPER(c) before
calling TOLOWER(c). Don't bother checking whether isascii(c)
before testing ISSPACE(c); ISSPACE(c) includes '\n'.
gcc/f:
* Make-lang.in: Link f/fini with safe-ctype.o.
* bad.c: Don't test ISUPPER(c) || ISLOWER(c) before calling TOUPPER(c).
* com.c: Use TOUPPER, not ffesrc_toupper.
* fini.c: Don't test ISALPHA(c) before calling TOUPPER(c)/TOLOWER(c).
* intrin.c: Don't test IN_CTYPE_DOMAIN(c).
* src.c: Delete ffesrc_toupper_ and ffesrc_tolower_ and their
initializing code; use TOUPPER and TOLOWER instead of
ffesrc_toupper and ffesrc_tolower.
* src.h: Don't declare ffesrc_toupper_ or ffesrc_tolower_.
Don't define ffesrc_toupper or ffesrc_tolower.
gcc/java:
* jvgenmain.c: Use ISPRINT not isascii.
From-SVN: r38124
2000-12-08 04:00:26 +01:00
|
|
|
if (ISBLANK (*input) && !squote && !dquote && !bsquote)
|
1997-08-22 00:57:35 +02:00
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (bsquote)
|
|
|
|
{
|
|
|
|
bsquote = 0;
|
|
|
|
*arg++ = *input;
|
|
|
|
}
|
|
|
|
else if (*input == '\\')
|
|
|
|
{
|
|
|
|
bsquote = 1;
|
|
|
|
}
|
|
|
|
else if (squote)
|
|
|
|
{
|
|
|
|
if (*input == '\'')
|
|
|
|
{
|
|
|
|
squote = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*arg++ = *input;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (dquote)
|
|
|
|
{
|
|
|
|
if (*input == '"')
|
|
|
|
{
|
|
|
|
dquote = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*arg++ = *input;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (*input == '\'')
|
|
|
|
{
|
|
|
|
squote = 1;
|
|
|
|
}
|
|
|
|
else if (*input == '"')
|
|
|
|
{
|
|
|
|
dquote = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
*arg++ = *input;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
input++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*arg = EOS;
|
|
|
|
argv[argc] = strdup (copybuf);
|
|
|
|
if (argv[argc] == NULL)
|
|
|
|
{
|
|
|
|
freeargv (argv);
|
|
|
|
argv = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
argc++;
|
|
|
|
argv[argc] = NULL;
|
|
|
|
|
safe-ctype.h: New file.
include:
* safe-ctype.h: New file.
libiberty:
* safe-ctype.c: New file.
* Makefile.in (CFILES): Add safe-ctype.c.
(REQUIRED_OFILES): Add safe-ctype.o.
* argv.c: Define ISBLANK and use it, not isspace.
* basename.c, cplus-dem.c, fnmatch.c, pexecute.c, strtod.c,
strtol.c, strtoul.c: Include safe-ctype.h, not ctype.h. Use
uppercase ctype macros. Don't test ISUPPER(c)/ISLOWER(c)
before calling TOLOWER(c)/TOUPPER(c).
gcc:
* Makefile.in (HOST_RTL): Add safe-ctype.o.
(safe-ctype.o): New rule.
* system.h: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros.
* cpphash.h: Zap IStable and related macros. Define is_* in
terms of safe-ctype.h macros.
* cppinit.c: Delete the IStable and all related code.
* tradcpp.c: Delete is_idchar, is_idstart, is_hor_space, and
is_space arrays. Delete initialize_char_syntax. Change all
references to the above arrays to use macros instead.
* tradcpp.h: Define is_idchar, is_idstart, is_space, and
is_nvspace in terms of safe_ctype.h's macros.
* tradcif.y: is_idchar, is_idstart are macros not arrays.
* config/i370/i370.c, config/winnt/dirent.c,
config/winnt/fixinc-nt.c, config/winnt/ld.c:
Use uppercase ctype macros. If we included ctype.h,
include safe-ctype.h instead.
* fixinc/fixfixes.c: Use uppercase ctype macros. Don't test
ISLOWER(c) before calling TOUPPER(c).
* fixinc/fixincl.c (extract_quoted_files): Simplify out some gunk.
* fixinc/gnu-regex.c: Include safe-ctype.h, not ctype.h. No need to
wrap ctype macros. Don't test ISUPPER(x) before calling TOLOWER(x).
gcc/ch:
* lex.c: Don't bother checking whether ISUPPER(c) before
calling TOLOWER(c). Don't bother checking whether isascii(c)
before testing ISSPACE(c); ISSPACE(c) includes '\n'.
gcc/f:
* Make-lang.in: Link f/fini with safe-ctype.o.
* bad.c: Don't test ISUPPER(c) || ISLOWER(c) before calling TOUPPER(c).
* com.c: Use TOUPPER, not ffesrc_toupper.
* fini.c: Don't test ISALPHA(c) before calling TOUPPER(c)/TOLOWER(c).
* intrin.c: Don't test IN_CTYPE_DOMAIN(c).
* src.c: Delete ffesrc_toupper_ and ffesrc_tolower_ and their
initializing code; use TOUPPER and TOLOWER instead of
ffesrc_toupper and ffesrc_tolower.
* src.h: Don't declare ffesrc_toupper_ or ffesrc_tolower_.
Don't define ffesrc_toupper or ffesrc_tolower.
gcc/java:
* jvgenmain.c: Use ISPRINT not isascii.
From-SVN: r38124
2000-12-08 04:00:26 +01:00
|
|
|
while (ISBLANK (*input))
|
1997-08-22 00:57:35 +02:00
|
|
|
{
|
|
|
|
input++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (*input != EOS);
|
|
|
|
}
|
|
|
|
return (argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef MAIN
|
|
|
|
|
|
|
|
/* Simple little test driver. */
|
|
|
|
|
2001-10-07 16:45:04 +02:00
|
|
|
static const char *const tests[] =
|
1997-08-22 00:57:35 +02:00
|
|
|
{
|
|
|
|
"a simple command line",
|
|
|
|
"arg 'foo' is single quoted",
|
|
|
|
"arg \"bar\" is double quoted",
|
|
|
|
"arg \"foo bar\" has embedded whitespace",
|
|
|
|
"arg 'Jack said \\'hi\\'' has single quotes",
|
|
|
|
"arg 'Jack said \\\"hi\\\"' has double quotes",
|
|
|
|
"a b c d e f g h i j k l m n o p q r s t u v w x y z 1 2 3 4 5 6 7 8 9",
|
|
|
|
|
|
|
|
/* This should be expanded into only one argument. */
|
|
|
|
"trailing-whitespace ",
|
|
|
|
|
|
|
|
"",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2001-10-07 16:45:04 +02:00
|
|
|
int main ()
|
1997-08-22 00:57:35 +02:00
|
|
|
{
|
|
|
|
char **argv;
|
2001-10-07 16:45:04 +02:00
|
|
|
const char *const *test;
|
1997-08-22 00:57:35 +02:00
|
|
|
char **targs;
|
|
|
|
|
|
|
|
for (test = tests; *test != NULL; test++)
|
|
|
|
{
|
|
|
|
printf ("buildargv(\"%s\")\n", *test);
|
|
|
|
if ((argv = buildargv (*test)) == NULL)
|
|
|
|
{
|
|
|
|
printf ("failed!\n\n");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (targs = argv; *targs != NULL; targs++)
|
|
|
|
{
|
|
|
|
printf ("\t\"%s\"\n", *targs);
|
|
|
|
}
|
|
|
|
printf ("\n");
|
|
|
|
}
|
|
|
|
freeargv (argv);
|
|
|
|
}
|
|
|
|
|
2001-10-07 16:45:04 +02:00
|
|
|
return 0;
|
1997-08-22 00:57:35 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* MAIN */
|