PERFORCE change 167273 for review

[David Forsythe]

http://perforce.freebsd.org/chv.cgi?CH=167273

Change 167273 by dforsyth at squirrel on 2009/08/13 08:11:31

	Whoops.  Fix element checks on NULL.

Affected files ...

.. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#31 edit

Differences ...

==== //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#31 (text+ko) ====

@@ -329,17 +329,23 @@
 		printf("\tComment: PKG_FORMAT_REVISION:%s\n", pkg_format_revision(p));
 		printf("\tPackage name: %s\n", pkg_name(p));
 		printf("\tPackage origin: %s\n", pkg_origin(p));
-
-		for (klist = pkg_depends(p); klist != NULL && *klist != NULL; block_text = *klist++)
-			printf("Dependency: %s\n\tdependency origin: %s\n", 
-				block_text, pkg_pkg_depend_origin(p, block_text));
+	
+		klist = pkg_depends(p);
+		if (klist != NULL) {
+			for (buff = *klist++; *klist != NULL; buff = *klist++)
+				printf("Dependency: %s\n\tdependency origin: %s\n", 
+					buff, pkg_pkg_depend_origin(p, buff));
+		}
 		
 		block_text = NULL;
-		for (klist = pkg_files(p); klist != NULL && *klist != NULL; buff = *klist++) {
-			if (block_text == NULL || strcmp(block_text, pkg_pkg_file_cwd(p, buff)) != 0)
-				printf("\tCWD to %s\n", block_text = pkg_pkg_file_cwd(p, buff));
-			printf("File: %s\n\tComment: MD5: %s\n", 
-				buff, pkg_pkg_file_md5(p, buff));
+		klist = pkg_files(p);
+		if (klist != NULL) {
+			for (buff = *klist++; *klist != NULL; buff = *klist++) {
+				if (block_text == NULL || strcmp(block_text, pkg_pkg_file_cwd(p, buff)) != 0)
+					printf("\tCWD to %s\n", block_text = pkg_pkg_file_cwd(p, buff));
+				printf("File: %s\n\tComment: MD5: %s\n", 
+					buff, pkg_pkg_file_md5(p, buff));
+			}
 		}
 
 		for (klist = pkg_execs(p); klist != NULL && *klist != NULL; buff = *klist++)