Sat Jun 11 06:40:24 2016 UTC ()

PR 51200 gets in libsa considered harmful: use kgets


(dholland)

diff -r1.27 -r1.28 src/sys/arch/sandpoint/stand/altboot/main.c

--- src/sys/arch/sandpoint/stand/altboot/main.c 2015/09/30 14:14:32	1.27
+++ src/sys/arch/sandpoint/stand/altboot/main.c 2016/06/11 06:40:24	1.28

 @@ -1,14 +1,14 @@
-/* $NetBSD: main.c,v 1.27 2015/09/30 14:14:32 phx Exp $ */
+/* $NetBSD: main.c,v 1.28 2016/06/11 06:40:24 dholland Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -633,27 +633,27 @@ check_bootname(char *s)
 				++s;
+		}
 		return *s == ':';
+	}
 	return 0;
+}
 static int input_cmdline(char **argv, int maxargc)
+{
 	char *cmdline;
 	printf("\nbootargs> ");
 	cmdline = alloc(256);
-	gets(cmdline);
+	kgets(cmdline, 256);
 	return parse_cmdline(argv, maxargc, cmdline,
 	    cmdline + strlen(cmdline));
+}
 static int
 parse_cmdline(char **argv, int maxargc, char *p, char *end)
+{
 	int argc;
 	argv[0] = "";
 	for (argc = 1; argc < maxargc && p < end; argc++) {
 		while (is_space(*p))
 @@ -676,27 +676,27 @@ is_space(char c)
 	return c > '\0' && c <= ' ';
+}
 #ifdef DEBUG
 static void
 findflash(void)
+{
 	char buf[256];
 	int i, n;
 	unsigned char c, *p;
 	for (;;) {
 		printf("\nfind> ");
-		gets(buf);
+		kgets(buf, sizeof(buf));
 		if (tolower((unsigned)buf[0]) == 'x')
 			break;
 		for (i = 0, n = 0, c = 0; buf[i]; i++) {
 			c <<= 4;
 			c |= hex2nibble(buf[i]);
 			if (i & 1)
 				buf[n++] = c;
+		}
 		printf("Searching for:");
 		for (i = 0; i < n; i++)
 			printf(" %02x", buf[i]);
 		printf("\n");
 		for (p = (unsigned char *)0xff000000;
 @@ -734,27 +734,27 @@ sat_test(void)
 			for (j = 0; j < n; j++)
 				printf("%02x ", (unsigned)buf[i + j]);
 			for (; j < 16; j++)
 				printf("   ");
 			putchar('\"');
 			for (j = 0; j < n; j++) {
 				c = buf[i + j];
 				putchar((c >= 0x20 && c <= 0x7e) ? c : '.');
+			}
 			printf("\"\n");
+		}
 		printf("controller> ");
-		gets(buf);
+		kgets(buf, sizeof(buf));
 		if (buf[0] == '*' && buf[1] == 'X')
 			break;
 		if (buf[0] == '0' && tolower((unsigned)buf[1]) == 'x') {
 			for (i = 2, n = 0, c = 0; buf[i]; i++) {
 				c <<= 4;
 				c |= hex2nibble(buf[i]);
 				if (i & 1)
 					buf[n++] = c;
+			}
 		} else
 			n = strlen(buf);