emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare stricter in proc_getent

Browse Source 
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=".
This commit is contained in:
Christian Ruppert 2011-12-30 01:44:15 +01:00
parent 2471d741f7
commit 0d6ae379f4
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/rc/rc.c
View File

@ -173,7 +173,7 @@ proc_getent(const char *ent)
{ {
FILE *fp; FILE *fp;
char *proc, *p, *value = NULL; char *proc, *p, *value = NULL;
size_t i; size_t i, len;
if (!exists("/proc/cmdline")) if (!exists("/proc/cmdline"))
return NULL; return NULL;
@ -187,16 +187,25 @@ proc_getent(const char *ent)
i = 0; i = 0;
if (rc_getline(&proc, &i, fp) == -1 || proc == NULL) if (rc_getline(&proc, &i, fp) == -1 || proc == NULL)
eerror("rc_getline: %s", strerror(errno)); eerror("rc_getline: %s", strerror(errno));
if (*proc && (p = strstr(proc, ent))) {
i = p - proc; if(proc != NULL) {
if (i == '\0' || proc[i - 1] == ' ') { len = strlen(ent);
p += strlen(ent);
if (*p == '=') while((p = strsep(&proc, " "))) {
p++; if(strncmp(ent, p, len) == 0 && (p[len] == '\0' || p[len] == ' ' || p[len] == '=')) {
value = xstrdup(strsep(&p, " ")); p += len;
if (*p == '=')
p++;
value = xstrdup(p);
}
} }
} else }
if(!value)
errno = ENOENT; errno = ENOENT;
fclose(fp); fclose(fp);
free(proc); free(proc);