Thu Aug 25 16:51:48 2011 UTC ()

fix non-literal format string


(christos)

diff -r1.3 -r1.4 src/dist/pdisk/io.c

--- src/dist/pdisk/Attic/io.c 2009/04/18 06:37:35	1.3
+++ src/dist/pdisk/Attic/io.c 2011/08/25 16:51:48	1.4

 @@ -82,27 +82,26 @@ const long kDefault = -1;
 short unget_buf[UNGET_MAX_COUNT+1];
 int unget_count;
 char io_buffer[MAXIOSIZE];
 //
 // Forward declarations
 //
 long get_number(int first_char);
 char* get_string(int eos);
 int my_getch(void);
 void my_ungetch(int c);
 //
 // Routines
 //
 int
 my_getch()
+{
     if (unget_count > 0) {
 	return (unget_buf[--unget_count]);
     } else {
 	return (getc(stdin));
+    }
+}
 @@ -140,93 +139,93 @@ flush_to_newline(int keep_newline)
 	    // skip
+	}
+    }
     return;
+}
 int
 get_okay(const char *prompt, int default_value)
+{
     int		c;
     flush_to_newline(0);
-    printf(prompt);
+    printf("%s", prompt);
     for (;;) {
 	c = my_getch();
 	if (c <= 0) {
 	    break;
 	} else if (c == ' ' || c == '\t') {
 	    // skip blanks and tabs
 	} else if (c == '\n') {
 	    my_ungetch(c);
 	    return default_value;
 	} else if (c == 'y' || c == 'Y') {
 	    return 1;
 	} else if (c == 'n' || c == 'N') {
 	    return 0;
 	} else {
 	    flush_to_newline(0);
-	    printf(prompt);
+	    printf("%s", prompt);
+	}
+    }
     return -1;
+}
 int
 get_command(const char *prompt, int promptBeforeGet, int *command)
+{
     int		c;
     if (promptBeforeGet) {
-	printf(prompt);
+	printf("%s", prompt);
+    }
     for (;;) {
 	c = my_getch();
 	if (c <= 0) {
 	    break;
 	} else if (c == ' ' || c == '\t') {
 	    // skip blanks and tabs
 	} else if (c == '\n') {
-	    printf(prompt);
+	    printf("%s", prompt);
 	} else {
 	    *command = c;
 	    return 1;
+	}
+    }
     return 0;
+}
 int
 get_number_argument(const char *prompt, long *number, long default_value)
+{
     int c;
     int result = 0;
     for (;;) {
 	c = my_getch();
 	if (c <= 0) {
 	    break;
 	} else if (c == ' ' || c == '\t') {
 	    // skip blanks and tabs
 	} else if (c == '\n') {
 	    if (default_value == kDefault) {
-		printf(prompt);
+		printf("%s", prompt);
 	    } else {
 		my_ungetch(c);
 		*number = default_value;
 		result = 1;
 		break;
+	    }
 	} else if ('0' <= c && c <= '9') {
 	    *number = get_number(c);
 	    result = 1;
 	    break;
 	} else {
 	    my_ungetch(c);
 	    *number = 0;
 @@ -285,27 +284,27 @@ get_string_argument(const char *prompt,
+{
     int c;
     int result = 0;
     for (;;) {
 	c = my_getch();
 	if (c <= 0) {
 	    break;
 	} else if (c == ' ' || c == '\t') {
 	    // skip blanks and tabs
 	} else if (c == '\n') {
 	    if (reprompt) {
-		printf(prompt);
+		printf("%s", prompt);
 	    } else {
 		my_ungetch(c);
 		*string = NULL;
 		break;
+	    }
 	} else if (c == '"' || c == '\'') {
 	    *string = get_string(c);
 	    result = 1;
 	    break;
 	} else if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')
 		|| (c == '-' || c == '/' || c == '.' || c == ':')) {
 	    my_ungetch(c);
 	    *string = get_string(' ');