From 0d6ae379f43fdab9516e6ed949ba9563972c0c65 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Fri, 30 Dec 2011 01:44:15 +0100 Subject: Compare stricter in proc_getent The new proc_getent compares stricter so that e.g. "ro" doesn't match root=/dev/sdaN anymore. So it has to be either "ro" or "ro=". --- src/rc/rc.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/rc/rc.c b/src/rc/rc.c index ad16f7d..05c99fa 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -173,7 +173,7 @@ proc_getent(const char *ent) { FILE *fp; char *proc, *p, *value = NULL; - size_t i; + size_t i, len; if (!exists("/proc/cmdline")) return NULL; @@ -187,16 +187,25 @@ proc_getent(const char *ent) i = 0; if (rc_getline(&proc, &i, fp) == -1 || proc == NULL) eerror("rc_getline: %s", strerror(errno)); - if (*proc && (p = strstr(proc, ent))) { - i = p - proc; - if (i == '\0' || proc[i - 1] == ' ') { - p += strlen(ent); - if (*p == '=') - p++; - value = xstrdup(strsep(&p, " ")); + + if(proc != NULL) { + len = strlen(ent); + + while((p = strsep(&proc, " "))) { + if(strncmp(ent, p, len) == 0 && (p[len] == '\0' || p[len] == ' ' || p[len] == '=')) { + p += len; + + if (*p == '=') + p++; + + value = xstrdup(p); + } } - } else + } + + if(!value) errno = ENOENT; + fclose(fp); free(proc); -- cgit v1.2.3