projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RISC-V: Don't assume the priv attributes are in order when handling them.
[deliverable/binutils-gdb.git]
/
libiberty
/
argv.c
diff --git
a/libiberty/argv.c
b/libiberty/argv.c
index 5c3dd70b0422c77076944d0266c5817c96b284a3..6a72208d8458e7d1650d5d2831c770ed7a8c7195 100644
(file)
--- a/
libiberty/argv.c
+++ b/
libiberty/argv.c
@@
-1,5
+1,5
@@
/* Create and destroy argument vectors (argv's)
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992
, 2001, 2010, 2012
Free Software Foundation, Inc.
+ Copyright (C) 1992
-2020
Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
@@
-35,6
+35,13
@@
Boston, MA 02110-1301, USA. */
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#ifndef NULL
#define NULL 0
#ifndef NULL
#define NULL 0
@@
-49,7
+56,7
@@
Boston, MA 02110-1301, USA. */
/*
/*
-@deftypefn Extension char** dupargv (char **@var{vector})
+@deftypefn Extension char** dupargv (char *
const
*@var{vector})
Duplicate an argument vector. Simply scans through @var{vector},
duplicating each argument until the terminating @code{NULL} is found.
Duplicate an argument vector. Simply scans through @var{vector},
duplicating each argument until the terminating @code{NULL} is found.
@@
-62,7
+69,7
@@
argument vector.
*/
char **
*/
char **
-dupargv (char **argv)
+dupargv (char *
const
*argv)
{
int argc;
char **copy;
{
int argc;
char **copy;
@@
-279,7
+286,7
@@
char **buildargv (const char *input)
/*
/*
-@deftypefn Extension int writeargv (c
onst char *
*@var{argv}, FILE *@var{file})
+@deftypefn Extension int writeargv (c
har * const
*@var{argv}, FILE *@var{file})
Write each member of ARGV, handling all necessary quoting, to the file
named by FILE, separated by whitespace. Return 0 on success, non-zero
Write each member of ARGV, handling all necessary quoting, to the file
named by FILE, separated by whitespace. Return 0 on success, non-zero
@@
-290,7
+297,7
@@
if an error occurred while writing to FILE.
*/
int
*/
int
-writeargv (char **argv, FILE *f)
+writeargv (char *
const
*argv, FILE *f)
{
int status = 0;
{
int status = 0;
@@
-320,6
+327,14
@@
writeargv (char **argv, FILE *f)
arg++;
}
arg++;
}
+ /* Write out a pair of quotes for an empty argument. */
+ if (arg == *argv)
+ if (EOF == fputs ("\"\"", f))
+ {
+ status = 1;
+ goto done;
+ }
+
if (EOF == fputc ('\n', f))
{
status = 1;
if (EOF == fputc ('\n', f))
{
status = 1;
@@
-360,8
+375,8
@@
expandargv (int *argcp, char ***argvp)
{
/* The argument we are currently processing. */
int i = 0;
{
/* The argument we are currently processing. */
int i = 0;
- /*
Non-zero
if ***argvp has been dynamically allocated. */
-
int argv_dynamic = 0
;
+ /*
To check
if ***argvp has been dynamically allocated. */
+
char ** const original_argv = *argvp
;
/* Limit the number of response files that we parse in order
to prevent infinite recursion. */
unsigned int iteration_limit = 2000;
/* Limit the number of response files that we parse in order
to prevent infinite recursion. */
unsigned int iteration_limit = 2000;
@@
-387,6
+402,9
@@
expandargv (int *argcp, char ***argvp)
char **file_argv;
/* The number of options read from the response file, if any. */
size_t file_argc;
char **file_argv;
/* The number of options read from the response file, if any. */
size_t file_argc;
+#ifdef S_ISDIR
+ struct stat sb;
+#endif
/* We are only interested in options of the form "@file". */
filename = (*argvp)[i];
if (filename[0] != '@')
/* We are only interested in options of the form "@file". */
filename = (*argvp)[i];
if (filename[0] != '@')
@@
-397,6
+415,15
@@
expandargv (int *argcp, char ***argvp)
fprintf (stderr, "%s: error: too many @-files encountered\n", (*argvp)[0]);
xexit (1);
}
fprintf (stderr, "%s: error: too many @-files encountered\n", (*argvp)[0]);
xexit (1);
}
+#ifdef S_ISDIR
+ if (stat (filename+1, &sb) < 0)
+ continue;
+ if (S_ISDIR(sb.st_mode))
+ {
+ fprintf (stderr, "%s: error: @-file refers to a directory\n", (*argvp)[0]);
+ xexit (1);
+ }
+#endif
/* Read the contents of the file. */
f = fopen (++filename, "r");
if (!f)
/* Read the contents of the file. */
f = fopen (++filename, "r");
if (!f)
@@
-430,12
+457,14
@@
expandargv (int *argcp, char ***argvp)
/* Parse the string. */
file_argv = buildargv (buffer);
/* If *ARGVP is not already dynamically allocated, copy it. */
/* Parse the string. */
file_argv = buildargv (buffer);
/* If *ARGVP is not already dynamically allocated, copy it. */
- if (
!argv_dynamic
)
+ if (
*argvp == original_argv
)
*argvp = dupargv (*argvp);
/* Count the number of arguments. */
file_argc = 0;
while (file_argv[file_argc])
++file_argc;
*argvp = dupargv (*argvp);
/* Count the number of arguments. */
file_argc = 0;
while (file_argv[file_argc])
++file_argc;
+ /* Free the original option's memory. */
+ free ((*argvp)[i]);
/* Now, insert FILE_ARGV into ARGV. The "+1" below handles the
NULL terminator at the end of ARGV. */
*argvp = ((char **)
/* Now, insert FILE_ARGV into ARGV. The "+1" below handles the
NULL terminator at the end of ARGV. */
*argvp = ((char **)
@@
-463,7
+492,7
@@
expandargv (int *argcp, char ***argvp)
/*
/*
-@deftypefn Extension int countargv (char **@var{argv})
+@deftypefn Extension int countargv (char *
const
*@var{argv})
Return the number of elements in @var{argv}.
Returns zero if @var{argv} is NULL.
Return the number of elements in @var{argv}.
Returns zero if @var{argv} is NULL.
@@
-473,7
+502,7
@@
Returns zero if @var{argv} is NULL.
*/
int
*/
int
-countargv (char **argv)
+countargv (char *
const
*argv)
{
int argc;
{
int argc;
This page took
0.025044 seconds
and
4
git commands to generate.