diff options
Diffstat (limited to 'modutils')
-rw-r--r-- | modutils/modprobe.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index ba24791f9..5d62ae5df 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -76,15 +76,13 @@ static int parse_tag_value ( char *buffer, char **ptag, char **pvalue ) | |||
76 | { | 76 | { |
77 | char *tag, *value; | 77 | char *tag, *value; |
78 | 78 | ||
79 | while ( isspace ( *buffer )) | 79 | buffer = skip_whitespace ( buffer ); |
80 | buffer++; | ||
81 | tag = value = buffer; | 80 | tag = value = buffer; |
82 | while ( !isspace ( *value )) | 81 | while ( !isspace ( *value )) |
83 | if (!*value) return 0; | 82 | if (!*value) return 0; |
84 | else value++; | 83 | else value++; |
85 | *value++ = 0; | 84 | *value++ = 0; |
86 | while ( isspace ( *value )) | 85 | value = skip_whitespace ( value ); |
87 | value++; | ||
88 | if (!*value) return 0; | 86 | if (!*value) return 0; |
89 | 87 | ||
90 | *ptag = tag; | 88 | *ptag = tag; |
@@ -311,11 +309,9 @@ static void include_conf ( struct dep_t **first, struct dep_t **current, char *b | |||
311 | } | 309 | } |
312 | } | 310 | } |
313 | else if (( strncmp ( buffer, "include", 7 ) == 0 ) && isspace ( buffer [7] )) { | 311 | else if (( strncmp ( buffer, "include", 7 ) == 0 ) && isspace ( buffer [7] )) { |
312 | int fdi; char *filename; | ||
314 | 313 | ||
315 | int fdi; char *filename = buffer + 8; | 314 | filename = skip_whitespace ( buffer + 8 ); |
316 | |||
317 | while ( isspace ( *filename )) | ||
318 | filename++; | ||
319 | 315 | ||
320 | if (( fdi = open ( filename, O_RDONLY )) >= 0 ) { | 316 | if (( fdi = open ( filename, O_RDONLY )) >= 0 ) { |
321 | include_conf(first, current, buffer, buflen, fdi); | 317 | include_conf(first, current, buffer, buflen, fdi); |