JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* spawn.cc (av::error): Eliminate.

Browse Source 
(av::av): Remove reference to error.
(av::replace0_maybe): Ditto.
(av::dup_maybe): Ditto.
(av::dup_all): Ditto.
(av::unshift): Ditto.
(spawn_guts): On a fault, return E2BIG only if ENOMEM has been set.  Otherwise
return EFAULT.
This commit is contained in:
Christopher Faylor 2005-09-14 23:03:44 +00:00
parent c9629cefe9
commit ae37cc1218
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,14 @@
2005-09-14 Christopher Faylor <cgf@timesys.com>
* spawn.cc (av::error): Eliminate.
(av::av): Remove reference to error.
(av::replace0_maybe): Ditto.
(av::dup_maybe): Ditto.
(av::dup_all): Ditto.
(av::unshift): Ditto.
(spawn_guts): On a fault, return E2BIG only if ENOMEM has been set.
Otherwise return EFAULT.
2005-09-14 Christopher Faylor <cgf@timesys.com> 2005-09-14 Christopher Faylor <cgf@timesys.com>
* cygtls.h (san): New structure. * cygtls.h (san): New structure.

38
winsup/cygwin/spawn.cc
View File

@ -289,11 +289,10 @@ class av
char **argv; char **argv;
int calloced; int calloced;
public: public:
int error;
int argc; int argc;
bool win16_exe; bool win16_exe;
av (): argv (NULL) {} av (): argv (NULL) {}
av (int ac_in, const char * const *av_in) : calloced (0), error (false), argc (ac_in), win16_exe (false) av (int ac_in, const char * const *av_in) : calloced (0), argc (ac_in), win16_exe (false)
{ {
argv = (char **) cmalloc (HEAP_1_ARGV, (argc + 5) * sizeof (char *)); argv = (char **) cmalloc (HEAP_1_ARGV, (argc + 5) * sizeof (char *));
memcpy (argv, av_in, (argc + 1) * sizeof (char *)); memcpy (argv, av_in, (argc + 1) * sizeof (char *));
@ -316,23 +315,21 @@ class av
void replace0_maybe (const char *arg0) void replace0_maybe (const char *arg0)
{ {
/* Note: Assumes that argv array has not yet been "unshifted" */ /* Note: Assumes that argv array has not yet been "unshifted" */
if (!calloced if (!calloced)
&& (argv[0] = cstrdup1 (arg0))) {
calloced = true; argv[0] = cstrdup1 (arg0);
else calloced = true;
error = errno; }
} }
void dup_maybe (int i) void dup_maybe (int i)
{ {
if (i >= calloced if (i >= calloced)
&& !(argv[i] = cstrdup1 (argv[i]))) argv[i] = cstrdup1 (argv[i]);
error = errno;
} }
void dup_all () void dup_all ()
{ {
for (int i = calloced; i < argc; i++) for (int i = calloced; i < argc; i++)
if (!(argv[i] = cstrdup1 (argv[i]))) argv[i] = cstrdup1 (argv[i]);
error = errno;
} }
int fixup (child_info_types, const char *, path_conv&, const char *); int fixup (child_info_types, const char *, path_conv&, const char *);
}; };
@ -356,10 +353,9 @@ av::unshift (const char *what, int conv)
*p = '\0'; *p = '\0';
what = buf; what = buf;
} }
if (!(*argv = cstrdup1 (what))) *argv = cstrdup1 (what);
error = errno;
argc++;
calloced++; calloced++;
argc++;
return 1; return 1;
} }
@ -433,8 +429,12 @@ spawn_guts (const char * prog_arg, const char *const *argv,
STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL}; STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
myfault efault; myfault efault;
if (efault.faulted (E2BIG)) if (efault.faulted ())
{ {
if (get_errno () == ENOMEM)
set_errno (E2BIG);
else
set_errno (EFAULT);
res = -1; res = -1;
goto out; goto out;
} }
@ -552,12 +552,6 @@ spawn_guts (const char * prog_arg, const char *const *argv,
char *envblock; char *envblock;
newargv.all_calloced (); newargv.all_calloced ();
if (newargv.error)
{
set_errno (newargv.error);
return -1;
}
moreinfo->argc = newargv.argc; moreinfo->argc = newargv.argc;
moreinfo->argv = newargv; moreinfo->argv = newargv;