From: Robert Spalek <robert@ucw.cz>
Date: Mon, 8 Jan 2001 10:26:37 +0000 (+0000)
Subject: bugfixes
X-Git-Tag: holmes-import~1603
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=697ce37a72ce955e811c4b73878733a405f3c038;p=libucw.git

bugfixes
---

diff --git a/lib/conf.c b/lib/conf.c
index aa674513..3eb612b5 100644
--- a/lib/conf.c
+++ b/lib/conf.c
@@ -1,6 +1,6 @@
 /* Reading conf files
  * Robert Spalek, (c) 2001, robert@ucw.cz
- * $Id: conf.c,v 1.1 2001/01/07 21:21:53 robert Exp $
+ * $Id: conf.c,v 1.2 2001/01/08 10:26:37 robert Exp $
  */
 
 #include <stdlib.h>
@@ -112,6 +112,7 @@ static int cf_subread(byte *filename,int level)
 
 		if(!bgets(b,buf,BUFFER))
 			break;
+		line++;
 
 		c=buf;
 		while(*c && isspace(*c))
@@ -129,7 +130,7 @@ static int cf_subread(byte *filename,int level)
 				break;
 			}
 
-		}else if(*c='<'){
+		}else if(*c=='<'){
 			if(!cf_subread(c+1,level+1)){
 				msg="";
 				break;
@@ -141,7 +142,7 @@ static int cf_subread(byte *filename,int level)
 			name=c;
 			c=strpbrk(c," \t");
 			while(c && *c && isspace(*c))
-				c++;
+				*c++=0;
 			if(!c || !*c){
 				msg="Missing argument";
 				break;
@@ -165,7 +166,7 @@ static int cf_subread(byte *filename,int level)
 	}	/* for every line */
 
 	if(msg)
-		log("%s, line %d: %s",msg);
+		log("%s, line %d: %s",filename,line,msg);
 	bclose(b);
 	return !msg;
 }