use shell="" instead of shell=none for no shell,

use SHELL instead of "/bin/csh"

SCCS-vsn: usr.bin/mail/popen.c 5.7

diff --git a/usr/src/usr.bin/mail/popen.c b/usr/src/usr.bin/mail/popen.c
index 07b95c1..f4cafa8 100644 (file)
--- a/usr/src/usr.bin/mail/popen.c
+++ b/usr/src/usr.bin/mail/popen.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef notdef
  */
 
 #ifdef notdef

-static char sccsid[] = "@(#)popen.c    5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)popen.c    5.7 (Berkeley) %G%";

 #endif /* notdef */
 
 #include "rcv.h"
 #endif /* notdef */
 
 #include "rcv.h"


@@ -38,10 +38,10 @@ char        *mode;
 
        doshell = 1;
        if ((shell = value("shell")) || (shell = value("SHELL"))) {
 
        doshell = 1;
        if ((shell = value("shell")) || (shell = value("SHELL"))) {

-               if (!strcmp(shell, "none"))
+               if (!*shell)

                        doshell = 0;
        } else
                        doshell = 0;
        } else

-               shell = "/bin/csh";
+               shell = SHELL;

        if (pipe(p) < 0)
                return NULL;
        myside = tst(p[WTR], p[RDR]);
        if (pipe(p) < 0)
                return NULL;
        myside = tst(p[WTR], p[RDR]);