diff options
| author | steve <steve@FreeBSD.org> | 1996-12-14 06:14:32 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1996-12-14 06:14:32 +0000 |
| commit | 1c6d77453c9343a570ad40843d4716a09846505d (patch) | |
| tree | 09a83266487c4c5e413b7e1195b6c937e04400f8 /bin/rmail | |
| parent | bf5151c8fc90a9910d62e58a4bbd1dcd8967e1a9 (diff) | |
| download | FreeBSD-src-1c6d77453c9343a570ad40843d4716a09846505d.zip FreeBSD-src-1c6d77453c9343a570ad40843d4716a09846505d.tar.gz | |
Cleanup man page and -Wall cleaning.
Diffstat (limited to 'bin/rmail')
| -rw-r--r-- | bin/rmail/rmail.8 | 8 | ||||
| -rw-r--r-- | bin/rmail/rmail.c | 23 |
2 files changed, 21 insertions, 10 deletions
diff --git a/bin/rmail/rmail.8 b/bin/rmail/rmail.8 index 859a3c5..4691b17 100644 --- a/bin/rmail/rmail.8 +++ b/bin/rmail/rmail.8 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmail.8 6.10 (Berkeley) 4/29/93 -.\" $Id$ +.\" $Id: rmail.8,v 1.2 1994/09/24 02:57:04 davidg Exp $ .\" .Dd April 29, 1993 .Dt RMAIL 8 @@ -42,7 +42,7 @@ .Nm rmail .Ar user ... .Sh DESCRIPTION -.Nm Rmail +.Nm interprets incoming mail received via .Xr uucp 1 , collapsing ``From'' lines in the form generated @@ -52,7 +52,7 @@ into a single line of the form ``return-path!sender'', and passing the processed mail on to .Xr sendmail 8 . .Pp -.Nm Rmail +.Nm is explicitly designed for use with .Xr uucp and @@ -67,6 +67,6 @@ The program appeared in .Bx 4.2 . .Sh BUGS -.Nm Rmail +.Nm should not reside in .Pa /bin . diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c index b45ec45..def8ef3 100644 --- a/bin/rmail/rmail.c +++ b/bin/rmail/rmail.c @@ -30,17 +30,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rmail.c,v 1.5 1995/05/30 00:07:08 rgrimes Exp $ + * $Id: rmail.c,v 1.6 1995/09/16 18:52:51 pst Exp $ */ #ifndef lint -static char copyright[] = +static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)rmail.c 8.1 (Berkeley) 5/31/93"; +static char const sccsid[] = "@(#)rmail.c 8.1 (Berkeley) 5/31/93"; #endif /* not lint */ /* @@ -262,11 +262,22 @@ main(argc, argv) /* * Don't copy arguments beginning with - as they will be * passed to sendmail and could be interpreted as flags. + * To prevent confusion of sendmail wrap < and > around + * the address (helps to pass addrs like @gw1,@gw2:aa@bb) */ - do { - if (*argv && **argv == '-') + while (*argv) { + if (**argv == '-') err(EX_USAGE, "dash precedes argument: %s", *argv); - } while ((args[i++] = *argv++) != NULL); + if (strchr(*argv, ',') == NULL || strchr(*argv, '<') != NULL) + args[i++] = *argv; + else { + if ((args[i] = malloc(strlen(*argv) + 3)) == NULL) + err(EX_TEMPFAIL, "Cannot malloc"); + sprintf (args [i++], "<%s>", *argv); + } + argv++; + } + args[i] = 0; if (debug) { (void)fprintf(stderr, "Sendmail arguments:\n"); |
