emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by Robert P. Day to remove obsolete alias code that the 2.4 and 2.6

Browse Source 
Linux kernels don't do anymore.
This commit is contained in:
Rob Landley 2006-06-20 21:13:29 +00:00
parent 14ff19b28a
commit 9fe801e0d2
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
networking/interface.c
View File

@ -129,7 +129,7 @@ static struct aftype inet_aftype = {
.name = "inet", .name = "inet",
.title = "DARPA Internet", .title = "DARPA Internet",
.af = AF_INET, .af = AF_INET,
.alen = sizeof(unsigned long), .alen = 4,
.sprint = INET_sprint, .sprint = INET_sprint,
.fd = -1 .fd = -1
}; };
@ -444,22 +444,16 @@ static int if_readconf(void)
static char *get_name(char *name, char *p) static char *get_name(char *name, char *p)
{ {
/* Extract <name>[:<alias>] from nul-terminated p where p matches /* Extract <name> from nul-terminated p where p matches
<name>[:<alias>]: after leading whitespace. <name>: after leading whitespace.
If match is not made, set name empty and return unchanged p */ If match is not made, set name empty and return unchanged p */
int namestart=0, nameend=0, aliasend; int namestart=0, nameend=0;
while (isspace(p[namestart])) while (isspace(p[namestart]))
namestart++; namestart++;
nameend=namestart; nameend=namestart;
while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend])) while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend]))
nameend++; nameend++;
if (p[nameend]==':') { if (p[nameend]==':') {
aliasend=nameend+1;
while (p[aliasend] && isdigit(p[aliasend]))
aliasend++;
if (p[aliasend]==':') {
nameend=aliasend;
}
if ((nameend-namestart)<IFNAMSIZ) { if ((nameend-namestart)<IFNAMSIZ) {
memcpy(name,&p[namestart],nameend-namestart); memcpy(name,&p[namestart],nameend-namestart);
name[nameend-namestart]='\0'; name[nameend-namestart]='\0';
@ -469,7 +463,7 @@ static char *get_name(char *name, char *p)
name[0]='\0'; name[0]='\0';
} }
} else { } else {
/* first ':' not found - return empty */ /* trailing ':' not found - return empty */
name[0]='\0'; name[0]='\0';
} }
return p + 1; return p + 1;