diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 03:57:47 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 03:57:47 +0000 |
commit | 4f960dd75f181e9fa2edc44324f15f0ab5c64b37 (patch) | |
tree | 15a9c7203efd47ba6dde2896fdb6327dddd4547f /usr.sbin/sendmail | |
parent | 30ef9631c5eac7f8254bd3d7ad274d34d9f518b8 (diff) | |
download | FreeBSD-src-4f960dd75f181e9fa2edc44324f15f0ab5c64b37.zip FreeBSD-src-4f960dd75f181e9fa2edc44324f15f0ab5c64b37.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'usr.sbin/sendmail')
32 files changed, 57 insertions, 57 deletions
diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile index f8c2a88..3d0ab69 100644 --- a/usr.sbin/sendmail/cf/cf/Makefile +++ b/usr.sbin/sendmail/cf/cf/Makefile @@ -27,7 +27,7 @@ CLEANFILES= cs-hidden.cf cs-exposed.cf \ all: $(CLEANFILES) -depend install: +depend install: # this is overkill, but.... M4FILES=\ diff --git a/usr.sbin/sendmail/cf/cf/Makefile.dist b/usr.sbin/sendmail/cf/cf/Makefile.dist index 074529e..07b62f2 100644 --- a/usr.sbin/sendmail/cf/cf/Makefile.dist +++ b/usr.sbin/sendmail/cf/cf/Makefile.dist @@ -31,7 +31,7 @@ all: $(ALL) clean cleandir: $(RM) $(ALL) core -depend install: +depend install: # this is overkill, but.... M4FILES=\ diff --git a/usr.sbin/sendmail/contrib/bitdomain.c b/usr.sbin/sendmail/contrib/bitdomain.c index 4fad761..d5e8549 100644 --- a/usr.sbin/sendmail/contrib/bitdomain.c +++ b/usr.sbin/sendmail/contrib/bitdomain.c @@ -187,7 +187,7 @@ char *domainlen; case NO_DATA: err = "registered in DNS, but not mailable"; break; - + default: err = "unknown nameserver error"; break; @@ -210,7 +210,7 @@ valhost(host, hbsize) int hbsize; { register u_char *eom, *ap; - register int n; + register int n; HEADER *hp; querybuf answer; int ancount, qdcount; @@ -406,4 +406,4 @@ finish() } } } - + diff --git a/usr.sbin/sendmail/contrib/xla/xla.c b/usr.sbin/sendmail/contrib/xla/xla.c index 627d383..ef998e3 100644 --- a/usr.sbin/sendmail/contrib/xla/xla.c +++ b/usr.sbin/sendmail/contrib/xla/xla.c @@ -166,7 +166,7 @@ xla_init(line) } XlaRules[XlaNext].reject = atoi(s); if (tTd(59, 10)) - printf("xla_init: rule #%d = %s q=%d r=%d\n", XlaNext, + printf("xla_init: rule #%d = %s q=%d r=%d\n", XlaNext, XlaRules[XlaNext].mask, XlaRules[XlaNext].queue, XlaRules[XlaNext].reject); XlaNext++; diff --git a/usr.sbin/sendmail/makemap/makemap.c b/usr.sbin/sendmail/makemap/makemap.c index a676cd7..14548bd 100644 --- a/usr.sbin/sendmail/makemap/makemap.c +++ b/usr.sbin/sendmail/makemap/makemap.c @@ -274,7 +274,7 @@ main(argc, argv) progname, mapname, lineno, sizeof ibuf); continue; } - + if (ibuf[0] == '\0' || ibuf[0] == '#') continue; if (isspace(ibuf[0])) diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile index 71f44ed..83d363e 100644 --- a/usr.sbin/sendmail/src/Makefile +++ b/usr.sbin/sendmail/src/Makefile @@ -19,8 +19,8 @@ SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \ mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \ stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \ util.c version.c -DPADD= -LDADD= +DPADD= +LDADD= MAN1= mailq.1 newaliases.1 MAN5= aliases.5 MAN8= sendmail.8 diff --git a/usr.sbin/sendmail/src/Makefile.386BSD b/usr.sbin/sendmail/src/Makefile.386BSD index 63d94aa..397ce8b 100644 --- a/usr.sbin/sendmail/src/Makefile.386BSD +++ b/usr.sbin/sendmail/src/Makefile.386BSD @@ -19,11 +19,11 @@ SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \ mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \ stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \ util.c version.c -DPADD= +DPADD= LDADD= $(LIBUTIL) MAN1= newaliases.0 mailq.0 MAN5= aliases.0 -MAN8= sendmail.0 +MAN8= sendmail.0 LINKS= /usr/sbin/sendmail /usr/bin/newaliases \ /usr/sbin/sendmail /usr/bin/mailq BINDIR= /usr/sbin diff --git a/usr.sbin/sendmail/src/Makefile.BSDI b/usr.sbin/sendmail/src/Makefile.BSDI index 898de3e..a45016d 100644 --- a/usr.sbin/sendmail/src/Makefile.BSDI +++ b/usr.sbin/sendmail/src/Makefile.BSDI @@ -13,7 +13,7 @@ DPADD= ${LIBUTIL} ${LIBKVM} LDADD= -lutil -lkvm MAN1= mailq.0 newaliases.0 MAN5= aliases.0 -MAN8= sendmail.0 +MAN8= sendmail.0 LINKS= /usr/sbin/sendmail /usr/bin/newaliases \ /usr/sbin/sendmail /usr/bin/mailq BINDIR= /usr/sbin diff --git a/usr.sbin/sendmail/src/Makefile.ConvexOS b/usr.sbin/sendmail/src/Makefile.ConvexOS index 7bf7450..82a77d5 100644 --- a/usr.sbin/sendmail/src/Makefile.ConvexOS +++ b/usr.sbin/sendmail/src/Makefile.ConvexOS @@ -35,7 +35,7 @@ ENVDEF= #LIBDIRS=-L/usr/sww/lib # libraries required on your system -LIBS= +LIBS= # location of sendmail binary (usually /usr/sbin or /usr/lib) BINDIR= ${DESTDIR}/usr/lib diff --git a/usr.sbin/sendmail/src/Makefile.FreeBSD b/usr.sbin/sendmail/src/Makefile.FreeBSD index e86ff59..3a94730 100644 --- a/usr.sbin/sendmail/src/Makefile.FreeBSD +++ b/usr.sbin/sendmail/src/Makefile.FreeBSD @@ -23,7 +23,7 @@ SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \ mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \ stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \ util.c version.c -DPADD= +DPADD= LDADD= $(LIBUTIL) # # FreeBSD 1.0 RELEASE has GNU man and doesn't need preformatted man pages anymore @@ -31,7 +31,7 @@ LDADD= $(LIBUTIL) # MAN1= mailq.1 newaliases.1 MAN5= aliases.5 -MAN8= sendmail.8 +MAN8= sendmail.8 LINKS= /usr/sbin/sendmail /usr/bin/newaliases \ /usr/sbin/sendmail /usr/bin/mailq BINDIR= /usr/sbin diff --git a/usr.sbin/sendmail/src/Makefile.HP-UX b/usr.sbin/sendmail/src/Makefile.HP-UX index cebc499..c1b51ec 100644 --- a/usr.sbin/sendmail/src/Makefile.HP-UX +++ b/usr.sbin/sendmail/src/Makefile.HP-UX @@ -24,7 +24,7 @@ O= +O1 DBMDEF= -DNDBM -DNEWDB -DNIS # environment definitions (e.g., -D_AIX3) -ENVDEF= +ENVDEF= # see also conf.h for additional compilation flags diff --git a/usr.sbin/sendmail/src/Makefile.NetBSD b/usr.sbin/sendmail/src/Makefile.NetBSD index ebeacd0..b253c0b 100644 --- a/usr.sbin/sendmail/src/Makefile.NetBSD +++ b/usr.sbin/sendmail/src/Makefile.NetBSD @@ -17,7 +17,7 @@ PROG= sendmail # spiral snail, but it will work. DBMDEF= -DNEWDB -DNIS -#nasty warning about gcc 2.4.x caused bugs +#nasty warning about gcc 2.4.x caused bugs CFLAGS=-I${.CURDIR} ${DBMDEF} -DNETISO #CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO @@ -28,7 +28,7 @@ SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \ util.c version.c MAN1= mailq.0 newaliases.0 MAN5= aliases.0 -MAN8= sendmail.0 +MAN8= sendmail.0 LINKS= /usr/sbin/sendmail /usr/bin/newaliases \ /usr/sbin/sendmail /usr/bin/mailq BINDIR= /usr/sbin diff --git a/usr.sbin/sendmail/src/Makefile.SCO b/usr.sbin/sendmail/src/Makefile.SCO index f1e7316..0eccdab 100644 --- a/usr.sbin/sendmail/src/Makefile.SCO +++ b/usr.sbin/sendmail/src/Makefile.SCO @@ -46,7 +46,7 @@ STDIR= ${DESTDIR}/usr/lib HFDIR= ${DESTDIR}/usr/lib # additional .o files needed -OBJADD= +OBJADD= ################### end of user configuration flags ###################### diff --git a/usr.sbin/sendmail/src/Makefile.Solaris b/usr.sbin/sendmail/src/Makefile.Solaris index cf359e6..8256a3e 100644 --- a/usr.sbin/sendmail/src/Makefile.Solaris +++ b/usr.sbin/sendmail/src/Makefile.Solaris @@ -12,7 +12,7 @@ # use O=-O (usual) or O=-g (debugging) # warning: do not use -O with gcc -O= +O= CC= gcc diff --git a/usr.sbin/sendmail/src/Makefile.SunOS.5.1 b/usr.sbin/sendmail/src/Makefile.SunOS.5.1 index cf359e6..8256a3e 100644 --- a/usr.sbin/sendmail/src/Makefile.SunOS.5.1 +++ b/usr.sbin/sendmail/src/Makefile.SunOS.5.1 @@ -12,7 +12,7 @@ # use O=-O (usual) or O=-g (debugging) # warning: do not use -O with gcc -O= +O= CC= gcc diff --git a/usr.sbin/sendmail/src/Makefile.SunOS.5.2 b/usr.sbin/sendmail/src/Makefile.SunOS.5.2 index cf359e6..8256a3e 100644 --- a/usr.sbin/sendmail/src/Makefile.SunOS.5.2 +++ b/usr.sbin/sendmail/src/Makefile.SunOS.5.2 @@ -12,7 +12,7 @@ # use O=-O (usual) or O=-g (debugging) # warning: do not use -O with gcc -O= +O= CC= gcc diff --git a/usr.sbin/sendmail/src/Makefile.SunOS.5.x b/usr.sbin/sendmail/src/Makefile.SunOS.5.x index d40f9dd..1b7d268 100644 --- a/usr.sbin/sendmail/src/Makefile.SunOS.5.x +++ b/usr.sbin/sendmail/src/Makefile.SunOS.5.x @@ -12,7 +12,7 @@ # use O=-O (usual) or O=-g (debugging) # warning: do not use -O with gcc -O= +O= CC= gcc diff --git a/usr.sbin/sendmail/src/Makefile.Utah b/usr.sbin/sendmail/src/Makefile.Utah index 84ee571..84f2403 100644 --- a/usr.sbin/sendmail/src/Makefile.Utah +++ b/usr.sbin/sendmail/src/Makefile.Utah @@ -20,10 +20,10 @@ SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \ stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \ util.c version.c DPADD= ${LIBDBM} ${LIBCOMPAT} -LDADD= +LDADD= MAN1= mailq.0 newaliases.0 MAN5= aliases.0 -MAN8= sendmail.0 +MAN8= sendmail.0 LINKS= ${DESTDIR}/usr/sbin/sendmail ${DESTDIR}/usr/bin/newaliases \ ${DESTDIR}/usr/sbin/sendmail ${DESTDIR}/usr/bin/mailq BINDIR= /usr/sbin diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c index 5e94bfa..de71851 100644 --- a/usr.sbin/sendmail/src/conf.c +++ b/usr.sbin/sendmail/src/conf.c @@ -852,7 +852,7 @@ getla() FILE *fp; fp = fopen(_PATH_LOADAVG, "r"); - if (fp == NULL) + if (fp == NULL) { if (tTd(3, 1)) printf("getla: fopen(%s): %s\n", @@ -915,7 +915,7 @@ getla() /* Non Apollo stuff removed by Don Lewis 11/15/93 */ #ifndef lint -static char rcsid[] = "@(#)$Id: conf.c,v 1.5 1995/02/23 00:46:30 pst Exp $"; +static char rcsid[] = "@(#)$Id: conf.c,v 1.6 1995/03/10 05:08:13 pst Exp $"; #endif /* !lint */ #ifdef apollo @@ -1284,7 +1284,7 @@ uname(name) return (0); } #endif - + return (-1); } #endif /* HASUNAME */ @@ -1885,7 +1885,7 @@ lockfile(fd, filename, ext, type) if (ext == NULL) ext = ""; - + bzero(&lfd, sizeof lfd); if (bitset(LOCK_UN, type)) lfd.l_type = F_UNLCK; diff --git a/usr.sbin/sendmail/src/conf.h b/usr.sbin/sendmail/src/conf.h index e3cc1ad..10a8d3d 100644 --- a/usr.sbin/sendmail/src/conf.h +++ b/usr.sbin/sendmail/src/conf.h @@ -891,7 +891,7 @@ typedef int pid_t; # undef BSD # define LA_AVENRUN "avenrun" #endif - + diff --git a/usr.sbin/sendmail/src/deliver.c b/usr.sbin/sendmail/src/deliver.c index cce3800..9e29de9 100644 --- a/usr.sbin/sendmail/src/deliver.c +++ b/usr.sbin/sendmail/src/deliver.c @@ -169,13 +169,13 @@ sendall(e, mode) continue; if (a != NULL) q->q_owner = a->q_owner; - + if (q->q_owner != NULL && !bitset(QDONTSEND, q->q_flags) && strcmp(q->q_owner, e->e_from.q_paddr) == 0) q->q_owner = NULL; } - + owner = ""; otherowners = 1; while (owner != NULL && otherowners > 0) @@ -248,7 +248,7 @@ sendall(e, mode) ee->e_errormode = EM_MAIL; ee->e_sibling = splitenv; splitenv = ee; - + for (q = e->e_sendqueue; q != NULL; q = q->q_next) if (q->q_owner == owner) { @@ -630,7 +630,7 @@ deliver(e, firstto) _res.retrans = 30; _res.retry = 2; } -#endif +#endif m = to->q_mailer; host = to->q_host; @@ -1904,7 +1904,7 @@ logdelivery(m, mci, stat, ctladdr, e) bp += strlen(bp); (void) strcpy(bp, shortenstring(stat, (STATLEN))); - + l = SYSLOG_BUFSIZE - 100 - strlen(buf); p = e->e_to; while (strlen(p) >= l) diff --git a/usr.sbin/sendmail/src/domain.c b/usr.sbin/sendmail/src/domain.c index ee761a9..da2a795 100644 --- a/usr.sbin/sendmail/src/domain.c +++ b/usr.sbin/sendmail/src/domain.c @@ -402,7 +402,7 @@ mxrand(host) ** This algorithm tries to be smart about wildcard MX records. ** This is hard to do because DNS doesn't tell is if we matched ** against a wildcard or a specific MX. -** +** ** We always prefer A & CNAME records, since these are presumed ** to be specific. ** @@ -434,7 +434,7 @@ getcanonname(host, hbsize, trymx) extern int h_errno; register u_char *eom, *ap; register char *cp; - register int n; + register int n; HEADER *hp; querybuf answer; int ancount, qdcount; diff --git a/usr.sbin/sendmail/src/headers.c b/usr.sbin/sendmail/src/headers.c index 8493e79c..a55ba95 100644 --- a/usr.sbin/sendmail/src/headers.c +++ b/usr.sbin/sendmail/src/headers.c @@ -82,7 +82,7 @@ chompheader(line, def, e) { /* have some */ register char *q = strchr(p + 1, *p); - + if (q != NULL) { *q++ = '\0'; @@ -1187,6 +1187,6 @@ copyheader(header) header = header->h_link; } *tail = NULL; - + return ret; } diff --git a/usr.sbin/sendmail/src/main.c b/usr.sbin/sendmail/src/main.c index a0253a2..bae41d5 100644 --- a/usr.sbin/sendmail/src/main.c +++ b/usr.sbin/sendmail/src/main.c @@ -208,10 +208,10 @@ main(argc, argv, envp) #ifdef LOG # ifdef LOG_MAIL openlog("sendmail", LOG_PID, LOG_MAIL); -# else +# else openlog("sendmail", LOG_PID); # endif -#endif +#endif /* set up the blank envelope */ BlankEnvelope.e_puthdr = putheader; @@ -511,7 +511,7 @@ main(argc, argv, envp) break; } break; - + case 'n': /* don't alias */ NoAlias = TRUE; break; @@ -1051,7 +1051,7 @@ main(argc, argv, envp) #endif /* DAEMON */ } - + # ifdef SMTP /* ** If running SMTP protocol, start collecting and executing diff --git a/usr.sbin/sendmail/src/parseaddr.c b/usr.sbin/sendmail/src/parseaddr.c index 00621c2..2683728 100644 --- a/usr.sbin/sendmail/src/parseaddr.c +++ b/usr.sbin/sendmail/src/parseaddr.c @@ -1084,7 +1084,7 @@ rewrite(pvp, ruleset, reclevel, e) if (xpvp != NULL) { cataddr(xpvp, NULL, replac, - &pvpbuf[sizeof pvpbuf] - replac, + &pvpbuf[sizeof pvpbuf] - replac, '\0'); *++arg_rvp = replac; } diff --git a/usr.sbin/sendmail/src/readcf.c b/usr.sbin/sendmail/src/readcf.c index 11a895b..a2d37d9 100644 --- a/usr.sbin/sendmail/src/readcf.c +++ b/usr.sbin/sendmail/src/readcf.c @@ -385,7 +385,7 @@ readcf(cfname, safe, e) continue; if (!isascii(*p) || !isdigit(*p)) { - syserr("invalid argument to S line: \"%.20s\"", + syserr("invalid argument to S line: \"%.20s\"", &bp[1]); break; } @@ -494,7 +494,7 @@ readcf(cfname, safe, e) continue; if (!isascii(*p) || !isdigit(*p)) { - syserr("invalid argument to V line: \"%.20s\"", + syserr("invalid argument to V line: \"%.20s\"", &bp[1]); break; } diff --git a/usr.sbin/sendmail/src/recipient.c b/usr.sbin/sendmail/src/recipient.c index a43cf5c..0b12c2c 100644 --- a/usr.sbin/sendmail/src/recipient.c +++ b/usr.sbin/sendmail/src/recipient.c @@ -835,7 +835,7 @@ include(fname, forwarding, ctladdr, sendq, e) if (uid != 0) (void) setreuid(0, uid); } -#endif +#endif } if (tTd(27, 9)) diff --git a/usr.sbin/sendmail/src/savemail.c b/usr.sbin/sendmail/src/savemail.c index 214dca5..65c915d 100644 --- a/usr.sbin/sendmail/src/savemail.c +++ b/usr.sbin/sendmail/src/savemail.c @@ -774,17 +774,17 @@ errbody(mci, e) } /* ** PRUNEROUTE -- prune an RFC-822 source route -** +** ** Trims down a source route to the last internet-registered hop. ** This is encouraged by RFC 1123 section 5.3.3. -** +** ** Parameters: ** addr -- the address -** +** ** Returns: ** TRUE -- address was modified ** FALSE -- address could not be pruned -** +** ** Side Effects: ** modifies addr in-place */ diff --git a/usr.sbin/sendmail/src/srvrsmtp.c b/usr.sbin/sendmail/src/srvrsmtp.c index eef525d..e2a09e4 100644 --- a/usr.sbin/sendmail/src/srvrsmtp.c +++ b/usr.sbin/sendmail/src/srvrsmtp.c @@ -294,7 +294,7 @@ smtp(e) MyHostName, CurSmtpClient); break; } - + /* print extended message and brag */ message("250-%s Hello %s, pleased to meet you", MyHostName, CurSmtpClient); @@ -486,7 +486,7 @@ smtp(e) MaxMessageSize); /* NOTREACHED */ } - + if (!enoughspace(msize)) { message("452 Insufficient disk space; try again later"); diff --git a/usr.sbin/sendmail/src/udb.c b/usr.sbin/sendmail/src/udb.c index 7887cb3..4739a08 100644 --- a/usr.sbin/sendmail/src/udb.c +++ b/usr.sbin/sendmail/src/udb.c @@ -533,7 +533,7 @@ udbmatch(user, field) case UDB_HESIOD: key.data = keybuf; key.size = keylen; - i = hes_udb_get(&key, &info); + i = hes_udb_get(&key, &info); if (i != 0 || info.size <= 0) { if (tTd(28, 2)) @@ -621,7 +621,7 @@ udbmatch(user, field) { key.data = ":default:mailname"; key.size = strlen(key.data); - i = hes_udb_get(&key, &info); + i = hes_udb_get(&key, &info); if (i != 0 || info.size <= 0) { diff --git a/usr.sbin/sendmail/src/usersmtp.c b/usr.sbin/sendmail/src/usersmtp.c index 06acd3f..2850def 100644 --- a/usr.sbin/sendmail/src/usersmtp.c +++ b/usr.sbin/sendmail/src/usersmtp.c @@ -617,7 +617,7 @@ smtpquit(m, mci, e) /* ** Suppress errors here -- we may be processing a different - ** job when we do the quit connection, and we don't want the + ** job when we do the quit connection, and we don't want the ** new job to be penalized for something that isn't it's ** problem. */ diff --git a/usr.sbin/sendmail/src/util.c b/usr.sbin/sendmail/src/util.c index 3f6e182..b7e1d14 100644 --- a/usr.sbin/sendmail/src/util.c +++ b/usr.sbin/sendmail/src/util.c @@ -192,7 +192,7 @@ copyqueue(addr) addr = addr->q_next; } *tail = NULL; - + return ret; } /* |