d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a (relatively harmless) braino. I confused myself over the for() loop

Browse Source 
that counted the number of elements in argv.  The counter is incremented
in the next-iteration section of the loop, not the body, so at termination
it's already "counted" the element that failed the continuation test - in
this case the NULL argv terminator.

Noted by:  bde
This commit is contained in:
peter 1999-03-24 02:43:05 +00:00
parent 37a06217a9
commit 253f61532f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libc/gen/exec.c
View File

@ -36,7 +36,7 @@
static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
#endif
static const char rcsid[] =
"$Id: exec.c,v 1.10 1998/10/15 17:14:15 des Exp $";
"$Id: exec.c,v 1.11 1999/03/23 16:40:34 peter Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@ -268,7 +268,7 @@ retry: (void)execve(bp, argv, environ);
case ENOEXEC:
for (cnt = 0; argv[cnt]; ++cnt)
;
memp = alloca((cnt + 3) * sizeof(char *));
memp = alloca((cnt + 2) * sizeof(char *));
if (memp == NULL) {
/* errno = ENOMEM; XXX override ENOEXEC? */
goto done;
@ -276,7 +276,6 @@ retry: (void)execve(bp, argv, environ);
memp[0] = "sh";
memp[1] = bp;
bcopy(argv + 1, memp + 2, cnt * sizeof(char *));
memp[cnt + 2] = NULL;
(void)execve(_PATH_BSHELL, memp, environ);
goto done;
case ENOMEM: