Deleted Added
full compact
exec.c (50476) exec.c (55837)
1/*-
2 * Copyright (c) 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
1/*-
2 * Copyright (c) 1991, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/lib/libc/gen/exec.c 55837 2000-01-12 09:23:48Z jasone $
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35#if 0
36static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
37#endif
38static const char rcsid[] =
34 */
35
36#if defined(LIBC_SCCS) && !defined(lint)
37#if 0
38static char sccsid[] = "@(#)exec.c 8.1 (Berkeley) 6/4/93";
39#endif
40static const char rcsid[] =
39 "$FreeBSD: head/lib/libc/gen/exec.c 50476 1999-08-28 00:22:10Z peter $";
41 "$FreeBSD: head/lib/libc/gen/exec.c 55837 2000-01-12 09:23:48Z jasone $";
40#endif /* LIBC_SCCS and not lint */
41
42#include <sys/param.h>
43#include <sys/types.h>
44#include <sys/stat.h>
45#include <errno.h>
46#include <unistd.h>
47#include <stdlib.h>

--- 194 unchanged lines hidden (view full) ---

242 ln = strlen(name);
243
244 /*
245 * If the path is too long complain. This is a possible
246 * security issue; given a way to make the path too long
247 * the user may execute the wrong program.
248 */
249 if (lp + ln + 2 > sizeof(buf)) {
42#endif /* LIBC_SCCS and not lint */
43
44#include <sys/param.h>
45#include <sys/types.h>
46#include <sys/stat.h>
47#include <errno.h>
48#include <unistd.h>
49#include <stdlib.h>

--- 194 unchanged lines hidden (view full) ---

244 ln = strlen(name);
245
246 /*
247 * If the path is too long complain. This is a possible
248 * security issue; given a way to make the path too long
249 * the user may execute the wrong program.
250 */
251 if (lp + ln + 2 > sizeof(buf)) {
250 (void)write(STDERR_FILENO, "execvp: ", 8);
251 (void)write(STDERR_FILENO, p, lp);
252 (void)write(STDERR_FILENO, ": path too long\n", 16);
252 (void)_libc_write(STDERR_FILENO, "execvp: ", 8);
253 (void)_libc_write(STDERR_FILENO, p, lp);
254 (void)_libc_write(STDERR_FILENO, ": path too long\n",
255 16);
253 continue;
254 }
255 bcopy(p, buf, lp);
256 buf[lp] = '/';
257 bcopy(name, buf + lp + 1, ln);
258 buf[lp + ln + 1] = '\0';
259
260retry: (void)execve(bp, argv, environ);

--- 55 unchanged lines hidden ---
256 continue;
257 }
258 bcopy(p, buf, lp);
259 buf[lp] = '/';
260 bcopy(name, buf + lp + 1, ln);
261 buf[lp + ln + 1] = '\0';
262
263retry: (void)execve(bp, argv, environ);

--- 55 unchanged lines hidden ---