diff options
author | Michael Brown <mcb30@etherboot.org> | 2009-06-03 10:13:29 +0100 |
---|---|---|
committer | Michael Brown <mcb30@etherboot.org> | 2009-06-03 10:13:29 +0100 |
commit | 4c5f00f8790ccea7c05aa116f580512c854a76a5 (patch) | |
tree | 0a50fba13613fdaecc0dd0b920ffdf1ca4c8b518 /src/core/misc.c | |
parent | 5e51aaccaa73d5f6c4e3e5b96938991ac99d1dd6 (diff) | |
download | ipxe-4c5f00f8790ccea7c05aa116f580512c854a76a5.tar.gz |
[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/misc.c')
-rw-r--r-- | src/core/misc.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/core/misc.c b/src/core/misc.c index 5a82c85c..c19591bb 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -5,6 +5,7 @@ MISC Support Routines FILE_LICENCE ( GPL2_OR_LATER ); #include <stdlib.h> +#include <ctype.h> #include <byteswap.h> #include <gpxe/in.h> #include <gpxe/timer.h> @@ -32,20 +33,6 @@ int inet_aton ( const char *cp, struct in_addr *inp ) { return 0; } -int isspace ( int c ) { - switch ( c ) { - case ' ': - case '\f': - case '\n': - case '\r': - case '\t': - case '\v': - return 1; - default: - return 0; - } -} - unsigned long strtoul ( const char *p, char **endp, int base ) { unsigned long ret = 0; unsigned int charval; |