[gentoo-commits] proj/openrc:master commit in: src/rc/

[Christian Ruppert]

commit:     0d6ae379f43fdab9516e6ed949ba9563972c0c65
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 00:44:15 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 15:03:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0d6ae379

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 files 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);