[src/netbsd-1-5]: src/bin/sh Pullup 1.31 [hubertf]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ccde596b03cc
branches:  netbsd-1-5
changeset: 490109:ccde596b03cc
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Nov 03 02:36:20 2000 +0000

description:
Pullup 1.31 [hubertf]:
Fixes bug in 'type' command WRT slashes.

diffstat:

 bin/sh/exec.c |  29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diffs (61 lines):

diff -r e2cb9d6b8919 -r ccde596b03cc bin/sh/exec.c
--- a/bin/sh/exec.c     Fri Nov 03 02:36:06 2000 +0000
+++ b/bin/sh/exec.c     Fri Nov 03 02:36:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exec.c,v 1.29 2000/05/22 10:18:46 elric Exp $  */
+/*     $NetBSD: exec.c,v 1.29.4.1 2000/11/03 02:36:20 tv Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)exec.c     8.4 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: exec.c,v 1.29 2000/05/22 10:18:46 elric Exp $");
+__RCSID("$NetBSD: exec.c,v 1.29.4.1 2000/11/03 02:36:20 tv Exp $");
 #endif
 #endif /* not lint */
 
@@ -911,20 +911,23 @@
 
                switch (entry.cmdtype) {
                case CMDNORMAL: {
-                       int j = entry.u.index;
-                       const char *path = pathval();
-                       char *name;
-                       if (j == -1) 
-                               name = argv[i];
-                       else {
-                               do { 
+                       if (strchr(argv[i], '/') == NULL) {
+                               const char *path = pathval();
+                               char *name;
+                               int j = entry.u.index;
+                               do {
                                        name = padvance(&path, argv[i]);
                                        stunalloc(name);
                                } while (--j >= 0);
+                               out1fmt(" is%s %s\n",
+                                   cmdp ? " a tracked alias for" : "", name);
+                       } else {
+                               if (access(argv[i], X_OK) == 0)
+                                       out1fmt(" is %s\n", argv[i]);
+                               else
+                                       out1fmt(": %s\n", strerror(errno));
                        }
-                       out1fmt(" is%s %s\n",
-                           cmdp ? " a tracked alias for" : "", name);
-                       break;
+                       break;
                }
                case CMDFUNCTION:
                        out1str(" is a shell function\n");
@@ -935,7 +938,7 @@
                        break;
 
                default:
-                       out1str(" not found\n");
+                       out1str(": not found\n");
                        err |= 127;
                        break;
                }