Attachment 11580 Details for Bug 22755 – file.diff

[patch] file.diff

file.diff (text/plain), 1.76 KB, created by mwm on 2000-11-10 20:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mwm

Created: 2000-11-10 20:20:00 UTC

Size: 1.76 KB

patch

obsolete

>--- sys/kern/kern_exec.c-orig	Fri Nov 10 03:06:47 2000
>+++ sys/kern/kern_exec.c	Fri Nov 10 04:09:03 2000
>@@ -382,6 +382,7 @@
> 		/* NOT REACHED */
> 		return(0);
> 	} else {
>+		if (error && imgp->interpreted) error = EINVALINTERP;
> 		return(error);
> 	}
> }
>--- lib/libc/gen/errlst.c-orig	Fri Nov 10 03:15:18 2000
>+++ lib/libc/gen/errlst.c	Fri Nov 10 03:15:46 2000
>@@ -143,6 +143,7 @@
> 	"Value too large to be stored in data type", /* 84 - EOVERFLOW */
> 	"Operation canceled",			/* 85 - ECANCELED */
> 	"Illegal byte sequence",		/* 86 - EILSEQ */
>+	"Invalid interpreter",			/* 87 - EINVALINTERP */
> };
> int errno;
> const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
>--- sys/sys/errno.h-orig	Fri Nov 10 03:12:06 2000
>+++ sys/sys/errno.h	Fri Nov 10 03:12:47 2000
>@@ -167,7 +167,8 @@
> #define	EOVERFLOW	84		/* Value too large to be stored in data type */
> #define	ECANCELED	85		/* Operation canceled */
> #define	EILSEQ		86		/* Illegal byte sequence */
>-#define	ELAST		86		/* Must be equal largest errno */
>+#define EINVALINTERP	87		/* Invalid Interpreter */
>+#define	ELAST		87		/* Must be equal largest errno */
> 
> #endif /* _POSIX_SOURCE */
> 
>--- imgact_shell.c-orig		Wed Apr 26 15:58:39 2000
>+++ imgact_shell.c	Fri Nov 10 03:29:11 2000
>@@ -60,7 +60,7 @@
> 	 *	script. :-)
> 	 */
> 	if (imgp->interpreted)
>-		return(ENOEXEC);
>+		return(EINVALINTERP);
> 
> 	imgp->interpreted = 1;
> 
>@@ -74,7 +74,7 @@
> 	 */
> 	for (ihp = &image_header[2]; *ihp != '\n' && *ihp != '#'; ++ihp) {
> 		if (ihp >= &image_header[MAXSHELLCMDLEN])
>-			return(ENOEXEC);
>+			return(EINVALINTERP);
> 	}
> 	line_endp = ihp;
> 
>@@ -92,7 +92,7 @@
> 
> 	/* Disallow a null interpreter filename */
> 	if (*imgp->interpreter_name == '\0')
>-		return(ENOEXEC);
>+		return(EINVALINTERP);
> 
> 	/* reset for another pass */
> 	ihp = &image_header[2];

Actions: View | Diff

Attachments on bug 22755: 11580