[Nagiosplug-checkins] SF.net SVN: nagiosplug: [1947] nagiosplug/trunk/lib/parse_ini.c

[dermoth at users.sourceforge.net]

Revision: 1947
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1947&view=rev
Author:   dermoth
Date:     2008-03-15 13:34:15 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
Fix handling of leading and trailing spaces in stanza

Modified Paths:
--------------
    nagiosplug/trunk/lib/parse_ini.c

Modified: nagiosplug/trunk/lib/parse_ini.c
===================================================================
--- nagiosplug/trunk/lib/parse_ini.c	2008-03-15 16:17:49 UTC (rev 1946)
+++ nagiosplug/trunk/lib/parse_ini.c	2008-03-15 20:34:15 UTC (rev 1947)
@@ -126,6 +126,8 @@
 				stanzastate=WRONGSTANZA;
 				for(i=0; i<stanza_len; i++){
 					c=fgetc(f);
+					/* Strip leading whitespace */
+					if(i==0) for(c; isspace(c); c=fgetc(f));
 					/* nope, read to the end of the line */
 					if(c!=stanza[i]) {
 						GOBBLE_TO(f, c, '\n');
@@ -135,6 +137,8 @@
 				/* if it matched up to here and the next char is ']'... */
 				if(i==stanza_len){
 					c=fgetc(f);
+					/* Strip trailing whitespace */
+					for(c; isspace(c); c=fgetc(f));
 					if(c==']') stanzastate=RIGHTSTANZA;
 				}
 				break;
@@ -223,7 +227,7 @@
 	/* calculate the length of "--foo" */
 	opt_len=1+optend-optptr;
 	/* 1-character params needs only one dash */
-	if (opt_len==1)
+	if(opt_len==1)
 		cfg_len=1+(opt_len);
 	else
 		cfg_len=2+(opt_len);
@@ -234,7 +238,7 @@
 		cfg_len+=1+val_len;
 	}
 	/* if valptr==valend then we have "=" but no "bar" */
-	else if (valptr==lineend) {
+	else if(valptr==lineend) {
 		equals=1;
 		cfg_len+=1;
 	}
@@ -248,7 +252,7 @@
 	read_pos=0;
 	optnew->arg=(char *)malloc(cfg_len+1);
 	/* 1-character params needs only one dash */
-	if (opt_len==1) {
+	if(opt_len==1) {
 		strncpy(&optnew->arg[read_pos], "-", 1);
 		read_pos+=1;
 	} else {
@@ -263,10 +267,10 @@
 	optnew->arg[read_pos]='\0';
 
 	/* ...and put that to the end of the list */
-	if (*optlst==NULL) {
+	if(*optlst==NULL) {
 		*optlst=optnew;
 	}	else {
-		while (opttmp->next!=NULL) {
+		while(opttmp->next!=NULL) {
 			opttmp=opttmp->next;
 		}
 		opttmp->next = optnew;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.