#include "mdadm.h"
#include "dlink.h"
-#include <sys/dir.h>
+#include <dirent.h>
#include <glob.h>
#include <fnmatch.h>
#include <ctype.h>
[Mailaddr] = "mailaddr",
[Mailfrom] = "mailfrom",
[Program] = "program",
- [CreateDev] = "create",
+ [CreateDev]= "create",
[Homehost] = "homehost",
[LTEnd] = NULL
};
{
int len = strlen(word);
int n;
-
+
if (len < 3) return -1;
for (n=0; keywords[n]; n++) {
if (strncasecmp(word, keywords[n], len)==0)
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);
}
return word;
}
-
+
/*
* conf_line reads one logical line from the conffile.
* It skips comments and continues until it finds a line that starts
if (buf[0] != ' ')
continue;
major = strtoul(buf, &mp, 10);
- if (mp == buf || *mp != ' ')
+ if (mp == buf || *mp != ' ')
continue;
minor = strtoul(mp, NULL, 10);
}
}
-void devline(char *line)
+void devline(char *line)
{
char *w;
struct conf_dev *cd;
mis.bitmap_fd = -1;
mis.bitmap_file = NULL;
mis.name[0] = 0;
+ mis.container = NULL;
+ mis.member = NULL;
for (w=dl_next(line); w!=line; w=dl_next(w)) {
if (w[0] == '/') {
} else if (strncasecmp(w, "metadata=", 9) == 0) {
/* style of metadata on the devices. */
int i;
-
+
for(i=0; superlist[i] && !mis.st; i++)
mis.st = superlist[i]->match_metadata_desc(w+9);
} else if (strncasecmp(w, "auto=", 5) == 0 ) {
/* whether to create device special files as needed */
mis.autof = parse_auto(w+5, "auto type", 0);
+ } else if (strncasecmp(w, "member=", 7) == 0) {
+ /* subarray within a container */
+ mis.member = strdup(w+7);
+ } else if (strncasecmp(w, "container=", 10) == 0) {
+ /* the container holding this subarray. Either a device name
+ * or a uuid */
+ mis.container = strdup(w+10);
} else {
fprintf(stderr, Name ": unrecognised word on ARRAY line: %s\n",
w);
}
}
- if (mis.devname == NULL)
- fprintf(stderr, Name ": ARRAY line with no device\n");
- else if (mis.uuid_set == 0 && mis.devices == NULL && mis.super_minor == UnSet && mis.name[0] == 0)
+ if (mis.uuid_set == 0 && mis.devices == NULL && mis.super_minor == UnSet && mis.name[0] == 0)
fprintf(stderr, Name ": ARRAY line %s has no identity information.\n", mis.devname);
else {
mi = malloc(sizeof(*mi));
*mi = mis;
- mi->devname = strdup(mis.devname);
+ mi->devname = mis.devname ? strdup(mis.devname) : NULL;
mi->next = NULL;
*mddevlp = mi;
mddevlp = &mi->next;
if (alert_mail_from == NULL)
alert_mail_from = strdup(w);
else {
- char *t= NULL;
- asprintf(&t, "%s %s", alert_mail_from, w);
- free(alert_mail_from);
- alert_mail_from = t;
+ char *t = NULL;
+
+ if (asprintf(&t, "%s %s", alert_mail_from, w) > 0) {
+ free(alert_mail_from);
+ alert_mail_from = t;
+ }
}
}
}
}
free_line(line);
}
-
+
fclose(f);
/* printf("got file\n"); */
mddev_ident_t rv;
load_conffile();
rv = mddevlist;
- while (dev && rv && strcmp(dev, rv->devname)!=0)
+ while (dev && rv && (rv->devname == NULL
+ || strcmp(dev, rv->devname)!=0))
rv = rv->next;
return rv;
}
free(t->devname);
free(t);
}
-
+
load_conffile();
if (cdevlist == NULL)
return dlist;
}
+int conf_test_dev(char *devname)
+{
+ struct conf_dev *cd;
+ if (cdevlist == NULL)
+ /* allow anything by default */
+ return 1;
+ for (cd = cdevlist ; cd ; cd = cd->next) {
+ if (strcasecmp(cd->name, "partitions") == 0)
+ return 1;
+ if (fnmatch(cd->name, devname, FNM_PATHNAME) == 0)
+ return 1;
+ }
+ return 0;
+}
+
+
int match_oneof(char *devices, char *devname)
{
/* check if one of the comma separated patterns in devices