diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2013-04-21 17:08:44 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2013-04-21 17:08:44 +0000 |
commit | 891f1b61da33280fa1ba153569b360771d27e984 (patch) | |
tree | ab52d50bcac2932bf5e37126b12ef0d2886488f1 /contrib/sendmail/rmail | |
parent | 84dd41acc62e69379821ee9ff4d6461233543f07 (diff) | |
parent | a03b7e14eaaeb30fff6859c589152c8787d230e3 (diff) | |
download | FreeBSD-src-891f1b61da33280fa1ba153569b360771d27e984.zip FreeBSD-src-891f1b61da33280fa1ba153569b360771d27e984.tar.gz |
Merge sendmail 8.14.7 to HEAD
MFC after: 4 days
Diffstat (limited to 'contrib/sendmail/rmail')
-rw-r--r-- | contrib/sendmail/rmail/rmail.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c index 5cdc9bb..bb1508e 100644 --- a/contrib/sendmail/rmail/rmail.c +++ b/contrib/sendmail/rmail/rmail.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: rmail.c,v 8.61 2001/09/18 21:45:29 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: rmail.c,v 8.62 2013/03/12 15:24:52 ca Exp $") /* * RMAIL -- UUCP mail server. @@ -136,7 +136,7 @@ main(argc, argv) { /* Get and nul-terminate the line. */ if (sm_io_fgets(smioin, SM_TIME_DEFAULT, lbuf, - sizeof(lbuf)) == NULL) + sizeof(lbuf)) < 0) err(EX_DATAERR, "no data"); if ((p = strchr(lbuf, '\n')) == NULL) err(EX_DATAERR, "line too long"); @@ -385,7 +385,7 @@ main(argc, argv) { (void) sm_io_fprintf(fp, SM_TIME_DEFAULT, "%s", lbuf); } while (sm_io_fgets(smioin, SM_TIME_DEFAULT, lbuf, - sizeof(lbuf)) != NULL); + sizeof(lbuf)) >= 0); if (sm_io_error(smioin)) err(EX_TEMPFAIL, "stdin: %s", sm_errstring(errno)); |