FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from gcc

Browse source
This commit is contained in:
DJ Delorie 2006-10-26 04:18:42 +00:00
parent 1bc214bab3
commit 3ac01eb265
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libiberty/pex-win32.c
View file

@ -1,6 +1,6 @@
/* Utilities to execute a program in a subprocess (possibly linked by pipes
with other subprocesses), and wait for it. Generic Win32 specialization.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
Free Software Foundation, Inc.
This file is part of the libiberty library.
@ -358,7 +358,7 @@ argv_to_cmdline (char *const *argv)
cmdline_len += j;
cmdline_len += 3; /* for leading and trailing quotes and space */
}
cmdline = xmalloc (cmdline_len);
cmdline = XNEWVEC (char, cmdline_len);
p = cmdline;
for (i = 0; argv[i]; i++)
{
@ -433,7 +433,7 @@ find_executable (const char *program, BOOL search)
q++;
}
fe_len = fe_len + 1 + proglen + (has_extension ? 1 : 5);
full_executable = xmalloc (fe_len);
full_executable = XNEWVEC (char, fe_len);
p = path;
do
@ -557,14 +557,14 @@ win32_spawn (const char *executable,
/* Windows needs the members of the block to be sorted by variable
name. */
env_copy = alloca (sizeof (char *) * env_size);
env_copy = (char **) alloca (sizeof (char *) * env_size);
memcpy (env_copy, env, sizeof (char *) * env_size);
qsort (env_copy, env_size, sizeof (char *), env_compare);
for (var = 0; var < env_size; var++)
total_size += strlen (env[var]) + 1;
env_block = malloc (total_size);
env_block = XNEWVEC (char, total_size);
bufptr = env_block;
for (var = 0; var < env_size; var++)
bufptr = stpcpy (bufptr, env_copy[var]) + 1;