BSD 4_3_Reno release

[unix-history] / usr / src / bin / csh / sh.exec.c

diff --git a/usr/src/bin/csh/sh.exec.c b/usr/src/bin/csh/sh.exec.c
index 6b26876..0415414 100644 (file)
--- a/usr/src/bin/csh/sh.exec.c
+++ b/usr/src/bin/csh/sh.exec.c
@@ -5,11 +5,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char *sccsid = "@(#)sh.exec.c   5.4 (Berkeley) 5/19/88";
+static char *sccsid = "@(#)sh.exec.c   5.7 (Berkeley) 5/27/90";

 #endif
 
 #include "sh.h"
 #include <sys/dir.h>
 #endif
 
 #include "sh.h"
 #include <sys/dir.h>

+#include <string.h>
+#include "pathnames.h"

 
 /*
  * C shell
 
 /*
  * C shell


@@ -195,7 +197,6 @@ texec(f, t)
 {
        register struct varent *v;
        register char **vp;
 {
        register struct varent *v;
        register char **vp;

-       extern char *sys_errlist[];

        char *lastsh[2];
 
        execv(f, t);
        char *lastsh[2];
 
        execv(f, t);


@@ -210,19 +211,15 @@ texec(f, t)
                 */
                v = adrof1("shell", &aliases);
                if (v == 0) {
                 */
                v = adrof1("shell", &aliases);
                if (v == 0) {

-#ifdef OTHERSH

                        register int ff = open(f, 0);
                        char ch;
                        register int ff = open(f, 0);
                        char ch;

-#endif

 
                        vp = lastsh;
 
                        vp = lastsh;

-                       vp[0] = adrof("shell") ? value("shell") : SHELLPATH;
+                       vp[0] = adrof("shell") ? value("shell") : _PATH_CSHELL;

                        vp[1] = (char *) NULL;
                        vp[1] = (char *) NULL;

-#ifdef OTHERSH

                        if (ff != -1 && read(ff, &ch, 1) == 1 && ch != '#')
                        if (ff != -1 && read(ff, &ch, 1) == 1 && ch != '#')

-                               vp[0] = OTHERSH;
+                               vp[0] = _PATH_BSHELL;

                        (void) close(ff);
                        (void) close(ff);

-#endif

                } else
                        vp = v->vec;
                t[0] = f;
                } else
                        vp = v->vec;
                t[0] = f;


@@ -240,7 +237,7 @@ texec(f, t)
 
        default:
                if (exerr == 0) {
 
        default:
                if (exerr == 0) {

-                       exerr = sys_errlist[errno];
+                       exerr = strerror(errno);

                        expath = savestr(f);
                }
        }
                        expath = savestr(f);
                }
        }