X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=lib%2Fcf.c;h=f55a620e0022d60808ad80bf21e8a2867b3d7011;hb=0fc6fd13c5bd44e6d595b56337a95156fd42ceea;hp=d0b1207ee0ca7526874e42c4867005ad9ccdeb09;hpb=dd28105497f4d32d2433a3786d93af146292c824;p=ashd.git

diff --git a/lib/cf.c b/lib/cf.c
index d0b1207..f55a620 100644
--- a/lib/cf.c
+++ b/lib/cf.c
@@ -93,11 +93,13 @@ static int parsefile(struct cfstate *s, FILE *in)
 	    line[0] = 0;
 	}
 	s->lno++;
-	for(p = line + strlen(line) - 1; p >= line; p--) {
-	    if(isspace(*p))
-		*p = 0;
-	    else
-		break;
+	if(line[0]) {
+	    for(p = line + strlen(line) - 1; p >= line; p--) {
+		if(isspace(*p))
+		    *p = 0;
+		else
+		    break;
+	    }
 	}
 	for(ind = 0, p = line; *p; p++) {
 	    if(*p == ' ') {
@@ -219,6 +221,26 @@ void freecfparser(struct cfstate *s)
     free(s);
 }
 
+char *findstdconf(char *name)
+{
+    char *path, *p, *p2, *t;
+    
+    if((path = getenv("PATH")) == NULL)
+	return(NULL);
+    path = sstrdup(path);
+    for(p = strtok(path, ":"); p != NULL; p = strtok(NULL, ":")) {
+	if((p2 = strrchr(p, '/')) == NULL)
+	    continue;
+	*p2 = 0;
+	if(!access(t = sprintf3("%s/etc/%s", p, name), R_OK)) {
+	    free(path);
+	    return(sstrdup(t));
+	}
+    }
+    free(path);
+    return(NULL);
+}
+
 static struct child *newchild(char *name, int type)
 {
     struct child *ch;