From d069140339c8e8fd94fa467b30b95da9d56e1ff8 Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Tue, 6 Mar 2007 09:32:41 +0000 Subject: [PATCH] Use sizeof() for calculating the buffer size instead of hard-coded values. --- usr.sbin/arp/arp.c | 2 +- usr.sbin/crunch/crunchide/crunchide.c | 2 +- usr.sbin/kbdmap/kbdmap.c | 2 +- usr.sbin/lpr/lpd/recvjob.c | 2 +- usr.sbin/mtest/mtest.c | 2 +- usr.sbin/ndp/ndp.c | 2 +- usr.sbin/sade/termcap.c | 2 +- usr.sbin/sysinstall/termcap.c | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index f251243d6af1..a4ec683d4caa 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -224,7 +224,7 @@ file(char *name) args[3] = &arg[3][0]; args[4] = &arg[4][0]; retval = 0; - while(fgets(line, 100, fp) != NULL) { + while(fgets(line, sizeof(line), fp) != NULL) { if ((p = strchr(line, '#')) != NULL) *p = '\0'; for (p = line; isblank(*p); p++); diff --git a/usr.sbin/crunch/crunchide/crunchide.c b/usr.sbin/crunch/crunchide/crunchide.c index f50d3e5075c4..165b3bc95f8a 100644 --- a/usr.sbin/crunch/crunchide/crunchide.c +++ b/usr.sbin/crunch/crunchide/crunchide.c @@ -191,7 +191,7 @@ void add_file_to_keep_list(char *filename) usage(); } - while(fgets(symbol, 1024, keepf)) { + while(fgets(symbol, sizeof(symbol), keepf)) { len = strlen(symbol); if(len && symbol[len-1] == '\n') symbol[len-1] = '\0'; diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c index 6958f6140327..8d913d84ca20 100644 --- a/usr.sbin/kbdmap/kbdmap.c +++ b/usr.sbin/kbdmap/kbdmap.c @@ -382,7 +382,7 @@ show_dialog(struct keymap **km_sorted, int num_keymaps) fp = fopen(tmp_name, "r"); if (fp) { char choice[64]; - if (fgets(choice, 64, fp) != NULL) { + if (fgets(choice, sizeof(choice), fp) != NULL) { /* Find key for desc */ for (i=0; idesc)) { diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index ac4f9ee270a5..13519a81b9d6 100644 --- a/usr.sbin/lpr/lpd/recvjob.c +++ b/usr.sbin/lpr/lpd/recvjob.c @@ -351,7 +351,7 @@ read_number(const char *fn) if ((fp = fopen(fn, "r")) == NULL) return (0); - if (fgets(lin, 80, fp) == NULL) { + if (fgets(lin, sizeof(lin), fp) == NULL) { fclose(fp); return (0); } diff --git a/usr.sbin/mtest/mtest.c b/usr.sbin/mtest/mtest.c index f13bf492dfb5..b0ccef1ff454 100644 --- a/usr.sbin/mtest/mtest.c +++ b/usr.sbin/mtest/mtest.c @@ -39,7 +39,7 @@ main( argc, argv ) printf( "multicast membership test program; " ); printf( "enter ? for list of commands\n" ); - while( fgets( line, 79, stdin ) != NULL ) + while( fgets( line, sizeof(line) - 1, stdin ) != NULL ) { lineptr = line; while( *lineptr == ' ' || *lineptr == '\t' ) ++lineptr; diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 07b5cf5774a8..80a50266f278 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -333,7 +333,7 @@ file(name) args[3] = &arg[3][0]; args[4] = &arg[4][0]; retval = 0; - while (fgets(line, 100, fp) != NULL) { + while (fgets(line, sizeof(line), fp) != NULL) { i = sscanf(line, "%49s %49s %49s %49s %49s", arg[0], arg[1], arg[2], arg[3], arg[4]); if (i < 2) { diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c index 0f740a620bc6..820d28dd346f 100644 --- a/usr.sbin/sade/termcap.c +++ b/usr.sbin/sade/termcap.c @@ -30,7 +30,7 @@ prompt_term(char **termp) printf("\nPlease set your TERM variable before running this program.\n"); printf("Defaulting to an ANSI compatible terminal - please press RETURN\n"); - fgets(str, 80, stdin); /* Just to make it interactive */ + fgets(str, sizeof(str), stdin); /* Just to make it interactive */ *termp = (char *)"ansi"; } diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c index 1d8e047bc12a..ca5905a2602f 100644 --- a/usr.sbin/sysinstall/termcap.c +++ b/usr.sbin/sysinstall/termcap.c @@ -50,7 +50,7 @@ prompt_term(char **termp, char **termcapp) printf("5 ...................... xterm terminal emulator.\n\n"); printf("Your choice: (1-5) "); fflush(stdout); - fgets(str, 80, stdin); + fgets(str, sizeof(str), stdin); i = str[0] - '0'; if (i > 0 && i < 6) { *termp = (char *)lookup[i - 1].term; @@ -64,7 +64,7 @@ prompt_term(char **termp, char **termcapp) else { printf("\nPlease set your TERM variable before running this program.\n"); printf("Defaulting to an ANSI compatible terminal - please press RETURN\n"); - fgets(str, 80, stdin); /* Just to make it interactive */ + fgets(str, sizeof(str), stdin); /* Just to make it interactive */ *termp = (char *)"ansi"; *termcapp = (char *)termcap_ansi; }