- improve debugging messages for initvm

initvm.c

@@ -177,7 +177,7 @@ enum okfail binfmt_register(char *datafile, char *regfile)
 
 		if (buf[0] != ':')	/* non-data input line */
 		{
-			goto skip;
+			continue;
 		}
 
 		/* copy buf and tokenize :-seperated fields into f[] */
@@ -200,22 +200,24 @@ enum okfail binfmt_register(char *datafile, char *regfile)
 		{
 			fprintf(stderr, "%s: line %d: extra fields, ignoring."
 				" Content: %s", datafile, line, buf);
-			goto skip;
+			continue;
 		}
 
 		if (n < n_fields)
 		{
 			fprintf(stderr, "%s: line %d: missing fields, ignoring."
 				" Content: %s", datafile, line, buf);
-			goto skip;
+			continue;
 		}
 
-
-		if (access(f[interpreter], X_OK) != 0) {
+		int ret=access(f[interpreter], X_OK);
+		if (ret != 0) {
+#ifdef DEBUG
 			fprintf(stderr, 
 				"%s: line %d: interpreter '%s' not found,"
-				" ignoring\n", datafile, line, f[interpreter]);
-			goto skip;
+				" ignoring, return %d\n", datafile, line, f[interpreter], ret);
+#endif /* DEBUG */
+			continue;
 		}
 
 		if (!write_file_string(regfile, buf)) {
@@ -238,9 +240,6 @@ enum okfail binfmt_register(char *datafile, char *regfile)
 
 		DBG(fprintf(stderr, "dumping: %s\n", path));
 		DBG(dump_file(path));
-
-skip:
-		;
 	}
 
 
@@ -327,7 +326,7 @@ int main(int argc, char* argv[], char* env[])
 			exit(1);
 		}
 		execve(BUILD, args, env);
-		perror("execve");
+		perror("execve of "BUILD);
 		exit(1);
 	}