diff options
author | kevlo <kevlo@FreeBSD.org> | 2012-01-13 06:51:15 +0000 |
---|---|---|
committer | kevlo <kevlo@FreeBSD.org> | 2012-01-13 06:51:15 +0000 |
commit | 96dbfe4e2de39c163a56b1d941ba673c95154896 (patch) | |
tree | 2f39c41e193505df2d97cf331a8647c9f25c53c9 | |
parent | 6898680f64062d1debcda280c9b38d4e54905c66 (diff) | |
download | FreeBSD-src-96dbfe4e2de39c163a56b1d941ba673c95154896.zip FreeBSD-src-96dbfe4e2de39c163a56b1d941ba673c95154896.tar.gz |
fgets(3) returns a pointer, so compare against NULL, not integer 0.
-rw-r--r-- | usr.bin/mail/edit.c | 2 | ||||
-rw-r--r-- | usr.bin/tftp/main.c | 2 | ||||
-rw-r--r-- | usr.bin/unzip/unzip.c | 2 | ||||
-rw-r--r-- | usr.sbin/config/mkmakefile.c | 8 | ||||
-rw-r--r-- | usr.sbin/lpr/lpc/lpc.c | 2 | ||||
-rw-r--r-- | usr.sbin/timed/timedc/timedc.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c index d1ff37f..ad8aa53 100644 --- a/usr.bin/mail/edit.c +++ b/usr.bin/mail/edit.c @@ -89,7 +89,7 @@ edit1(int *msgvec, int type) char *p; printf("Edit message %d [ynq]? ", msgvec[i]); - if (fgets(buf, sizeof(buf), stdin) == 0) + if (fgets(buf, sizeof(buf), stdin) == NULL) break; for (p = buf; *p == ' ' || *p == '\t'; p++) ; diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index 0092827..669299b 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -734,7 +734,7 @@ command(void) history(hist, &he, H_ENTER, bp); } else { line[0] = 0; - if (fgets(line, sizeof line , stdin) == 0) { + if (fgets(line, sizeof line , stdin) == NULL) { if (feof(stdin)) { exit(txrx_error); } else { diff --git a/usr.bin/unzip/unzip.c b/usr.bin/unzip/unzip.c index 1fa3564..accd653 100644 --- a/usr.bin/unzip/unzip.c +++ b/usr.bin/unzip/unzip.c @@ -422,7 +422,7 @@ handle_existing_file(char **path) fprintf(stderr, "replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", *path); - if (fgets(buf, sizeof(buf), stdin) == 0) { + if (fgets(buf, sizeof(buf), stdin) == NULL) { clearerr(stdin); printf("NULL\n(EOF or read error, " "treating as \"[N]one\"...)\n"); diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 4cbc135..937fb0f 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1993, 19801990 + * Copyright (c) 1980, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -154,7 +154,7 @@ makefile(void) fprintf(ofp, "PROFLEVEL=%d\n", profiling); if (*srcdir != '\0') fprintf(ofp,"S=%s\n", srcdir); - while (fgets(line, BUFSIZ, ifp) != 0) { + while (fgets(line, BUFSIZ, ifp) != NULL) { if (*line != '%') { fprintf(ofp, "%s", line); continue; @@ -204,7 +204,7 @@ makehints(void) ifp = fopen(hint->hint_name, "r"); if (ifp == NULL) err(1, "%s", hint->hint_name); - while (fgets(line, BUFSIZ, ifp) != 0) { + while (fgets(line, BUFSIZ, ifp) != NULL) { /* zap trailing CR and/or LF */ while ((s = strrchr(line, '\n')) != NULL) *s = '\0'; @@ -266,7 +266,7 @@ makeenv(void) fprintf(ofp, "int envmode = %d;\n", envmode); fprintf(ofp, "char static_env[] = {\n"); if (ifp) { - while (fgets(line, BUFSIZ, ifp) != 0) { + while (fgets(line, BUFSIZ, ifp) != NULL) { /* zap trailing CR and/or LF */ while ((s = strrchr(line, '\n')) != NULL) *s = '\0'; diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c index bd95c59..f9fb920 100644 --- a/usr.sbin/lpr/lpc/lpc.c +++ b/usr.sbin/lpr/lpc/lpc.c @@ -188,7 +188,7 @@ cmdscanner(void) history(hist, &he, H_ENTER, bp); } else { - if (fgets(cmdline, MAX_CMDLINE, stdin) == 0) + if (fgets(cmdline, MAX_CMDLINE, stdin) == NULL) quit(0, NULL); if (cmdline[0] == 0 || cmdline[0] == '\n') break; diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c index 5423cea..7047f57 100644 --- a/usr.sbin/timed/timedc/timedc.c +++ b/usr.sbin/timed/timedc/timedc.c @@ -105,7 +105,7 @@ main(argc, argv) printf("timedc> "); (void) fflush(stdout); } - if (fgets(cmdline, sizeof(cmdline), stdin) == 0) + if (fgets(cmdline, sizeof(cmdline), stdin) == NULL) quit(); if (cmdline[0] == 0) break; |