Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-17 16:54:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix leading spaces bug, free line buffer, redo next_word, save some

Browse Source 
space.
This commit is contained in:
Glenn L McGrath 2003-01-14 23:26:57 +00:00
parent 147a3ca1a4
commit 8573704097
1 changed files with 44 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
networking/ifupdown.c
View File

@ -604,27 +604,28 @@ address_family_t addr_inet = {
#endif /* ifdef CONFIG_FEATURE_IFUPDOWN_IPV4 */ #endif /* ifdef CONFIG_FEATURE_IFUPDOWN_IPV4 */
static char *next_word(char *buf, char *word, int maxlen) static char *next_word(char **buf)
{ {
if (!buf) unsigned short length;
char *word;
if ((buf == NULL) || (*buf == NULL) || (**buf == '\0')) {
return NULL; return NULL;
if (!*buf)
return NULL;
while (!isspace(*buf) && *buf) {
if (maxlen-- > 1)
*word++ = *buf;
buf++;
}
if (maxlen > 0) {
*word = '\0';
} }
while (isspace(*buf) && *buf) { /* Skip over leading whitespace */
buf++; word = *buf + strspn(*buf, " \t\n");
}
return buf; /* Find the length of this word */
length = strcspn(word, " \t\n");
if (length == 0) {
return(NULL);
}
*buf = word + length;
**buf = '\0';
(*buf)++;
return word;
} }
static address_family_t *get_address_family(address_family_t *af[], char *name) static address_family_t *get_address_family(address_family_t *af[], char *name)
@ -675,44 +676,34 @@ static const llist_t *find_list_string(const llist_t *list, const char *string)
static interfaces_file_t *read_interfaces(char *filename) static interfaces_file_t *read_interfaces(char *filename)
{ {
interface_defn_t *currif = NULL;
interfaces_file_t *defn;
#ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING #ifdef CONFIG_FEATURE_IFUPDOWN_MAPPING
mapping_defn_t *currmap = NULL; mapping_defn_t *currmap = NULL;
#endif #endif
interface_defn_t *currif = NULL;
interfaces_file_t *defn;
FILE *f; FILE *f;
char firstword[80]; char *firstword;
char *buf = NULL; char *buf;
char *rest;
// int line;
enum { NONE, IFACE, MAPPING } currently_processing = NONE; enum { NONE, IFACE, MAPPING } currently_processing = NONE;
defn = xmalloc(sizeof(interfaces_file_t)); defn = xmalloc(sizeof(interfaces_file_t));
// defn->max_autointerfaces = defn->n_autointerfaces = 0;
defn->autointerfaces = NULL; defn->autointerfaces = NULL;
defn->mappings = NULL; defn->mappings = NULL;
defn->ifaces = NULL; defn->ifaces = NULL;
f = fopen(filename, "r");
if (f == NULL) { f = xfopen(filename, "r");
return NULL;
}
while ((buf = get_line_from_file(f)) != NULL) { while ((buf = get_line_from_file(f)) != NULL) {
char *end; char *buf_ptr = buf;
/* Ignore comments */
if (buf[0] == '#') { if (buf[0] == '#') {
continue; continue;
} }
end = last_char_is(buf, '\n');
if (end) { firstword = next_word(&buf_ptr);
*end = '\0'; if (firstword == NULL) {
}
while ((end = last_char_is(buf, ' ')) != NULL) {
*end = '\0';
}
rest = next_word(buf, firstword, 80);
if (rest == NULL) {
continue; /* blank line */ continue; /* blank line */
} }
@ -723,7 +714,7 @@ static interfaces_file_t *read_interfaces(char *filename)
currmap->n_matches = 0; currmap->n_matches = 0;
currmap->match = NULL; currmap->match = NULL;
while ((rest = next_word(rest, firstword, 80))) { while ((firstword = next_word(&buf_ptr)) != NULL) {
if (currmap->max_matches == currmap->n_matches) { if (currmap->max_matches == currmap->n_matches) {
currmap->max_matches = currmap->max_matches * 2 + 1; currmap->max_matches = currmap->max_matches * 2 + 1;
currmap->match = xrealloc(currmap->match, sizeof(currmap->match) * currmap->max_matches); currmap->match = xrealloc(currmap->match, sizeof(currmap->match) * currmap->max_matches);
@ -747,9 +738,9 @@ static interfaces_file_t *read_interfaces(char *filename)
currently_processing = MAPPING; currently_processing = MAPPING;
} else if (strcmp(firstword, "iface") == 0) { } else if (strcmp(firstword, "iface") == 0) {
{ {
char iface_name[80]; char *iface_name;
char address_family_name[80]; char *address_family_name;
char method_name[80]; char *method_name;
address_family_t *addr_fams[] = { address_family_t *addr_fams[] = {
#ifdef CONFIG_FEATURE_IFUPDOWN_IPV4 #ifdef CONFIG_FEATURE_IFUPDOWN_IPV4
&addr_inet, &addr_inet,
@ -764,17 +755,16 @@ static interfaces_file_t *read_interfaces(char *filename)
}; };
currif = xmalloc(sizeof(interface_defn_t)); currif = xmalloc(sizeof(interface_defn_t));
iface_name = next_word(&buf_ptr);
address_family_name = next_word(&buf_ptr);
method_name = next_word(&buf_ptr);
rest = next_word(rest, iface_name, 80); if (buf_ptr == NULL) {
rest = next_word(rest, address_family_name, 80);
rest = next_word(rest, method_name, 80);
if (rest == NULL) {
error_msg("too few parameters for line \"%s\"", buf); error_msg("too few parameters for line \"%s\"", buf);
return NULL; return NULL;
} }
if (rest[0] != '\0') { if (buf_ptr[0] != '\0') {
error_msg("too many parameters \"%s\"", buf); error_msg("too many parameters \"%s\"", buf);
return NULL; return NULL;
} }
@ -816,7 +806,7 @@ static interfaces_file_t *read_interfaces(char *filename)
} }
currently_processing = IFACE; currently_processing = IFACE;
} else if (strcmp(firstword, "auto") == 0) { } else if (strcmp(firstword, "auto") == 0) {
while ((rest = next_word(rest, firstword, 80))) { while ((firstword = next_word(&buf_ptr)) != NULL) {
/* Check the interface isnt already listed */ /* Check the interface isnt already listed */
if (find_list_string(defn->autointerfaces, firstword)) { if (find_list_string(defn->autointerfaces, firstword)) {
@ -833,7 +823,7 @@ static interfaces_file_t *read_interfaces(char *filename)
{ {
int i; int i;
if (xstrlen(rest) == 0) { if (xstrlen(buf_ptr) == 0) {
error_msg("option with empty value \"%s\"", buf); error_msg("option with empty value \"%s\"", buf);
return NULL; return NULL;
} }
@ -858,7 +848,7 @@ static interfaces_file_t *read_interfaces(char *filename)
currif->option = opt; currif->option = opt;
} }
currif->option[currif->n_options].name = xstrdup(firstword); currif->option[currif->n_options].name = xstrdup(firstword);
currif->option[currif->n_options].value = xstrdup(rest); currif->option[currif->n_options].value = xstrdup(next_word(&buf_ptr));
if (!currif->option[currif->n_options].name) { if (!currif->option[currif->n_options].name) {
perror(filename); perror(filename);
return NULL; return NULL;
@ -876,14 +866,14 @@ static interfaces_file_t *read_interfaces(char *filename)
error_msg("duplicate script in mapping \"%s\"", buf); error_msg("duplicate script in mapping \"%s\"", buf);
return NULL; return NULL;
} else { } else {
currmap->script = xstrdup(rest); currmap->script = xstrdup(next_word(&buf_ptr));
} }
} else if (strcmp(firstword, "map") == 0) { } else if (strcmp(firstword, "map") == 0) {
if (currmap->max_mappings == currmap->n_mappings) { if (currmap->max_mappings == currmap->n_mappings) {
currmap->max_mappings = currmap->max_mappings * 2 + 1; currmap->max_mappings = currmap->max_mappings * 2 + 1;
currmap->mapping = xrealloc(currmap->mapping, sizeof(char *) * currmap->max_mappings); currmap->mapping = xrealloc(currmap->mapping, sizeof(char *) * currmap->max_mappings);
} }
currmap->mapping[currmap->n_mappings] = xstrdup(rest); currmap->mapping[currmap->n_mappings] = xstrdup(next_word(&buf_ptr));
currmap->n_mappings++; currmap->n_mappings++;
} else { } else {
error_msg("misplaced option \"%s\"", buf); error_msg("misplaced option \"%s\"", buf);
@ -897,10 +887,10 @@ static interfaces_file_t *read_interfaces(char *filename)
return NULL; return NULL;
} }
} }
free(buf);
} }
if (ferror(f) != 0) { if (ferror(f) != 0) {
perror_msg("%s", filename); perror_msg_and_die("%s", filename);
return NULL;
} }
fclose(f); fclose(f);
@ -1230,9 +1220,6 @@ extern int ifupdown_main(int argc, char **argv)
} }
defn = read_interfaces(interfaces); defn = read_interfaces(interfaces);
if (!defn) {
error_msg_and_die("couldn't read interfaces file \"%s\"", interfaces);
}
if (no_act) { if (no_act) {
state_fp = fopen(statefile, "r"); state_fp = fopen(statefile, "r");