Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't botch varargs: the are not always an array of void * in the stack... 

Write a separate function to convert a list of function parameters to
  an argv array.
- explain why execv failed.
This commit is contained in:
christos 1997-07-30 15:33:22 +00:00
parent b61a48cef7
commit 6613161476
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.sbin/sup/source/run.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: run.c,v 1.7 1997/07/15 18:15:55 christos Exp $ */
/* $NetBSD: run.c,v 1.8 1997/07/30 15:33:22 christos Exp $ */
/*
* Copyright (c) 1991 Carnegie Mellon University
@ -102,6 +102,27 @@
#endif
static int dorun __P((char *, char **, int));
static char **makearglist __P((va_list));
static char **
makearglist(ap)
va_list ap;
{
static size_t ns = 0;
static char **np = NULL;
int i = 0;
do {
if (i >= ns) {
ns += 20;
if ((np = realloc(np, ns)) == NULL)
return NULL;
}
np[i] = va_arg(ap, char *);
}
while (np[i++] != NULL);
return np;
}
int
#ifdef __STDC__
@ -123,7 +144,8 @@ va_dcl
name = va_arg(ap, char *);
#endif
argv = va_arg(ap, char **);
if ((argv = makearglist(ap)) == NULL)
return -1;
val = runv (name, argv);
va_end(ap);
return(val);
@ -155,7 +177,8 @@ va_dcl
name = va_arg(ap, char *);
#endif
argv = va_arg(ap, char **);
if ((argv = makearglist(ap)) == NULL)
return -1;
val = runvp (name, argv);
va_end(ap);
return (val);
@ -187,7 +210,8 @@ int usepath;
execvp(name,argv);
else
execv(name,argv);
fprintf (stderr,"run: can't exec %s\n",name);
fprintf (stderr,"run: can't exec %s (%s)\n",name,
strerror(errno));
_exit (0377);
}