svn commit: r188214 - head/usr.sbin/config

[Wojciech A. Koszek]

Author: wkoszek
Date: Fri Feb  6 00:50:21 2009
New Revision: 188214
URL: http://svn.freebsd.org/changeset/base/188214

Log:
  Make config -x <kernel> only return non-zero characters,
  so that:
  
  	config -x <kernel> | grep <something>
  
  just works.
  
  Reported by:	Danny Braniss <danny at cs.huji.ac.il>

Modified:
  head/usr.sbin/config/main.c

Modified: head/usr.sbin/config/main.c
==============================================================================
--- head/usr.sbin/config/main.c	Fri Feb  6 00:48:56 2009	(r188213)
+++ head/usr.sbin/config/main.c	Fri Feb  6 00:50:21 2009	(r188214)
@@ -669,7 +669,7 @@ kernconfdump(const char *file)
 	struct stat st;
 	FILE *fp, *pp;
 	int error, len, osz, r;
-	unsigned int off, size;
+	unsigned int i, off, size;
 	char *cmd, *o;
 
 	r = open(file, O_RDONLY);
@@ -707,7 +707,18 @@ kernconfdump(const char *file)
 	r = fseek(fp, off, SEEK_CUR);
 	if (r != 0)
 		errx(EXIT_FAILURE, "fseek() failed");
-	while ((r = fgetc(fp)) != EOF && size-- > 0)
+	for (i = 0; i < size - 1; i++) {
+		r = fgetc(fp);
+		if (r == EOF)
+			break;
+		/* 
+		 * If '\0' is present in the middle of the configuration
+		 * string, this means something very weird is happening.
+		 * Make such case very visible.
+		 */
+		assert(r != '\0' && ("Char present in the configuration "
+		    "string mustn't be equal to 0"));
 		fputc(r, stdout);
+	}
 	fclose(fp);
 }