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/src/alias.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/src/alias.c')
| -rw-r--r-- | contrib/sendmail/src/alias.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/sendmail/src/alias.c b/contrib/sendmail/src/alias.c index 3eae4ba..57d0b08 100644 --- a/contrib/sendmail/src/alias.c +++ b/contrib/sendmail/src/alias.c @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: alias.c,v 8.219 2006/10/24 18:04:09 ca Exp $") +SM_RCSID("@(#)$Id: alias.c,v 8.220 2013/03/12 15:24:52 ca Exp $") #define SEPARATOR ':' # define ALIAS_SPEC_SEPARATORS " ,/:" @@ -657,7 +657,7 @@ readaliases(map, af, announcestats, logstats) LineNumber = 0; naliases = bytes = longest = 0; skipping = false; - while (sm_io_fgets(af, SM_TIME_DEFAULT, line, sizeof(line)) != NULL) + while (sm_io_fgets(af, SM_TIME_DEFAULT, line, sizeof(line)) >= 0) { int lhssize, rhssize; int c; @@ -670,7 +670,7 @@ readaliases(map, af, announcestats, logstats) { p--; if (sm_io_fgets(af, SM_TIME_DEFAULT, p, - SPACELEFT(line, p)) == NULL) + SPACELEFT(line, p)) < 0) break; LineNumber++; p = strchr(p, '\n'); @@ -780,7 +780,7 @@ readaliases(map, af, announcestats, logstats) /* read continuation line */ if (sm_io_fgets(af, SM_TIME_DEFAULT, p, - sizeof(line) - (p-line)) == NULL) + sizeof(line) - (p-line)) < 0) break; LineNumber++; |
