add more havocs to test stl parsing

1 files changed, 19 insertions, 19 deletions

diff --git a/service/src/main.c b/service/src/main.c
index 498f33f..7ff0f11 100644
--- a/service/src/main.c
+++ b/service/src/main.c
@@ -108,12 +108,12 @@ handle_download(const char *scandir)
 
 	infopath = aprintf("%s/%s", scandir, "info");
 	if (!(f = fopen(infopath, "r"))) {
-		printf("Selected result is missing!\n");
+		printf("ERR: Selected result is missing!\n");
 		goto cleanup;
 	}
 	free_info(&cached);
 	if (load_info(&cached, f) != OK) {
-		printf("Failed to parse info file!\n");
+		printf("ERR: Failed to parse info file!\n");
 		goto cleanup;
 	}
 	fclose(f);
@@ -124,14 +124,14 @@ handle_download(const char *scandir)
 	if (strchr(ask("Download the model? "), 'y')) {
 		modelpath = aprintf("%s/%s", scandir, "model");
 		if (!(f = fopen(modelpath, "r"))) {
-			printf("Failed to access file!\n");
+			printf("ERR: Failed to access file!\n");
 			goto cleanup;
 		}
 		fseek(f, 0, SEEK_END);
 		size = ftell(f);
 		fseek(f, 0, SEEK_SET);
 		if (size > MAXFILESIZE) {
-			printf("File is too large to send!\n");
+			printf("ERR: File is too large!\n");
 			goto cleanup;
 		}
 		printf("Here you go.. (%liB)\n", size);
@@ -194,28 +194,28 @@ echo_cmd(const char *arg)
 void
 upload_cmd(const char *arg)
 {
-	const char *bufp;
+	const char *resp;
 	char *end, *contents;
 	size_t len;
 
-	bufp = ask("How large is your file? ");
-	len = strtoul(bufp, &end, 10);
+	resp = ask("How large is your file? ");
+	len = strtoul(resp, &end, 10);
 	if (len <= 0 || len >= MAXFILESIZE || *end) {
-		printf("Invalid file length!\n");
+		printf("ERR: Invalid file length!\n");
 		return;
 	}
 
 	printf("Ok! Im listening..\n");
 	contents = checkp(malloc(len + 1));
 	if (fread(contents, 1, len, stdin) != len) {
-		printf("Hm, I'm missing some bytes.. try again!\n");
+		printf("ERR: Not enough data received!\n");
 		goto cleanup;
 	}
 	contents[len] = '\0';
 
 	if ((cached.valid = parse_file(&cached, contents, len))) {
 		if (save_submission(&cached, contents, len) != OK)
-			printf("Failed to save your submission!\n");
+			printf("ERR: Failed to save your submission!\n");
 		else
 			printf("Your file was saved with ID %s!\n", cached.hash);
 	}
@@ -235,7 +235,7 @@ search_cmd(const char *arg)
 
 	if (arg && !strcmp(arg, "last")) {
 		if (!cached.valid) {
-			printf("No cached info report available\n");
+			printf("ERR: No cached info report available\n");
 			return;
 		}
 		hash = cached.hash;
@@ -244,7 +244,7 @@ search_cmd(const char *arg)
 	}
 
 	if (!(d = opendir(resultdir))) {
-		printf("Unable to access upload directory!\n");
+		printf("ERR: Unable to access upload directory!\n");
 		return;
 	}
 
@@ -263,7 +263,7 @@ search_cmd(const char *arg)
 	closedir(d);
 
 	if (pathc == 0) {
-		printf("Sorry, couldnt find a matching scan result!\n");
+		printf("ERR: Couldn't find a matching scan result!\n");
 		goto cleanup;
 	}
 
@@ -272,7 +272,7 @@ search_cmd(const char *arg)
 		if (strchr(resp, 'q')) break;
 		which = strtoul(resp, &end, 10);
 		if (which >= pathc || which < 0 || *end) {
-			printf("Invalid index!\n");
+			printf("ERR: Invalid index!\n");
 			goto cleanup;
 		}
 
@@ -301,7 +301,7 @@ list_cmd(const char *arg)
 	DIR *d;
 
 	if (!loggedin) {
-		printf("Not logged in!\n");
+		printf("ERR: Not logged in!\n");
 		return;
 	}
 
@@ -315,7 +315,7 @@ list_cmd(const char *arg)
 				if (load_info(&info, f) == OK)
 					print_info(&info);
 				else
-					printf("Failed to read saved file info!\n");
+					printf("ERR: Failed to read saved file info!\n");
 				fclose(f);
 			}
 			free(path);
@@ -331,7 +331,7 @@ auth_cmd(const char *arg)
 	int ret;
 
 	if (loggedin) {
-		printf("Already logged in!\n");
+		printf("ERR: Already logged in!\n");
 		return;
 	}
 
@@ -343,7 +343,7 @@ auth_cmd(const char *arg)
 	} else if (ret && errno == EEXIST) {
 		printf("Success!\nWelcome back!\n");
 	} else {
-		printf("Auth failed!\n");
+		printf("ERR: Auth failed!\n");
 		return;
 	}
 
@@ -369,7 +369,7 @@ main()
 	int exit, i, cmdlen;
 
 	if (!(envstr = getenv("RESULTDIR"))) {
-		printf("RESULTDIR not defined\n");
+		printf("ERR: RESULTDIR not defined\n");
 		return 1;
 	}