BSD 4_4 release

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

diff --git a/usr/src/usr.bin/mail/lex.c b/usr/src/usr.bin/mail/lex.c
index 6c7f331..3428203 100644 (file)
--- a/usr/src/usr.bin/mail/lex.c
+++ b/usr/src/usr.bin/mail/lex.c
@@ -1,6 +1,44 @@
-#
+/*
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)lex.c      8.1 (Berkeley) 6/6/93";
+#endif /* not lint */

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

+#include <errno.h>
+#include <fcntl.h>
+#include "extern.h"

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


@@ -8,28 +46,59 @@
  * Lexical processing of commands.
  */
 
  * Lexical processing of commands.
  */
 

-static char *SccsId = "@(#)lex.c       2.11 %G%";
-

 char   *prompt = "& ";
 
 /*
  * Set up editing on the given file name.
 char   *prompt = "& ";
 
 /*
  * Set up editing on the given file name.

- * If isedit is true, we are considered to be editing the file,
- * otherwise we are reading our mail which has signficance for
- * mbox and so forth.
+ * If the first character of name is %, we are considered to be
+ * editing the file, otherwise we are reading our mail which has
+ * signficance for mbox and so forth.

  */
  */

-
-setfile(name, isedit)
+int
+setfile(name)

        char *name;
 {
        FILE *ibuf;
        int i;
        char *name;
 {
        FILE *ibuf;
        int i;

+       struct stat stb;
+       char isedit = *name != '%';
+       char *who = name[1] ? name + 1 : myname;

        static int shudclob;
        static int shudclob;

-       static char efile[128];

        extern char tempMesg[];
        extern char tempMesg[];

+       extern int errno;
+
+       if ((name = expand(name)) == NOSTR)
+               return -1;

 
 

-       if ((ibuf = fopen(name, "r")) == NULL)
+       if ((ibuf = Fopen(name, "r")) == NULL) {
+               if (!isedit && errno == ENOENT)
+                       goto nomail;
+               perror(name);

                return(-1);
                return(-1);

+       }
+
+       if (fstat(fileno(ibuf), &stb) < 0) {
+               perror("fstat");
+               Fclose(ibuf);
+               return (-1);
+       }
+
+       switch (stb.st_mode & S_IFMT) {
+       case S_IFDIR:
+               Fclose(ibuf);
+               errno = EISDIR;
+               perror(name);
+               return (-1);
+
+       case S_IFREG:
+               break;
+
+       default:
+               Fclose(ibuf);
+               errno = EINVAL;
+               perror(name);
+               return (-1);
+       }

 
        /*
         * Looks like all will be well.  We must now relinquish our
 
        /*
         * Looks like all will be well.  We must now relinquish our


@@ -39,12 +108,8 @@ setfile(name, isedit)
         */
 
        holdsigs();
         */
 
        holdsigs();

-       if (shudclob) {
-               if (edit)
-                       edstop();
-               else
-                       quit();
-       }
+       if (shudclob)
+               quit();

 
        /*
         * Copy the messages into /tmp
 
        /*
         * Copy the messages into /tmp


@@ -62,8 +127,7 @@ setfile(name, isedit)
        }
        shudclob = 1;
        edit = isedit;
        }
        shudclob = 1;
        edit = isedit;

-       strncpy(efile, name, 128);
-       editfile = efile;
+       strcpy(prevfile, mailname);

        if (name != mailname)
                strcpy(mailname, name);
        mailsize = fsize(ibuf);
        if (name != mailname)
                strcpy(mailname, name);
        mailsize = fsize(ibuf);


@@ -71,89 +135,72 @@ setfile(name, isedit)
                perror(tempMesg);
                exit(1);
        }
                perror(tempMesg);
                exit(1);
        }

+       (void) fcntl(fileno(otf), F_SETFD, 1);

        if ((itf = fopen(tempMesg, "r")) == NULL) {
                perror(tempMesg);
                exit(1);
        }
        if ((itf = fopen(tempMesg, "r")) == NULL) {
                perror(tempMesg);
                exit(1);
        }

-       remove(tempMesg);
+       (void) fcntl(fileno(itf), F_SETFD, 1);
+       rm(tempMesg);

        setptr(ibuf);
        setmsize(msgCount);
        setptr(ibuf);
        setmsize(msgCount);

-       fclose(ibuf);
+       Fclose(ibuf);

        relsesigs();
        sawcom = 0;
        relsesigs();
        sawcom = 0;

+       if (!edit && msgCount == 0) {
+nomail:
+               fprintf(stderr, "No mail for %s\n", who);
+               return -1;
+       }

        return(0);
 }
 
        return(0);
 }
 

+int    *msgvec;
+int    reset_on_stop;                  /* do a reset() if stopped */
+

 /*
  * Interpret user commands one by one.  If standard input is not a tty,
  * print no prompt.
  */
 /*
  * Interpret user commands one by one.  If standard input is not a tty,
  * print no prompt.
  */

-
-int    *msgvec;
-
+void

 commands()
 {
 commands()
 {

-       int eofloop, shudprompt, stop();
+       int eofloop = 0;

        register int n;
        char linebuf[LINESIZE];
        register int n;
        char linebuf[LINESIZE];

-       int hangup(), contin();
-
-# ifdef VMUNIX
-       sigset(SIGCONT, SIG_DFL);
-# endif VMUNIX
-       if (rcvmode && !sourcing) {
-               if (sigset(SIGINT, SIG_IGN) != SIG_IGN)
-                       sigset(SIGINT, stop);
-               if (sigset(SIGHUP, SIG_IGN) != SIG_IGN)
-                       sigset(SIGHUP, hangup);
+       void intr(), stop(), hangup();
+
+       if (!sourcing) {
+               if (signal(SIGINT, SIG_IGN) != SIG_IGN)
+                       signal(SIGINT, intr);
+               if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
+                       signal(SIGHUP, hangup);
+               signal(SIGTSTP, stop);
+               signal(SIGTTOU, stop);
+               signal(SIGTTIN, stop);

        }
        }

-       shudprompt = intty && !sourcing;
+       setexit();

        for (;;) {
        for (;;) {

-               setexit();
-

                /*
                 * Print the prompt, if needed.  Clear out
                 * string space, and flush the output.
                 */
                /*
                 * Print the prompt, if needed.  Clear out
                 * string space, and flush the output.
                 */

-
-               if (!rcvmode && !sourcing)
-                       return;
-               eofloop = 0;
-top:
-               if (shudprompt) {
-# ifdef VMUNIX
-                       sigset(SIGCONT, contin);
-# endif VMUNIX
+               if (!sourcing && value("interactive") != NOSTR) {
+                       reset_on_stop = 1;

                        printf(prompt);
                }
                        printf(prompt);
                }

-               flush();
+               fflush(stdout);

                sreset();
                sreset();

-

                /*
                 * Read a line of commands from the current input
                 * and handle end of file specially.
                 */
                /*
                 * Read a line of commands from the current input
                 * and handle end of file specially.
                 */

-

                n = 0;
                for (;;) {
                n = 0;
                for (;;) {

-                       if (readline(input, &linebuf[n]) <= 0) {
-                               if (n != 0)
-                                       break;
-                               if (loading)
-                                       return;
-                               if (sourcing) {
-                                       unstack();
-                                       goto more;
-                               }
-                               if (value("ignoreeof") != NOSTR && shudprompt) {
-                                       if (++eofloop < 25) {
-                                               printf("Use \"quit\" to quit.\n");
-                                               goto top;
-                                       }
-                               }
-                               if (edit)
-                                       edstop();
-                               return;
+                       if (readline(input, &linebuf[n], LINESIZE - n) < 0) {
+                               if (n == 0)
+                                       n = -1;
+                               break;

                        }
                        if ((n = strlen(linebuf)) == 0)
                                break;
                        }
                        if ((n = strlen(linebuf)) == 0)
                                break;


@@ -162,24 +209,40 @@ top:
                                break;
                        linebuf[n++] = ' ';
                }
                                break;
                        linebuf[n++] = ' ';
                }

-# ifdef VMUNIX
-               sigset(SIGCONT, SIG_DFL);
-# endif VMUNIX
+               reset_on_stop = 0;
+               if (n < 0) {
+                               /* eof */
+                       if (loading)
+                               break;
+                       if (sourcing) {
+                               unstack();
+                               continue;
+                       }
+                       if (value("interactive") != NOSTR &&
+                           value("ignoreeof") != NOSTR &&
+                           ++eofloop < 25) {
+                               printf("Use \"quit\" to quit.\n");
+                               continue;
+                       }
+                       break;
+               }
+               eofloop = 0;

                if (execute(linebuf, 0))
                if (execute(linebuf, 0))

-                       return;
-more:          ;
+                       break;

        }
 }
 
 /*
        }
 }
 
 /*

- * Execute a single command.  If the command executed
- * is "quit," then return non-zero so that the caller
- * will know to return back to main, if he cares.
+ * Execute a single command.
+ * Command functions return 0 for success, 1 for error, and -1
+ * for abort.  A 1 or -1 aborts a load or source.  A -1 aborts
+ * the interactive command loop.

  * Contxt is non-zero if called while composing mail.
  */
  * Contxt is non-zero if called while composing mail.
  */

-
+int

 execute(linebuf, contxt)
        char linebuf[];
 execute(linebuf, contxt)
        char linebuf[];

+       int contxt;

 {
        char word[LINESIZE];
        char *arglist[MAXARGC];
 {
        char word[LINESIZE];
        char *arglist[MAXARGC];


@@ -187,7 +250,7 @@ execute(linebuf, contxt)
        register char *cp, *cp2;
        register int c;
        int muvec[2];
        register char *cp, *cp2;
        register int c;
        int muvec[2];

-       int edstop(), e;
+       int e = 1;

 
        /*
         * Strip the white space away from the beginning
 
        /*
         * Strip the white space away from the beginning


@@ -198,20 +261,18 @@ execute(linebuf, contxt)
         * lexical conventions.
         */
 
         * lexical conventions.
         */
 

-       cp = linebuf;
-       while (any(*cp, " \t"))
-               cp++;
+       for (cp = linebuf; isspace(*cp); cp++)
+               ;

        if (*cp == '!') {
                if (sourcing) {
                        printf("Can't \"!\" while sourcing\n");
        if (*cp == '!') {
                if (sourcing) {
                        printf("Can't \"!\" while sourcing\n");

-                       unstack();
-                       return(0);
+                       goto out;

                }
                shell(cp+1);
                return(0);
        }
        cp2 = word;
                }
                shell(cp+1);
                return(0);
        }
        cp2 = word;

-       while (*cp && !any(*cp, " \t0123456789$^.:/-+*'\""))
+       while (*cp && index(" \t0123456789$^.:/-+*'\"", *cp) == NOSTR)

                *cp2++ = *cp++;
        *cp2 = '\0';
 
                *cp2++ = *cp++;
        *cp2 = '\0';
 


@@ -223,16 +284,12 @@ execute(linebuf, contxt)
         * confusion.
         */
 
         * confusion.
         */
 

-       if (sourcing && equal(word, ""))
+       if (sourcing && *word == '\0')

                return(0);
        com = lex(word);
        if (com == NONE) {
                printf("Unknown command: \"%s\"\n", word);
                return(0);
        com = lex(word);
        if (com == NONE) {
                printf("Unknown command: \"%s\"\n", word);

-               if (loading)
-                       return(1);
-               if (sourcing)
-                       unstack();
-               return(0);
+               goto out;

        }
 
        /*
        }
 
        /*


@@ -244,23 +301,6 @@ execute(linebuf, contxt)
                if (cond == CRCV && !rcvmode || cond == CSEND && rcvmode)
                        return(0);
 
                if (cond == CRCV && !rcvmode || cond == CSEND && rcvmode)
                        return(0);
 

-       /*
-        * Special case so that quit causes a return to
-        * main, who will call the quit code directly.
-        * If we are in a source file, just unstack.
-        */
-
-       if (com->c_func == edstop && sourcing) {
-               if (loading)
-                       return(1);
-               unstack();
-               return(0);
-       }
-       if (!edit && com->c_func == edstop) {
-               sigset(SIGINT, SIG_IGN);
-               return(1);
-       }
-

        /*
         * Process the arguments to the command, depending
         * on the type he expects.  Default to an error.
        /*
         * Process the arguments to the command, depending
         * on the type he expects.  Default to an error.


@@ -271,34 +311,22 @@ execute(linebuf, contxt)
        if (!rcvmode && (com->c_argtype & M) == 0) {
                printf("May not execute \"%s\" while sending\n",
                    com->c_name);
        if (!rcvmode && (com->c_argtype & M) == 0) {
                printf("May not execute \"%s\" while sending\n",
                    com->c_name);

-               if (loading)
-                       return(1);
-               if (sourcing)
-                       unstack();
-               return(0);
+               goto out;

        }
        if (sourcing && com->c_argtype & I) {
                printf("May not execute \"%s\" while sourcing\n",
                    com->c_name);
        }
        if (sourcing && com->c_argtype & I) {
                printf("May not execute \"%s\" while sourcing\n",
                    com->c_name);

-               if (loading)
-                       return(1);
-               unstack();
-               return(0);
+               goto out;

        }
        if (readonly && com->c_argtype & W) {
                printf("May not execute \"%s\" -- message file is read only\n",
                   com->c_name);
        }
        if (readonly && com->c_argtype & W) {
                printf("May not execute \"%s\" -- message file is read only\n",
                   com->c_name);

-               if (loading)
-                       return(1);
-               if (sourcing)
-                       unstack();
-               return(0);
+               goto out;

        }
        if (contxt && com->c_argtype & R) {
                printf("Cannot recursively invoke \"%s\"\n", com->c_name);
        }
        if (contxt && com->c_argtype & R) {
                printf("Cannot recursively invoke \"%s\"\n", com->c_name);

-               return(0);
+               goto out;

        }
        }

-       e = 1;

        switch (com->c_argtype & ~(F|P|I|M|T|W|R)) {
        case MSGLIST:
                /*
        switch (com->c_argtype & ~(F|P|I|M|T|W|R)) {
        case MSGLIST:
                /*


@@ -307,7 +335,7 @@ execute(linebuf, contxt)
                 */
                if (msgvec == 0) {
                        printf("Illegal use of \"message list\"\n");
                 */
                if (msgvec == 0) {
                        printf("Illegal use of \"message list\"\n");

-                       return(-1);
+                       break;

                }
                if ((c = getmsglist(cp, msgvec, com->c_msgflag)) < 0)
                        break;
                }
                if ((c = getmsglist(cp, msgvec, com->c_msgflag)) < 0)
                        break;


@@ -330,7 +358,7 @@ execute(linebuf, contxt)
                 */
                if (msgvec == 0) {
                        printf("Illegal use of \"message list\"\n");
                 */
                if (msgvec == 0) {
                        printf("Illegal use of \"message list\"\n");

-                       return(-1);
+                       break;

                }
                if (getmsglist(cp, msgvec, com->c_msgflag) < 0)
                        break;
                }
                if (getmsglist(cp, msgvec, com->c_msgflag) < 0)
                        break;


@@ -342,7 +370,7 @@ execute(linebuf, contxt)
                 * Just the straight string, with
                 * leading blanks removed.
                 */
                 * Just the straight string, with
                 * leading blanks removed.
                 */

-               while (any(*cp, " \t"))
+               while (isspace(*cp))

                        cp++;
                e = (*com->c_func)(cp);
                break;
                        cp++;
                e = (*com->c_func)(cp);
                break;


@@ -351,7 +379,8 @@ execute(linebuf, contxt)
                /*
                 * A vector of strings, in shell style.
                 */
                /*
                 * A vector of strings, in shell style.
                 */

-               if ((c = getrawlist(cp, arglist)) < 0)
+               if ((c = getrawlist(cp, arglist,
+                               sizeof arglist / sizeof *arglist)) < 0)

                        break;
                if (c < com->c_minargs) {
                        printf("%s requires at least %d arg(s)\n",
                        break;
                if (c < com->c_minargs) {
                        printf("%s requires at least %d arg(s)\n",


@@ -378,17 +407,20 @@ execute(linebuf, contxt)
                panic("Unknown argtype");
        }
 
                panic("Unknown argtype");
        }
 

+out:

        /*
         * Exit the current source file on
         * error.
         */
        /*
         * Exit the current source file on
         * error.
         */

-
-       if (e && loading)
-               return(1);
-       if (e && sourcing)
-               unstack();
-       if (com->c_func == edstop)
-               return(1);
+       if (e) {
+               if (e < 0)
+                       return 1;
+               if (loading)
+                       return 1;
+               if (sourcing)
+                       unstack();
+               return 0;
+       }

        if (value("autoprint") != NOSTR && com->c_argtype & P)
                if ((dot->m_flag & MDELETED) == 0) {
                        muvec[0] = dot - &message[0] + 1;
        if (value("autoprint") != NOSTR && com->c_argtype & P)
                if ((dot->m_flag & MDELETED) == 0) {
                        muvec[0] = dot - &message[0] + 1;


@@ -400,43 +432,17 @@ execute(linebuf, contxt)
        return(0);
 }
 
        return(0);
 }
 

-/*
- * When we wake up after ^Z, reprint the prompt.
- */
-contin(s)
-{
-
-       printf(prompt);
-       fflush(stdout);
-}
-
-/*
- * Branch here on hangup signal and simulate quit.
- */
-hangup()
-{
-
-       holdsigs();
-       if (edit) {
-               if (setexit())
-                       exit(0);
-               edstop();
-       }
-       else
-               quit();
-       exit(0);
-}
-

 /*
  * Set the size of the message vector used to construct argument
  * lists to message list functions.
  */
 /*
  * Set the size of the message vector used to construct argument
  * lists to message list functions.
  */

- 
+void

 setmsize(sz)
 setmsize(sz)

+       int sz;

 {
 
 {
 

-       if (msgvec != (int *) 0)
-               cfree(msgvec);
+       if (msgvec != 0)
+               free((char *) msgvec);

        msgvec = (int *) calloc((unsigned) (sz + 1), sizeof *msgvec);
 }
 
        msgvec = (int *) calloc((unsigned) (sz + 1), sizeof *msgvec);
 }
 


@@ -462,7 +468,7 @@ lex(word)
  * Determine if as1 is a valid prefix of as2.
  * Return true if yep.
  */
  * Determine if as1 is a valid prefix of as2.
  * Return true if yep.
  */

-
+int

 isprefix(as1, as2)
        char *as1, *as2;
 {
 isprefix(as1, as2)
        char *as1, *as2;
 {


@@ -477,78 +483,84 @@ isprefix(as1, as2)
 }
 
 /*
 }
 
 /*

- * The following gets called on receipt of a rubout.  This is
+ * The following gets called on receipt of an interrupt.  This is

  * to abort printout of a command, mainly.
  * Dispatching here when command() is inactive crashes rcv.
  * Close all open files except 0, 1, 2, and the temporary.
  * to abort printout of a command, mainly.
  * Dispatching here when command() is inactive crashes rcv.
  * Close all open files except 0, 1, 2, and the temporary.

- * The special call to getuserid() is needed so it won't get
- * annoyed about losing its open file.

  * Also, unstack all source files.
  */
 
 int    inithdr;                        /* am printing startup headers */
 
  * Also, unstack all source files.
  */
 
 int    inithdr;                        /* am printing startup headers */
 

-stop(s)
+/*ARGSUSED*/
+void
+intr(s)
+       int s;

 {
 {

-       register FILE *fp;

 
 

-# ifndef VMUNIX
-       s = SIGINT;
-# endif VMUNIX

        noreset = 0;
        if (!inithdr)
                sawcom++;
        inithdr = 0;
        while (sourcing)
                unstack();
        noreset = 0;
        if (!inithdr)
                sawcom++;
        inithdr = 0;
        while (sourcing)
                unstack();

-       getuserid((char *) -1);
-       for (fp = &_iob[0]; fp < &_iob[_NFILE]; fp++) {
-               if (fp == stdin || fp == stdout)
-                       continue;
-               if (fp == itf || fp == otf)
-                       continue;
-               if (fp == stderr)
-                       continue;
-               if (fp == pipef) {
-                       pclose(pipef);
-                       pipef = NULL;
-                       continue;
-               }
-               fclose(fp);
-       }
+
+       close_all_files();
+

        if (image >= 0) {
                close(image);
                image = -1;
        }
        if (image >= 0) {
                close(image);
                image = -1;
        }

-       clrbuf(stdout);
-       printf("Interrupt\n");
-# ifdef VMUNIX
-       sigrelse(s);
-# else
-       signal(s, stop);
-# endif
+       fprintf(stderr, "Interrupt\n");

        reset(0);
 }
 
 /*
        reset(0);
 }
 
 /*

- * Announce the presence of the current Mail version,
- * give the message count, and print a header listing.
+ * When we wake up after ^Z, reprint the prompt.
+ */
+void
+stop(s)
+       int s;
+{
+       sig_t old_action = signal(s, SIG_DFL);
+
+       sigsetmask(sigblock(0) & ~sigmask(s));
+       kill(0, s);
+       sigblock(sigmask(s));
+       signal(s, old_action);
+       if (reset_on_stop) {
+               reset_on_stop = 0;
+               reset(0);
+       }
+}
+
+/*
+ * Branch here on hangup signal and simulate "exit".

  */
  */

+/*ARGSUSED*/
+void
+hangup(s)
+       int s;
+{

 
 

-char   *greeting       = "Mail version %s.  Type ? for help.\n";
+       /* nothing to do? */
+       exit(1);
+}

 
 

-announce(pr)
+/*
+ * Announce the presence of the current Mail version,
+ * give the message count, and print a header listing.
+ */
+void
+announce()

 {
        int vec[2], mdot;
 {
        int vec[2], mdot;

-       extern char *version;

 
 

-       if (pr && value("quiet") == NOSTR)
-               printf(greeting, version);

        mdot = newfileinfo();
        vec[0] = mdot;
        vec[1] = 0;
        dot = &message[mdot - 1];
        mdot = newfileinfo();
        vec[0] = mdot;
        vec[1] = 0;
        dot = &message[mdot - 1];

-       if (msgCount > 0 && !noheader) {
+       if (msgCount > 0 && value("noheader") == NOSTR) {

                inithdr++;
                headers(vec);
                inithdr = 0;
                inithdr++;
                headers(vec);
                inithdr = 0;


@@ -559,6 +571,7 @@ announce(pr)
  * Announce information about the file we are editing.
  * Return a likely place to set dot.
  */
  * Announce information about the file we are editing.
  * Return a likely place to set dot.
  */

+int

 newfileinfo()
 {
        register struct message *mp;
 newfileinfo()
 {
        register struct message *mp;


@@ -614,14 +627,17 @@ newfileinfo()
        return(mdot);
 }
 
        return(mdot);
 }
 

-strace() {}
-

 /*
  * Print the current version number.
  */
 
 /*
  * Print the current version number.
  */
 

+/*ARGSUSED*/
+int

 pversion(e)
 pversion(e)

+       int e;

 {
 {

+       extern char *version;
+

        printf("Version %s\n", version);
        return(0);
 }
        printf("Version %s\n", version);
        return(0);
 }


@@ -629,12 +645,13 @@ pversion(e)
 /*
  * Load a file of user definitions.
  */
 /*
  * Load a file of user definitions.
  */

+void

 load(name)
        char *name;
 {
        register FILE *in, *oldin;
 
 load(name)
        char *name;
 {
        register FILE *in, *oldin;
 

-       if ((in = fopen(name, "r")) == NULL)
+       if ((in = Fopen(name, "r")) == NULL)

                return;
        oldin = input;
        input = in;
                return;
        oldin = input;
        input = in;


@@ -644,5 +661,5 @@ load(name)
        loading = 0;
        sourcing = 0;
        input = oldin;
        loading = 0;
        sourcing = 0;
        input = oldin;

-       fclose(in);
+       Fclose(in);

 }
 }