4.4BSD snapshot (revision 8.1); add 1993 to copyright

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

diff --git a/usr/src/usr.bin/mail/edit.c b/usr/src/usr.bin/mail/edit.c
index e70cf63..6f5889c 100644 (file)
--- a/usr/src/usr.bin/mail/edit.c
+++ b/usr/src/usr.bin/mail/edit.c
@@ -1,23 +1,17 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * %sccs.include.redist.c%

  */
 
  */
 

-#ifdef notdef
-static char sccsid[] = "@(#)edit.c     5.6 (Berkeley) %G%";
-#endif /* notdef */
+#ifndef lint
+static char sccsid[] = "@(#)edit.c     8.1 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "rcv.h"
 
 #include "rcv.h"

-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
+#include <fcntl.h>
+#include "extern.h"

 
 /*
  * Mail -- a mail program
 
 /*
  * Mail -- a mail program


@@ -28,29 +22,23 @@ static char sccsid[] = "@(#)edit.c  5.6 (Berkeley) %G%";
 /*
  * Edit a message list.
  */
 /*
  * Edit a message list.
  */

-
+int

 editor(msgvec)
        int *msgvec;
 {
 editor(msgvec)
        int *msgvec;
 {

-       char *edname;

 
 

-       if ((edname = value("EDITOR")) == NOSTR)
-               edname = EDITOR;
-       return(edit1(msgvec, edname));
+       return edit1(msgvec, 'e');

 }
 
 /*
  * Invoke the visual editor on a message list.
  */
 }
 
 /*
  * Invoke the visual editor on a message list.
  */

-
+int

 visual(msgvec)
        int *msgvec;
 {
 visual(msgvec)
        int *msgvec;
 {

-       char *edname;

 
 

-       if ((edname = value("VISUAL")) == NOSTR)
-               edname = VISUAL;
-       return(edit1(msgvec, edname));
+       return edit1(msgvec, 'v');

 }
 
 /*
 }
 
 /*


@@ -58,134 +46,149 @@ visual(msgvec)
  * (which should not exist) and forking an editor on it.
  * We get the editor from the stuff above.
  */
  * (which should not exist) and forking an editor on it.
  * We get the editor from the stuff above.
  */

-edit1(msgvec, ed)
+int
+edit1(msgvec, type)

        int *msgvec;
        int *msgvec;

-       char *ed;
+       int type;

 {
        register int c;
 {
        register int c;

-       int i, pid;
-       int (*sigint)(), (*sigquit)();
+       int i;

        FILE *fp;
        FILE *fp;

-       extern char tempEdit[];
-       char *edname = tempEdit;

        register struct message *mp;
        register struct message *mp;

-       off_t fsize(), size;
-       struct stat statb;
-       time_t modtime;
-       union wait status;
+       off_t size;

 
 

-       /*
-        * Set signals; locate editor.
-        */
-       sigint = signal(SIGINT, SIG_IGN);
-       sigquit = signal(SIGQUIT, SIG_IGN);

        /*
         * Deal with each message to be edited . . .
         */
        for (i = 0; msgvec[i] && i < msgCount; i++) {
        /*
         * Deal with each message to be edited . . .
         */
        for (i = 0; msgvec[i] && i < msgCount; i++) {

-               mp = &message[msgvec[i] - 1];
-               mp->m_flag |= MODIFY;
-               touch(msgvec[i]);
-               dot = mp;
-               /*
-                * Copy the message into the edit file.
-                * If we are in read only mode, make the
-                * temporary message file readonly as well.
-                */
-               if ((c = creat(edname, readonly ? 0400 : 0600)) < 0) {
-                       perror(edname);
-                       goto out;
-               }
-               if ((fp = fdopen(c, "w")) == NULL) {
-                       perror(edname);
-                       (void) unlink(edname);
-                       goto out;
-               }
-               if (send(mp, fp, 0) < 0) {
-                       perror(edname);
-                       (void) fclose(fp);
-                       (void) unlink(edname);
-                       goto out;
-               }
-               (void) fflush(fp);
-               if (ferror(fp)) {
-                       (void) unlink(edname);
-                       (void) fclose(fp);
-                       goto out;
-               }
-               if (fstat(fileno(fp), &statb) < 0)
-                       modtime = 0;
-               else
-                       modtime = statb.st_mtime;
-               (void) fclose(fp);
-               /*
-                * Fork/execl the editor on the edit file.
-                */
-               pid = vfork();
-               if (pid == -1) {
-                       perror("fork");
-                       (void) unlink(edname);
-                       goto out;
-               }
-               if (pid == 0) {
-                       if (sigint != SIG_IGN)
-                               (void) signal(SIGINT, SIG_DFL);
-                       if (sigquit != SIG_IGN)
-                               (void) signal(SIGQUIT, SIG_DFL);
-                       execl(ed, ed, edname, 0);
-                       perror(ed);
-                       _exit(1);
-               }
-               while (wait(&status) != pid)
-                       ;
-               /*
-                * If in read only mode, just remove the editor
-                * temporary and return.
-                */
-               if (readonly) {
-                       (void) unlink(edname);
-                       continue;
-               }
-               /*
-                * Now copy the message to the end of the
-                * temp file.
-                */
-               if (stat(edname, &statb) < 0) {
-                       perror(edname);
-                       goto out;
-               }
-               if (modtime == statb.st_mtime) {
-                       (void) unlink(edname);
-                       goto out;
-               }
-               if ((fp = fopen(edname, "r")) == NULL) {
-                       perror(edname);
-                       (void) unlink(edname);
-                       goto out;
+               sig_t sigint;
+
+               if (i > 0) {
+                       char buf[100];
+                       char *p;
+
+                       printf("Edit message %d [ynq]? ", msgvec[i]);
+                       if (fgets(buf, sizeof buf, stdin) == 0)
+                               break;
+                       for (p = buf; *p == ' ' || *p == '\t'; p++)
+                               ;
+                       if (*p == 'q')
+                               break;
+                       if (*p == 'n')
+                               continue;

                }
                }

-               (void) unlink(edname);
-               (void) fseek(otf, (long) 0, 2);
-               size = ftell(otf);
-               mp->m_block = blockof(size);
-               mp->m_offset = offsetof(size);
-               mp->m_size = fsize(fp);
-               mp->m_lines = 0;
-               while ((c = getc(fp)) != EOF) {
-                       if (c == '\n')
-                               mp->m_lines++;
-                       (void) putc(c, otf);
+               dot = mp = &message[msgvec[i] - 1];
+               touch(mp);
+               sigint = signal(SIGINT, SIG_IGN);
+               fp = run_editor(setinput(mp), mp->m_size, type, readonly);
+               if (fp != NULL) {
+                       (void) fseek(otf, 0L, 2);
+                       size = ftell(otf);
+                       mp->m_block = blockof(size);
+                       mp->m_offset = offsetof(size);
+                       mp->m_size = fsize(fp);
+                       mp->m_lines = 0;
+                       mp->m_flag |= MODIFY;
+                       rewind(fp);
+                       while ((c = getc(fp)) != EOF) {
+                               if (c == '\n')
+                                       mp->m_lines++;
+                               if (putc(c, otf) == EOF)
+                                       break;
+                       }

                        if (ferror(otf))
                        if (ferror(otf))

-                               break;
+                               perror("/tmp");
+                       (void) Fclose(fp);

                }
                }

-               if (ferror(otf))
-                       perror("/tmp");
-               (void) fclose(fp);
+               (void) signal(SIGINT, sigint);
+       }
+       return 0;
+}
+
+/*
+ * Run an editor on the file at "fpp" of "size" bytes,
+ * and return a new file pointer.
+ * Signals must be handled by the caller.
+ * "Type" is 'e' for _PATH_EX, 'v' for _PATH_VI.
+ */
+FILE *
+run_editor(fp, size, type, readonly)
+       register FILE *fp;
+       off_t size;
+       int type, readonly;
+{
+       register FILE *nf = NULL;
+       register int t;
+       time_t modtime;
+       char *edit;
+       struct stat statb;
+       extern char tempEdit[];
+
+       if ((t = creat(tempEdit, readonly ? 0400 : 0600)) < 0) {
+               perror(tempEdit);
+               goto out;
+       }
+       if ((nf = Fdopen(t, "w")) == NULL) {
+               perror(tempEdit);
+               (void) unlink(tempEdit);
+               goto out;
+       }
+       if (size >= 0)
+               while (--size >= 0 && (t = getc(fp)) != EOF)
+                       (void) putc(t, nf);
+       else
+               while ((t = getc(fp)) != EOF)
+                       (void) putc(t, nf);
+       (void) fflush(nf);
+       if (fstat(fileno(nf), &statb) < 0)
+               modtime = 0;
+       else
+               modtime = statb.st_mtime;
+       if (ferror(nf)) {
+               (void) Fclose(nf);
+               perror(tempEdit);
+               (void) unlink(tempEdit);
+               nf = NULL;
+               goto out;
+       }
+       if (Fclose(nf) < 0) {
+               perror(tempEdit);
+               (void) unlink(tempEdit);
+               nf = NULL;
+               goto out;
+       }
+       nf = NULL;
+       if ((edit = value(type == 'e' ? "EDITOR" : "VISUAL")) == NOSTR)
+               edit = type == 'e' ? _PATH_EX : _PATH_VI;
+       if (run_command(edit, 0, -1, -1, tempEdit, NOSTR, NOSTR) < 0) {
+               (void) unlink(tempEdit);
+               goto out;
+       }
+       /*
+        * If in read only mode or file unchanged, just remove the editor
+        * temporary and return.
+        */
+       if (readonly) {
+               (void) unlink(tempEdit);
+               goto out;
+       }
+       if (stat(tempEdit, &statb) < 0) {
+               perror(tempEdit);
+               goto out;
+       }
+       if (modtime == statb.st_mtime) {
+               (void) unlink(tempEdit);
+               goto out;

        }
        /*
        }
        /*

-        * Restore signals and return.
+        * Now switch to new file.

         */
         */

+       if ((nf = Fopen(tempEdit, "a+")) == NULL) {
+               perror(tempEdit);
+               (void) unlink(tempEdit);
+               goto out;
+       }
+       (void) unlink(tempEdit);

 out:
 out:

-       (void) signal(SIGINT, sigint);
-       (void) signal(SIGQUIT, sigquit);
-       return 0;
+       return nf;

 }
 }