fix whitespace

This commit is contained in:
Christopher Faylor 2005-07-16 22:01:50 +00:00
parent 5fc585f645
commit cd929277d6

View File

@ -908,7 +908,7 @@ out:
extern "C" int extern "C" int
cwait (int *result, int pid, int) cwait (int *result, int pid, int)
{ {
return waitpid (pid, result, 0); return waitpid (pid, result, 0);
} }
/* /*
@ -920,19 +920,19 @@ extern "C" int
spawnve (int mode, const char *path, const char *const *argv, spawnve (int mode, const char *path, const char *const *argv,
const char *const *envp) const char *const *envp)
{ {
int ret; int ret;
#ifdef NEWVFORK #ifdef NEWVFORK
vfork_save *vf = vfork_storage.val (); vfork_save *vf = vfork_storage.val ();
if (vf != NULL && (vf->pid < 0) && mode == _P_OVERLAY) if (vf != NULL && (vf->pid < 0) && mode == _P_OVERLAY)
mode = _P_NOWAIT; mode = _P_NOWAIT;
else else
vf = NULL; vf = NULL;
#endif #endif
syscall_printf ("spawnve (%s, %s, %x)", path, argv[0], envp); syscall_printf ("spawnve (%s, %s, %x)", path, argv[0], envp);
switch (mode) switch (mode)
{ {
case _P_OVERLAY: case _P_OVERLAY:
/* We do not pass _P_SEARCH_PATH here. execve doesn't search PATH.*/ /* We do not pass _P_SEARCH_PATH here. execve doesn't search PATH.*/
@ -964,7 +964,7 @@ switch (mode)
ret = -1; ret = -1;
break; break;
} }
return ret; return ret;
} }
/* /*
@ -975,103 +975,103 @@ return ret;
extern "C" int extern "C" int
spawnl (int mode, const char *path, const char *arg0, ...) spawnl (int mode, const char *path, const char *arg0, ...)
{ {
int i; int i;
va_list args; va_list args;
const char *argv[256]; const char *argv[256];
va_start (args, arg0); va_start (args, arg0);
argv[0] = arg0; argv[0] = arg0;
i = 1; i = 1;
do do
argv[i] = va_arg (args, const char *); argv[i] = va_arg (args, const char *);
while (argv[i++] != NULL); while (argv[i++] != NULL);
va_end (args); va_end (args);
return spawnve (mode, path, (char * const *) argv, cur_environ ()); return spawnve (mode, path, (char * const *) argv, cur_environ ());
} }
extern "C" int extern "C" int
spawnle (int mode, const char *path, const char *arg0, ...) spawnle (int mode, const char *path, const char *arg0, ...)
{ {
int i; int i;
va_list args; va_list args;
const char * const *envp; const char * const *envp;
const char *argv[256]; const char *argv[256];
va_start (args, arg0); va_start (args, arg0);
argv[0] = arg0; argv[0] = arg0;
i = 1; i = 1;
do do
argv[i] = va_arg (args, const char *); argv[i] = va_arg (args, const char *);
while (argv[i++] != NULL); while (argv[i++] != NULL);
envp = va_arg (args, const char * const *); envp = va_arg (args, const char * const *);
va_end (args); va_end (args);
return spawnve (mode, path, (char * const *) argv, (char * const *) envp); return spawnve (mode, path, (char * const *) argv, (char * const *) envp);
} }
extern "C" int extern "C" int
spawnlp (int mode, const char *path, const char *arg0, ...) spawnlp (int mode, const char *path, const char *arg0, ...)
{ {
int i; int i;
va_list args; va_list args;
const char *argv[256]; const char *argv[256];
va_start (args, arg0); va_start (args, arg0);
argv[0] = arg0; argv[0] = arg0;
i = 1; i = 1;
do do
argv[i] = va_arg (args, const char *); argv[i] = va_arg (args, const char *);
while (argv[i++] != NULL); while (argv[i++] != NULL);
va_end (args); va_end (args);
return spawnvpe (mode, path, (char * const *) argv, cur_environ ()); return spawnvpe (mode, path, (char * const *) argv, cur_environ ());
} }
extern "C" int extern "C" int
spawnlpe (int mode, const char *path, const char *arg0, ...) spawnlpe (int mode, const char *path, const char *arg0, ...)
{ {
int i; int i;
va_list args; va_list args;
const char * const *envp; const char * const *envp;
const char *argv[256]; const char *argv[256];
va_start (args, arg0); va_start (args, arg0);
argv[0] = arg0; argv[0] = arg0;
i = 1; i = 1;
do do
argv[i] = va_arg (args, const char *); argv[i] = va_arg (args, const char *);
while (argv[i++] != NULL); while (argv[i++] != NULL);
envp = va_arg (args, const char * const *); envp = va_arg (args, const char * const *);
va_end (args); va_end (args);
return spawnvpe (mode, path, (char * const *) argv, envp); return spawnvpe (mode, path, (char * const *) argv, envp);
} }
extern "C" int extern "C" int
spawnv (int mode, const char *path, const char * const *argv) spawnv (int mode, const char *path, const char * const *argv)
{ {
return spawnve (mode, path, argv, cur_environ ()); return spawnve (mode, path, argv, cur_environ ());
} }
extern "C" int extern "C" int
spawnvp (int mode, const char *path, const char * const *argv) spawnvp (int mode, const char *path, const char * const *argv)
{ {
return spawnvpe (mode, path, argv, cur_environ ()); return spawnvpe (mode, path, argv, cur_environ ());
} }
extern "C" int extern "C" int
spawnvpe (int mode, const char *file, const char * const *argv, spawnvpe (int mode, const char *file, const char * const *argv,
const char * const *envp) const char * const *envp)
{ {
path_conv buf; path_conv buf;
return spawnve (mode, find_exec (file, buf), argv, envp); return spawnve (mode, find_exec (file, buf), argv, envp);
} }