changed newfileinfo() to print the number of deleted

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

diff --git a/usr/src/usr.bin/mail/cmd3.c b/usr/src/usr.bin/mail/cmd3.c
index 9d552fc..39f19b3 100644 (file)
--- a/usr/src/usr.bin/mail/cmd3.c
+++ b/usr/src/usr.bin/mail/cmd3.c
@@ -9,7 +9,7 @@
  * Still more user commands.
  */
 
  * Still more user commands.
  */
 

-static char *SccsId = "@(#)cmd3.c      2.4 %G%";
+static char *SccsId = "@(#)cmd3.c      2.6 %G%";

 
 /*
  * Process a shell escape by saving signals, ignoring signals,
 
 /*
  * Process a shell escape by saving signals, ignoring signals,


@@ -530,6 +530,7 @@ file(argv)
 {
        register char *cp;
        char fname[BUFSIZ];
 {
        register char *cp;
        char fname[BUFSIZ];

+       int edit;

 
        if (argv[0] == NOSTR) {
                newfileinfo();
 
        if (argv[0] == NOSTR) {
                newfileinfo();


@@ -546,10 +547,12 @@ file(argv)
         *      string -- reads the given file
         */
 
         *      string -- reads the given file
         */
 

-       cp = getfilename(argv[0]);
+       cp = getfilename(argv[0], &edit);

        if (cp == NOSTR)
                return(-1);
        if (cp == NOSTR)
                return(-1);

-       return(setfile(cp, 1));
+       if (setfile(cp, edit))
+               return(-1);
+       newfileinfo();

 }
 
 /*
 }
 
 /*


@@ -566,15 +569,22 @@ file(argv)
 char   prevfile[PATHSIZE];
 
 char *
 char   prevfile[PATHSIZE];
 
 char *

-getfilename(name)
+getfilename(name, aedit)

        char *name;
        char *name;

+       int *aedit;

 {
        register char *cp;
        char savename[BUFSIZ];
        char oldmailname[BUFSIZ];
 
 {
        register char *cp;
        char savename[BUFSIZ];
        char oldmailname[BUFSIZ];
 

+       /*
+        * Assume we will be in "edit file" mode, until
+        * proven wrong.
+        */
+       *aedit = 1;

        switch (*name) {
        case '%':
        switch (*name) {
        case '%':

+               *aedit = 0;

                strcpy(prevfile, mailname);
                if (name[1] != 0) {
                        strcpy(savename, myname);
                strcpy(prevfile, mailname);
                if (name[1] != 0) {
                        strcpy(savename, myname);