BSD 4_3_Tahoe release

[unix-history] / usr / src / usr.lib / sendmail / aux / rmail.c

diff --git a/usr/src/usr.lib/sendmail/aux/rmail.c b/usr/src/usr.lib/sendmail/aux/rmail.c
index 9306ef2..a4446ac 100644 (file)
--- a/usr/src/usr.lib/sendmail/aux/rmail.c
+++ b/usr/src/usr.lib/sendmail/aux/rmail.c
@@ -1,22 +1,6 @@
-/*
-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
-

 #ifndef lint
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
- All rights reserved.\n";
-#endif not lint
-
-#ifndef lint
-static char    SccsId[] = "@(#)rmail.c 5.1 (Berkeley) 6/7/85";
-#endif not lint
+static char sccsid[] = "@(#)rmail.c    4.8 (Berkeley) 5/15/86";
+#endif

 
 /*
 **  RMAIL -- UUCP mail server.
 
 /*
 **  RMAIL -- UUCP mail server.


@@ -46,14 +30,14 @@ main(argc, argv)
        char **argv;
 {
        FILE *out;      /* output to sendmail */
        char **argv;
 {
        FILE *out;      /* output to sendmail */

-       char lbuf[512]; /* one line of the message */
-       char from[512]; /* accumulated path of sender */
-       char ufrom[64]; /* user on remote system */
-       char sys[64];   /* a system in path */
-       char junk[512]; /* scratchpad */
+       char lbuf[1024];        /* one line of the message */
+       char from[512];         /* accumulated path of sender */
+       char ufrom[512];        /* user on remote system */
+       char sys[512];          /* a system in path */
+       char junk[1024];        /* scratchpad */

        char cmd[2000];
        register char *cp;
        char cmd[2000];
        register char *cp;

-       register char *uf;      /* ptr into ufrom */
+       register char *uf = ufrom;      /* ptr into ufrom */

        int i;
 
 # ifdef DEBUG
        int i;
 
 # ifdef DEBUG


@@ -81,7 +65,6 @@ main(argc, argv)
                        break;
                (void) sscanf(lbuf, "%s %s", junk, ufrom);
                cp = lbuf;
                        break;
                (void) sscanf(lbuf, "%s %s", junk, ufrom);
                cp = lbuf;

-               uf = ufrom;

                for (;;)
                {
                        cp = index(cp+1, 'r');
                for (;;)
                {
                        cp = index(cp+1, 'r');


@@ -116,7 +99,7 @@ main(argc, argv)
        }
        (void) strcat(from, uf);
 
        }
        (void) strcat(from, uf);
 

-       (void) sprintf(cmd, "%s -ee -f%s", MAILER, from);
+       (void) sprintf(cmd, "%s -ee -f%s -i", MAILER, from);

        while (*++argv != NULL)
        {
                (void) strcat(cmd, " '");
        while (*++argv != NULL)
        {
                (void) strcat(cmd, " '");