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

clean up some bad, bad formatting

Browse Source
This commit is contained in:
Russ Dill 2003-12-16 22:46:33 +00:00
parent 76729b8c69
commit e30495654d
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
networking/udhcp/files.c
View File

@ -71,83 +71,84 @@ static int read_yn(const char *line, void *arg)
/* read a dhcp option and add it to opt_list */ /* read a dhcp option and add it to opt_list */
static int read_opt(const char *const_line, void *arg) static int read_opt(const char *const_line, void *arg)
{ {
char line[READ_CONFIG_BUF_SIZE]; char line[READ_CONFIG_BUF_SIZE];
struct option_set **opt_list = arg; struct option_set **opt_list = arg;
char *opt, *val, *endptr; char *opt, *val, *endptr;
struct dhcp_option *option; struct dhcp_option *option;
int retval = 0, length; int retval = 0, length;
char buffer[256]; /* max opt length */ char buffer[256]; /* max opt length */
u_int16_t result_u16; u_int16_t result_u16;
u_int32_t result_u32; u_int32_t result_u32;
void *valptr; void *valptr;
if ((opt = strtok(strcpy(line, const_line), " \t="))) { if (!(opt = strtok(strcpy(line, const_line), " \t="))) return 0;
for (option = dhcp_options; option->code; option++) for (option = dhcp_options; option->code; option++)
if (!strcasecmp(option->name, opt)) if (!strcasecmp(option->name, opt))
break; break;
if (option->code) do { if (!option->code) return 0;
do {
val = strtok(NULL, ", \t"); val = strtok(NULL, ", \t");
if(!val) if(!val)
break; break;
length = option_lengths[option->flags & TYPE_MASK]; length = option_lengths[option->flags & TYPE_MASK];
valptr = NULL; valptr = NULL;
switch (option->flags & TYPE_MASK) { switch (option->flags & TYPE_MASK) {
case OPTION_IP: case OPTION_IP:
retval = read_ip(val, buffer); retval = read_ip(val, buffer);
break; break;
case OPTION_IP_PAIR: case OPTION_IP_PAIR:
retval = read_ip(val, buffer); retval = read_ip(val, buffer);
if (!(val = strtok(NULL, ", \t/-"))) retval = 0; if (!(val = strtok(NULL, ", \t/-"))) retval = 0;
if (retval) retval = read_ip(val, buffer + 4); if (retval) retval = read_ip(val, buffer + 4);
break; break;
case OPTION_STRING: case OPTION_STRING:
length = strlen(val); length = strlen(val);
if (length > 0) { if (length > 0) {
if (length > 254) length = 254; if (length > 254) length = 254;
endptr = buffer + length; endptr = buffer + length;
endptr[0] = 0; endptr[0] = 0;
valptr = val; valptr = val;
}
break;
case OPTION_BOOLEAN:
retval = read_yn(val, buffer);
break;
case OPTION_U8:
buffer[0] = strtoul(val, &endptr, 0);
valptr = buffer;
break;
case OPTION_U16:
result_u16 = htons(strtoul(val, &endptr, 0));
valptr = &result_u16;
break;
case OPTION_S16:
result_u16 = htons(strtol(val, &endptr, 0));
valptr = &result_u16;
break;
case OPTION_U32:
result_u32 = htonl(strtoul(val, &endptr, 0));
valptr = &result_u32;
break;
case OPTION_S32:
result_u32 = htonl(strtol(val, &endptr, 0));
valptr = &result_u32;
break;
default:
retval = 0;
break;
} }
if(valptr) { break;
case OPTION_BOOLEAN:
retval = read_yn(val, buffer);
break;
case OPTION_U8:
buffer[0] = strtoul(val, &endptr, 0);
valptr = buffer;
break;
case OPTION_U16:
result_u16 = htons(strtoul(val, &endptr, 0));
valptr = &result_u16;
break;
case OPTION_S16:
result_u16 = htons(strtol(val, &endptr, 0));
valptr = &result_u16;
break;
case OPTION_U32:
result_u32 = htonl(strtoul(val, &endptr, 0));
valptr = &result_u32;
break;
case OPTION_S32:
result_u32 = htonl(strtol(val, &endptr, 0));
valptr = &result_u32;
break;
default:
retval = 0;
break;
}
if (valptr) {
memcpy(buffer, valptr, length); memcpy(buffer, valptr, length);
retval = (endptr[0] == '\0'); retval = (endptr[0] == '\0');
} }
if (retval) if (retval)
attach_option(opt_list, option, buffer, length); attach_option(opt_list, option, buffer, length);
else else
break; break;
} while (option->flags & OPTION_LIST); } while (option->flags & OPTION_LIST);
}
return retval; return retval;
} }