assemble_container_content(): fix memory leak

[thirdparty/mdadm.git] / config.c

diff --git a/config.c b/config.c
index 1f78c689ba5d4407d4331967c9cdb90ae86d8519..597e04601ff834cd9fee06c466c5be75b75179a6 100644 (file)
--- a/config.c
+++ b/config.c
@@ -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
@@ -667,9 +589,12 @@ void homehostline(char *line)
        for (w=dl_next(line); w != line ; w=dl_next(w)) {
                if (strcasecmp(w, "<ignore>")==0)
                        require_homehost = 0;
-               else if (home_host == NULL)
-                       home_host = strdup(w);
-               else
+               else if (home_host == NULL) {
+                       if (strcasecmp(w, "<none>")==0)
+                               home_host = strdup("");
+                       else
+                               home_host = strdup(w);
+               }else
                        fprintf(stderr, Name ": excess host name on HOMEHOST line: %s - ignored\n",
                                w);
        }
@@ -782,6 +707,8 @@ void autoline(char *line)
        for (i = 0; i < super_cnt; i++)
                if (!seen[i])
                        policy_add(rule_policy, pol_auto, dflt, pol_metadata, superlist[i]->name, NULL);
+
+       free(seen);
 }
 
 int loaded = 0;
@@ -1092,11 +1019,12 @@ int conf_name_is_free(char *name)
        return 1;
 }
 
-struct mddev_ident *conf_match(struct mdinfo *info, struct supertype *st)
+struct mddev_ident *conf_match(struct supertype *st,
+                              struct mdinfo *info,
+                              char *devname,
+                              int verbose, int *rvp)
 {
        struct mddev_ident *array_list, *match;
-       int verbose = 0;
-       char *devname = NULL;
        array_list = conf_get_ident(NULL);
        match = NULL;
        for (; array_list; array_list = array_list->next) {
@@ -1117,7 +1045,7 @@ struct mddev_ident *conf_match(struct mdinfo *info, struct supertype *st)
                                        array_list->devname);
                        continue;
                }
-               if (array_list->devices && devname &&
+               if (array_list->devices &&
                    !match_oneof(array_list->devices, devname)) {
                        if (verbose >= 2 && array_list->devname)
                                fprintf(stderr, Name
@@ -1139,7 +1067,8 @@ struct mddev_ident *conf_match(struct mdinfo *info, struct supertype *st)
                    array_list->super_minor == UnSet) {
                        if (verbose >= 2 && array_list->devname)
                                fprintf(stderr, Name
-                            ": %s doesn't have any identifying information.\n",
+                                       ": %s doesn't have any identifying"
+                                       " information.\n",
                                        array_list->devname);
                        continue;
                }
@@ -1149,13 +1078,19 @@ struct mddev_ident *conf_match(struct mdinfo *info, struct supertype *st)
                        if (verbose >= 0) {
                                if (match->devname && array_list->devname)
                                        fprintf(stderr, Name
-                  ": we match both %s and %s - cannot decide which to use.\n",
-                                               match->devname, array_list->devname);
+                                               ": we match both %s and %s - "
+                                               "cannot decide which to use.\n",
+                                               match->devname,
+                                               array_list->devname);
                                else
                                        fprintf(stderr, Name
-                                               ": multiple lines in mdadm.conf match\n");
+                                               ": multiple lines in mdadm.conf"
+                                               " match\n");
                        }
-                       return NULL;
+                       if (rvp)
+                               *rvp = 2;
+                       match = NULL;
+                       break;
                }
                match = array_list;
        }