diff options
-rw-r--r-- | networking/interface.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/networking/interface.c b/networking/interface.c index 471ac529e..04d12b37e 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
@@ -248,7 +248,7 @@ static const struct aftype unspec_aftype = { | |||
248 | .name = "unspec", | 248 | .name = "unspec", |
249 | .title = "UNSPEC", | 249 | .title = "UNSPEC", |
250 | .af = AF_UNSPEC, | 250 | .af = AF_UNSPEC, |
251 | .alen = 0, | 251 | .alen = 0, |
252 | .print = UNSPEC_print, | 252 | .print = UNSPEC_print, |
253 | .sprint = UNSPEC_sprint, | 253 | .sprint = UNSPEC_sprint, |
254 | }; | 254 | }; |
@@ -405,24 +405,25 @@ static char *get_name(char *name, char *p) | |||
405 | /* Extract <name> from nul-terminated p where p matches | 405 | /* Extract <name> from nul-terminated p where p matches |
406 | <name>: after leading whitespace. | 406 | <name>: after leading whitespace. |
407 | If match is not made, set name empty and return unchanged p */ | 407 | If match is not made, set name empty and return unchanged p */ |
408 | int namestart=0, nameend=0; | 408 | int namestart = 0, nameend = 0; |
409 | |||
409 | while (isspace(p[namestart])) | 410 | while (isspace(p[namestart])) |
410 | namestart++; | 411 | namestart++; |
411 | nameend=namestart; | 412 | nameend = namestart; |
412 | while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend])) | 413 | while (p[nameend] && p[nameend] != ':' && !isspace(p[nameend])) |
413 | nameend++; | 414 | nameend++; |
414 | if (p[nameend]==':') { | 415 | if (p[nameend] == ':') { |
415 | if ((nameend-namestart)<IFNAMSIZ) { | 416 | if ((nameend - namestart) < IFNAMSIZ) { |
416 | memcpy(name,&p[namestart],nameend-namestart); | 417 | memcpy(name, &p[namestart], nameend - namestart); |
417 | name[nameend-namestart]='\0'; | 418 | name[nameend - namestart] = '\0'; |
418 | p=&p[nameend]; | 419 | p = &p[nameend]; |
419 | } else { | 420 | } else { |
420 | /* Interface name too large */ | 421 | /* Interface name too large */ |
421 | name[0]='\0'; | 422 | name[0] = '\0'; |
422 | } | 423 | } |
423 | } else { | 424 | } else { |
424 | /* trailing ':' not found - return empty */ | 425 | /* trailing ':' not found - return empty */ |
425 | name[0]='\0'; | 426 | name[0] = '\0'; |
426 | } | 427 | } |
427 | return p + 1; | 428 | return p + 1; |
428 | } | 429 | } |