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/vacation/vacation.c | |
| 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/vacation/vacation.c')
| -rw-r--r-- | contrib/sendmail/vacation/vacation.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/sendmail/vacation/vacation.c b/contrib/sendmail/vacation/vacation.c index 2ead0b8..4cc106e 100644 --- a/contrib/sendmail/vacation/vacation.c +++ b/contrib/sendmail/vacation/vacation.c @@ -20,7 +20,7 @@ SM_IDSTR(copyright, The Regents of the University of California. All rights reserved.\n\ Copyright (c) 1983 Eric P. Allman. All rights reserved.\n") -SM_IDSTR(id, "@(#)$Id: vacation.c,v 8.146 2009/08/07 21:28:39 ca Exp $") +SM_IDSTR(id, "@(#)$Id: vacation.c,v 8.147 2013/03/12 15:24:56 ca Exp $") #include <ctype.h> @@ -509,7 +509,7 @@ readheaders(alwaysrespond) cont = false; tome = alwaysrespond; - while (sm_io_fgets(smioin, SM_TIME_DEFAULT, buf, sizeof(buf)) && + while (sm_io_fgets(smioin, SM_TIME_DEFAULT, buf, sizeof(buf)) >= 0 && *buf != '\n') { switch(*buf) @@ -954,7 +954,7 @@ xclude(f) if (f == NULL) return; - while (sm_io_fgets(f, SM_TIME_DEFAULT, buf, sizeof buf)) + while (sm_io_fgets(f, SM_TIME_DEFAULT, buf, sizeof buf) >= 0) { if ((p = strchr(buf, '\n')) != NULL) *p = '\0'; @@ -1049,7 +1049,7 @@ sendmessage(myname, msgfn, sender) (void) sm_io_fprintf(sfp, SM_TIME_DEFAULT, "To: %s\n", From); (void) sm_io_fprintf(sfp, SM_TIME_DEFAULT, "Auto-Submitted: auto-replied\n"); - while (sm_io_fgets(mfp, SM_TIME_DEFAULT, buf, sizeof buf)) + while (sm_io_fgets(mfp, SM_TIME_DEFAULT, buf, sizeof buf) >= 0) (void) sm_io_fputs(sfp, SM_TIME_DEFAULT, buf); (void) sm_io_close(mfp, SM_TIME_DEFAULT); (void) sm_io_close(sfp, SM_TIME_DEFAULT); |
