diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2001-01-21 22:21:43 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2001-01-21 22:21:43 +0000 |
| commit | e804c25cafdf47cc91627155f1389c81fa997eca (patch) | |
| tree | 115a2c1b4e339bc9c060e940ec6ae17826a0f7e0 /contrib/sendmail/mail.local | |
| parent | c5e098efbef941858129b84a112a036d572ba53c (diff) | |
| download | FreeBSD-src-e804c25cafdf47cc91627155f1389c81fa997eca.zip FreeBSD-src-e804c25cafdf47cc91627155f1389c81fa997eca.tar.gz | |
Repair 8.11.2 merge conflicts
Diffstat (limited to 'contrib/sendmail/mail.local')
| -rw-r--r-- | contrib/sendmail/mail.local/mail.local.8 | 8 | ||||
| -rw-r--r-- | contrib/sendmail/mail.local/mail.local.c | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/contrib/sendmail/mail.local/mail.local.8 b/contrib/sendmail/mail.local/mail.local.8 index 2c21239..2b23c31 100644 --- a/contrib/sendmail/mail.local/mail.local.8 +++ b/contrib/sendmail/mail.local/mail.local.8 @@ -8,17 +8,19 @@ .\" the sendmail distribution. .\" .\" -.\" $Id: mail.local.8,v 8.14.14.3 2000/09/17 17:04:25 gshapiro Exp $ +.\" $Id: mail.local.8,v 8.14.14.5 2000/12/29 18:12:16 gshapiro Exp $ .\" .\" $FreeBSD$ .\" -.TH MAIL.LOCAL 8 "$Date: 2000/09/17 17:04:25 $" +.TH MAIL.LOCAL 8 "$Date: 2000/12/29 18:12:16 $" .SH NAME -.B mail.local +mail.local \- store mail in a mailbox .SH SYNOPSIS .B mail.local .RB [ \-7 "] [" \-B "] [" \-b "] [" \-d "] [" \-l "] [" \-s "] [" \-f +.IR from "] " +.RB [ \-r .IR from "] " "user ..." .SH DESCRIPTION .B Mail.local diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c index 56e1aa2..6a7b5bf 100644 --- a/contrib/sendmail/mail.local/mail.local.c +++ b/contrib/sendmail/mail.local/mail.local.c @@ -19,7 +19,7 @@ static char copyright[] = #endif /* ! lint */ #ifndef lint -static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.37 2000/09/22 00:49:10 doug Exp $"; +static char id[] = "@(#)$Id: mail.local.c,v 8.143.4.39 2000/11/14 20:02:47 gshapiro Exp $"; #endif /* ! lint */ /* $FreeBSD$ */ @@ -663,7 +663,7 @@ dolmtp(bouncequota) printf("250 2.0.0 ok\r\n"); rset: - while (rcpt_num) + while (rcpt_num > 0) free(rcpt_addr[--rcpt_num]); if (return_path != NULL) free(return_path); @@ -924,7 +924,7 @@ deliver(fd, name, bouncequota) struct stat sb; struct passwd *pw; char path[MAXPATHLEN]; - int mbfd, nr = 0, nw, off; + int mbfd = -1, nr = 0, nw, off; char *p; off_t curoff; #ifdef CONTENTLENGTH |
