diff options
author | NeilBrown <neilb@suse.de> | 2011-04-05 08:44:54 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2011-04-05 08:44:54 +1000 |
commit | 78c0a3b17fcf6972bfcd10f02a5f4520117281d0 (patch) | |
tree | 74f3ade162452caac6b3b3dd8230063809207892 /config.c | |
parent | 32367cb5588be10b25c11a69795d18b9af9d2f8c (diff) |
Split some of util.c into a new lib.c
Some of util.c is dependent on lots of other code, some of it
is stand-alone.
Move some of the stand-alone stuff into a new lib.c so it can be used
by smaller utilities.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'config.c')
-rw-r--r-- | config.c | 78 |
1 files changed, 0 insertions, 78 deletions
@@ -108,84 +108,6 @@ int match_keyword(char *word) return -1; } -/* conf_word gets one word from the conf file. - * if "allow_key", then accept words at the start of a line, - * otherwise stop when such a word is found. - * We assume that the file pointer is at the end of a word, so the - * next character is a space, or a newline. If not, it is the start of a line. - */ - -char *conf_word(FILE *file, int allow_key) -{ - int wsize = 100; - int len = 0; - int c; - int quote; - int wordfound = 0; - char *word = malloc(wsize); - - if (!word) abort(); - - while (wordfound==0) { - /* at the end of a word.. */ - c = getc(file); - if (c == '#') - while (c != EOF && c != '\n') - c = getc(file); - if (c == EOF) break; - if (c == '\n') continue; - - if (c != ' ' && c != '\t' && ! allow_key) { - ungetc(c, file); - break; - } - /* looks like it is safe to get a word here, if there is one */ - quote = 0; - /* first, skip any spaces */ - while (c == ' ' || c == '\t') - c = getc(file); - if (c != EOF && c != '\n' && c != '#') { - /* we really have a character of a word, so start saving it */ - while (c != EOF && c != '\n' && (quote || (c!=' ' && c != '\t'))) { - wordfound = 1; - if (quote && c == quote) quote = 0; - else if (quote == 0 && (c == '\'' || c == '"')) - quote = c; - else { - if (len == wsize-1) { - wsize += 100; - word = realloc(word, wsize); - if (!word) abort(); - } - word[len++] = c; - } - c = getc(file); - /* Hack for broken kernels (2.6.14-.24) that put - * "active(auto-read-only)" - * in /proc/mdstat instead of - * "active (auto-read-only)" - */ - if (c == '(' && len >= 6 - && strncmp(word+len-6, "active", 6) == 0) - c = ' '; - } - } - if (c != EOF) ungetc(c, file); - } - word[len] = 0; - - /* Further HACK for broken kernels.. 2.6.14-2.6.24 */ - if (strcmp(word, "auto-read-only)") == 0) - strcpy(word, "(auto-read-only)"); - -/* printf("word is <%s>\n", word); */ - if (!wordfound) { - free(word); - word = NULL; - } - return word; -} - /* * conf_line reads one logical line from the conffile. * It skips comments and continues until it finds a line that starts |