diff options
author | Michael Brown | 2009-06-03 11:13:29 +0200 |
---|---|---|
committer | Michael Brown | 2009-06-03 11:13:29 +0200 |
commit | 4c5f00f8790ccea7c05aa116f580512c854a76a5 (patch) | |
tree | 0a50fba13613fdaecc0dd0b920ffdf1ca4c8b518 /src/core/exec.c | |
parent | [misc] Remove long-obsolete header files dating from Etherboot 5.4 (diff) | |
download | ipxe-4c5f00f8790ccea7c05aa116f580512c854a76a5.tar.gz ipxe-4c5f00f8790ccea7c05aa116f580512c854a76a5.tar.xz ipxe-4c5f00f8790ccea7c05aa116f580512c854a76a5.zip |
[script] Allow for DOS-style line endings in scripts
Windows text editors such as Notepad tend to use CRLF line endings,
which breaks gPXE's signature detection for script images. Since
scripts are usually very small, they end up falling back to being
detected as valid PXE executable images (since there are no signature
checks for PXE executables). Executing text files as x86 machine code
tends not to work well.
Fix by allowing for any isspace() character to terminate the "#!gpxe"
signature, and by ensuring that CR characters get stripped during
command line parsing.
Suggested-by: Shao Miller <Shao.Miller@yrdsb.edu.on.ca>
Diffstat (limited to 'src/core/exec.c')
-rw-r--r-- | src/core/exec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/exec.c b/src/core/exec.c index 25c578d5..6c16aa44 100644 --- a/src/core/exec.c +++ b/src/core/exec.c @@ -22,6 +22,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <ctype.h> #include <unistd.h> #include <getopt.h> #include <errno.h> @@ -170,7 +171,7 @@ static int split_args ( char *args, char * argv[] ) { while ( 1 ) { /* Skip over any whitespace / convert to NUL */ - while ( *args == ' ' ) { + while ( isspace ( *args ) ) { if ( argv ) *args = '\0'; args++; @@ -183,7 +184,7 @@ static int split_args ( char *args, char * argv[] ) { argv[argc] = args; argc++; /* Skip to start of next whitespace, if any */ - while ( *args && ( *args != ' ' ) ) { + while ( *args && ! isspace ( *args ) ) { args++; } } |