summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. De Boskey <jwd@FreeBSD.org>2001-11-28 03:26:58 +0000
committerJohn W. De Boskey <jwd@FreeBSD.org>2001-11-28 03:26:58 +0000
commita5f75648d857178bc47f412f83547b5cec3ad540 (patch)
tree2d7cb338d9de6526161b14c0d81b2bd15578a3c6
parent023a0e6100f53d10cc73373be70fce211bb4a2a9 (diff)
Notes
-rw-r--r--lib/libc/sys/execve.23
-rw-r--r--sys/kern/imgact_shell.c2
-rw-r--r--sys/sys/imgact.h2
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 56aefcf2dbe4..84e9537b0d7e 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -210,6 +210,9 @@ A component of the path prefix is not a directory.
.It Bq Er ENAMETOOLONG
A component of a pathname exceeded 255 characters,
or an entire path name exceeded 1023 characters.
+.It Bq Er ENAMETOOLONG
+When invoking an interpreted script, the interpreter name
+exceeds MAXSHELLCMDLEN characters.
.It Bq Er ENOENT
The new process file does not exist.
.It Bq Er ELOOP
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index a15b56ca9d9b..8480fccc1edd 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -74,7 +74,7 @@ exec_shell_imgact(imgp)
*/
for (ihp = &image_header[2]; *ihp != '\n' && *ihp != '#'; ++ihp) {
if (ihp >= &image_header[MAXSHELLCMDLEN])
- return(ENOEXEC);
+ return(ENAMETOOLONG);
}
line_endp = ihp;
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index c4647c58d063..b6f67a4b849b 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -36,7 +36,7 @@
#ifndef _SYS_IMGACT_H_
#define _SYS_IMGACT_H_
-#define MAXSHELLCMDLEN 64
+#define MAXSHELLCMDLEN 128
struct image_params {
struct proc *proc; /* our process struct */