file reorg, pathnames.h, paths.h

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

diff --git a/usr/src/usr.bin/mail/cmd1.c b/usr/src/usr.bin/mail/cmd1.c
index 5878f61..7f1af26 100644 (file)
--- a/usr/src/usr.bin/mail/cmd1.c
+++ b/usr/src/usr.bin/mail/cmd1.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)cmd1.c     5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)cmd1.c     5.19 (Berkeley) %G%";

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


@@ -291,7 +291,7 @@ type1(msgvec, doign, page)
                if (page || nlines > (*cp ? atoi(cp) : realscreenheight)) {
                        cp = value("PAGER");
                        if (cp == NULL || *cp == '\0')
                if (page || nlines > (*cp ? atoi(cp) : realscreenheight)) {
                        cp = value("PAGER");
                        if (cp == NULL || *cp == '\0')

-                               cp = MORE;
+                               cp = _PATH_MORE;

                        obuf = Popen(cp, "w");
                        if (obuf == NULL) {
                                perror(cp);
                        obuf = Popen(cp, "w");
                        if (obuf == NULL) {
                                perror(cp);


@@ -415,7 +415,7 @@ folders()
 
        if (getfold(dirname) < 0) {
                printf("No value set for \"folder\"\n");
 
        if (getfold(dirname) < 0) {
                printf("No value set for \"folder\"\n");

-               return -1;
+               return 1;

        }
        if ((cmd = value("LISTER")) == NOSTR)
                cmd = "ls";
        }
        if ((cmd = value("LISTER")) == NOSTR)
                cmd = "ls";