install depends on ksu

[unix-history] / usr / src / usr.bin / mail / fio.c

diff --git a/usr/src/usr.bin/mail/fio.c b/usr/src/usr.bin/mail/fio.c
index 5eff466..8f428ef 100644 (file)
--- a/usr/src/usr.bin/mail/fio.c
+++ b/usr/src/usr.bin/mail/fio.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)fio.c      5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)fio.c      5.20 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "rcv.h"
 #endif /* not lint */
 
 #include "rcv.h"


@@ -72,7 +72,7 @@ setptr(ibuf)
                        return;
                }
                count = strlen(linebuf);
                        return;
                }
                count = strlen(linebuf);

-               fwrite(linebuf, sizeof *linebuf, count, otf);
+               (void) fwrite(linebuf, sizeof *linebuf, count, otf);

                if (ferror(otf)) {
                        perror("/tmp");
                        exit(1);
                if (ferror(otf)) {
                        perror("/tmp");
                        exit(1);


@@ -130,8 +130,8 @@ putline(obuf, linebuf)
        register int c;
 
        c = strlen(linebuf);
        register int c;
 
        c = strlen(linebuf);

-       fwrite(linebuf, sizeof *linebuf, c, obuf);
-       putc('\n', obuf);
+       (void) fwrite(linebuf, sizeof *linebuf, c, obuf);
+       (void) putc('\n', obuf);

        if (ferror(obuf))
                return (-1);
        return (c + 1);
        if (ferror(obuf))
                return (-1);
        return (c + 1);


@@ -142,14 +142,14 @@ putline(obuf, linebuf)
  * buffer.  Return the number of characters read.  Do not
  * include the newline at the end.
  */
  * buffer.  Return the number of characters read.  Do not
  * include the newline at the end.
  */

-readline(ibuf, linebuf)
+readline(ibuf, linebuf, linesize)

        FILE *ibuf;
        char *linebuf;
 {
        register int n;
 
        clearerr(ibuf);
        FILE *ibuf;
        char *linebuf;
 {
        register int n;
 
        clearerr(ibuf);

-       if (fgets(linebuf, LINESIZE, ibuf) == NULL)
+       if (fgets(linebuf, linesize, ibuf) == NULL)

                return -1;
        n = strlen(linebuf);
        if (n > 0 && linebuf[n - 1] == '\n')
                return -1;
        n = strlen(linebuf);
        if (n > 0 && linebuf[n - 1] == '\n')


@@ -191,7 +191,7 @@ makemessage(f)
        dot = message;
        size -= sizeof (struct message);
        fflush(f);
        dot = message;
        size -= sizeof (struct message);
        fflush(f);

-       lseek(fileno(f), (long) sizeof *message, 0);
+       (void) lseek(fileno(f), (long) sizeof *message, 0);

        if (read(fileno(f), (char *) message, size) != size)
                panic("Message temporary file corrupted");
        message[msgCount].m_size = 0;
        if (read(fileno(f), (char *) message, size) != size)
                panic("Message temporary file corrupted");
        message[msgCount].m_size = 0;


@@ -228,116 +228,6 @@ remove(name)
        return unlink(name);
 }
 
        return unlink(name);
 }
 

-/*
- * Terminate an editing session by attempting to write out the user's
- * file from the temporary.  Save any new stuff appended to the file.
- */
-edstop()
-{
-       register int gotcha, c;
-       register struct message *mp;
-       FILE *obuf, *ibuf, *readstat;
-       struct stat statb;
-       char tempname[30];
-       char *mktemp();
-
-       if (readonly)
-               return;
-       holdsigs();
-       if (Tflag != NOSTR) {
-               if ((readstat = fopen(Tflag, "w")) == NULL)
-                       Tflag = NOSTR;
-       }
-       for (mp = &message[0], gotcha = 0; mp < &message[msgCount]; mp++) {
-               if (mp->m_flag & MNEW) {
-                       mp->m_flag &= ~MNEW;
-                       mp->m_flag |= MSTATUS;
-               }
-               if (mp->m_flag & (MODIFY|MDELETED|MSTATUS))
-                       gotcha++;
-               if (Tflag != NOSTR && (mp->m_flag & (MREAD|MDELETED)) != 0) {
-                       char *id;
-
-                       if ((id = hfield("article-id", mp)) != NOSTR)
-                               fprintf(readstat, "%s\n", id);
-               }
-       }
-       if (Tflag != NOSTR)
-               fclose(readstat);
-       if (!gotcha || Tflag != NOSTR)
-               goto done;
-       ibuf = NULL;
-       if (stat(mailname, &statb) >= 0 && statb.st_size > mailsize) {
-               strcpy(tempname, "/tmp/mboxXXXXXX");
-               mktemp(tempname);
-               if ((obuf = fopen(tempname, "w")) == NULL) {
-                       perror(tempname);
-                       relsesigs();
-                       reset(0);
-               }
-               if ((ibuf = fopen(mailname, "r")) == NULL) {
-                       perror(mailname);
-                       fclose(obuf);
-                       remove(tempname);
-                       relsesigs();
-                       reset(0);
-               }
-               fseek(ibuf, mailsize, 0);
-               while ((c = getc(ibuf)) != EOF)
-                       putc(c, obuf);
-               fclose(ibuf);
-               fclose(obuf);
-               if ((ibuf = fopen(tempname, "r")) == NULL) {
-                       perror(tempname);
-                       remove(tempname);
-                       relsesigs();
-                       reset(0);
-               }
-               remove(tempname);
-       }
-       printf("\"%s\" ", mailname);
-       fflush(stdout);
-       if ((obuf = fopen(mailname, "r+")) == NULL) {
-               perror(mailname);
-               relsesigs();
-               reset(0);
-       }
-       trunc(obuf);
-       c = 0;
-       for (mp = &message[0]; mp < &message[msgCount]; mp++) {
-               if ((mp->m_flag & MDELETED) != 0)
-                       continue;
-               c++;
-               if (send(mp, obuf, (struct ignoretab *) NULL, NOSTR) < 0) {
-                       perror(mailname);
-                       relsesigs();
-                       reset(0);
-               }
-       }
-       gotcha = (c == 0 && ibuf == NULL);
-       if (ibuf != NULL) {
-               while ((c = getc(ibuf)) != EOF)
-                       putc(c, obuf);
-               fclose(ibuf);
-       }
-       fflush(obuf);
-       if (ferror(obuf)) {
-               perror(mailname);
-               relsesigs();
-               reset(0);
-       }
-       fclose(obuf);
-       if (gotcha) {
-               remove(mailname);
-               printf("removed\n");
-       } else
-               printf("complete\n");
-       fflush(stdout);
-
-done:
-       relsesigs();
-}
-

 static int sigdepth;           /* depth of holdsigs() */
 static int omask;
 /*
 static int sigdepth;           /* depth of holdsigs() */
 static int omask;
 /*


@@ -432,7 +322,7 @@ expand(name)
                }
                return savestr(prevfile);
        case '&':
                }
                return savestr(prevfile);
        case '&':

-               if (name[1] == 0 && (name = value("mbox")) == NOSTR)
+               if (name[1] == 0 && (name = value("MBOX")) == NOSTR)

                        name = "~/mbox";
                /* fall through */
        }
                        name = "~/mbox";
                /* fall through */
        }


@@ -442,7 +332,7 @@ expand(name)
        }
        /* catch the most common shell meta character */
        if (name[0] == '~' && (name[1] == '/' || name[1] == '\0')) {
        }
        /* catch the most common shell meta character */
        if (name[0] == '~' && (name[1] == '/' || name[1] == '\0')) {

-               sprintf(xname, "%s/%s", homedir, name + 1);
+               sprintf(xname, "%s%s", homedir, name + 1);

                name = savestr(xname);
        }
        if (!anyof(name, "~{[*?$`'\"\\"))
                name = savestr(xname);
        }
        if (!anyof(name, "~{[*?$`'\"\\"))


@@ -464,7 +354,7 @@ expand(name)
        l = read(pivec[0], xname, BUFSIZ);
        close(pivec[0]);
        if (wait_child(pid) < 0 && wait_status.w_termsig != SIGPIPE) {
        l = read(pivec[0], xname, BUFSIZ);
        close(pivec[0]);
        if (wait_child(pid) < 0 && wait_status.w_termsig != SIGPIPE) {

-               fprintf(stderr, "\"%s\": Expansion failed.\n");
+               fprintf(stderr, "\"%s\": Expansion failed.\n", name);

                return NOSTR;
        }
        if (l < 0) {
                return NOSTR;
        }
        if (l < 0) {


@@ -507,6 +397,25 @@ getfold(name)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Return the name of the dead.letter file.
+ */
+char *
+getdeadletter()
+{
+       register char *cp;
+
+       if ((cp = value("DEAD")) == NOSTR || (cp = expand(cp)) == NOSTR)
+               cp = expand("~/dead.letter");
+       else if (*cp != '/') {
+               char buf[PATHSIZE];
+
+               (void) sprintf(buf, "~/%s", cp);
+               cp = expand(buf);
+       }
+       return cp;
+}
+

 /*
  * A nicer version of Fdopen, which allows us to fclose
  * without losing the open file.
 /*
  * A nicer version of Fdopen, which allows us to fclose
  * without losing the open file.