Home | History | Annotate | Line # | Download | only in csh
dir.c revision 1.18
      1  1.18     lukem /* $NetBSD: dir.c,v 1.18 2001/11/03 13:35:39 lukem Exp $ */
      2   1.9       cgd 
      3   1.1       cgd /*-
      4   1.7   mycroft  * Copyright (c) 1980, 1991, 1993
      5   1.7   mycroft  *	The Regents of the University of California.  All rights reserved.
      6   1.1       cgd  *
      7   1.1       cgd  * Redistribution and use in source and binary forms, with or without
      8   1.1       cgd  * modification, are permitted provided that the following conditions
      9   1.1       cgd  * are met:
     10   1.1       cgd  * 1. Redistributions of source code must retain the above copyright
     11   1.1       cgd  *    notice, this list of conditions and the following disclaimer.
     12   1.1       cgd  * 2. Redistributions in binary form must reproduce the above copyright
     13   1.1       cgd  *    notice, this list of conditions and the following disclaimer in the
     14   1.1       cgd  *    documentation and/or other materials provided with the distribution.
     15   1.1       cgd  * 3. All advertising materials mentioning features or use of this software
     16   1.1       cgd  *    must display the following acknowledgement:
     17   1.1       cgd  *	This product includes software developed by the University of
     18   1.1       cgd  *	California, Berkeley and its contributors.
     19   1.1       cgd  * 4. Neither the name of the University nor the names of its contributors
     20   1.1       cgd  *    may be used to endorse or promote products derived from this software
     21   1.1       cgd  *    without specific prior written permission.
     22   1.1       cgd  *
     23   1.1       cgd  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
     24   1.1       cgd  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     25   1.1       cgd  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     26   1.1       cgd  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
     27   1.1       cgd  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
     28   1.1       cgd  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
     29   1.1       cgd  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
     30   1.1       cgd  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
     31   1.1       cgd  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
     32   1.1       cgd  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     33   1.1       cgd  * SUCH DAMAGE.
     34   1.1       cgd  */
     35   1.1       cgd 
     36  1.11  christos #include <sys/cdefs.h>
     37   1.1       cgd #ifndef lint
     38   1.9       cgd #if 0
     39   1.9       cgd static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
     40   1.9       cgd #else
     41  1.18     lukem __RCSID("$NetBSD: dir.c,v 1.18 2001/11/03 13:35:39 lukem Exp $");
     42   1.9       cgd #endif
     43   1.1       cgd #endif /* not lint */
     44   1.1       cgd 
     45   1.1       cgd #include <sys/param.h>
     46   1.1       cgd #include <sys/stat.h>
     47  1.17       wiz 
     48   1.1       cgd #include <errno.h>
     49   1.1       cgd #include <stdlib.h>
     50   1.1       cgd #include <string.h>
     51   1.1       cgd #include <unistd.h>
     52  1.17       wiz 
     53   1.1       cgd #if __STDC__
     54   1.1       cgd # include <stdarg.h>
     55   1.1       cgd #else
     56   1.1       cgd # include <varargs.h>
     57   1.1       cgd #endif
     58   1.1       cgd 
     59   1.1       cgd #include "csh.h"
     60   1.1       cgd #include "dir.h"
     61   1.1       cgd #include "extern.h"
     62   1.1       cgd 
     63   1.1       cgd /* Directory management. */
     64   1.1       cgd 
     65  1.17       wiz static struct directory *dfind(Char *);
     66  1.17       wiz static Char *dfollow(Char *);
     67  1.17       wiz static void printdirs(void);
     68  1.17       wiz static Char *dgoto(Char *);
     69  1.17       wiz static void skipargs(Char ***, char *);
     70  1.17       wiz static void dnewcwd(struct directory *);
     71  1.17       wiz static void dset(Char *);
     72   1.1       cgd 
     73   1.1       cgd struct directory dhead;		/* "head" of loop */
     74  1.17       wiz int printd;			/* force name to be printed */
     75   1.1       cgd 
     76   1.1       cgd static int dirflag = 0;
     77   1.1       cgd 
     78   1.1       cgd /*
     79   1.1       cgd  * dinit - initialize current working directory
     80   1.1       cgd  */
     81   1.1       cgd void
     82  1.17       wiz dinit(Char *hp)
     83   1.1       cgd {
     84  1.17       wiz     static const char emsg[] = "csh: Trying to start from \"%s\"\n";
     85  1.17       wiz     char path[MAXPATHLEN];
     86  1.17       wiz     struct directory *dp;
     87  1.12   mycroft     const char *ecp;
     88  1.10       tls     Char *cp;
     89   1.1       cgd 
     90   1.1       cgd     /* Don't believe the login shell home, because it may be a symlink */
     91  1.12   mycroft     ecp = getcwd(path, MAXPATHLEN);
     92  1.12   mycroft     if (ecp == NULL || *ecp == '\0') {
     93  1.17       wiz 	(void)fprintf(csherr, "csh: %s\n", strerror(errno));
     94   1.1       cgd 	if (hp && *hp) {
     95  1.12   mycroft 	    ecp = short2str(hp);
     96  1.12   mycroft 	    if (chdir(ecp) == -1)
     97   1.1       cgd 		cp = NULL;
     98   1.1       cgd 	    else
     99   1.1       cgd 		cp = hp;
    100  1.17       wiz 	    (void)fprintf(csherr, emsg, vis_str(hp));
    101   1.1       cgd 	}
    102   1.1       cgd 	else
    103   1.1       cgd 	    cp = NULL;
    104   1.1       cgd 	if (cp == NULL) {
    105  1.17       wiz 	    (void)fprintf(csherr, emsg, "/");
    106  1.13   mycroft 	    if (chdir("/") == -1) {
    107   1.1       cgd 		/* I am not even try to print an error message! */
    108   1.1       cgd 		xexit(1);
    109  1.13   mycroft 	    }
    110   1.1       cgd 	    cp = SAVE("/");
    111   1.1       cgd 	}
    112   1.1       cgd     }
    113   1.1       cgd     else {
    114   1.1       cgd 	struct stat swd, shp;
    115   1.1       cgd 
    116   1.1       cgd 	/*
    117   1.1       cgd 	 * See if $HOME is the working directory we got and use that
    118   1.1       cgd 	 */
    119   1.1       cgd 	if (hp && *hp &&
    120  1.12   mycroft 	    stat(ecp, &swd) != -1 && stat(short2str(hp), &shp) != -1 &&
    121   1.1       cgd 	    swd.st_dev == shp.st_dev && swd.st_ino == shp.st_ino)
    122   1.1       cgd 	    cp = hp;
    123   1.1       cgd 	else {
    124  1.12   mycroft 	    const char *cwd;
    125   1.1       cgd 
    126   1.1       cgd 	    /*
    127   1.1       cgd 	     * use PWD if we have it (for subshells)
    128   1.1       cgd 	     */
    129   1.7   mycroft 	    if ((cwd = getenv("PWD")) != NULL) {
    130   1.1       cgd 		if (stat(cwd, &shp) != -1 && swd.st_dev == shp.st_dev &&
    131   1.1       cgd 		    swd.st_ino == shp.st_ino)
    132  1.12   mycroft 		    ecp = cwd;
    133   1.1       cgd 	    }
    134  1.12   mycroft 	    cp = dcanon(SAVE(ecp), STRNULL);
    135   1.1       cgd 	}
    136   1.1       cgd     }
    137   1.1       cgd 
    138  1.17       wiz     dp = (struct directory *)xcalloc(sizeof(struct directory), 1);
    139   1.1       cgd     dp->di_name = Strsave(cp);
    140   1.1       cgd     dp->di_count = 0;
    141   1.1       cgd     dhead.di_next = dhead.di_prev = dp;
    142   1.1       cgd     dp->di_next = dp->di_prev = &dhead;
    143   1.1       cgd     printd = 0;
    144   1.1       cgd     dnewcwd(dp);
    145   1.1       cgd }
    146   1.1       cgd 
    147   1.1       cgd static void
    148  1.17       wiz dset(Char *dp)
    149   1.1       cgd {
    150  1.17       wiz     Char **vec;
    151  1.17       wiz 
    152   1.1       cgd     /*
    153   1.1       cgd      * Don't call set() directly cause if the directory contains ` or
    154   1.7   mycroft      * other junk characters glob will fail.
    155   1.1       cgd      */
    156   1.1       cgd 
    157  1.17       wiz     vec = (Char **)xmalloc((size_t)(2 * sizeof(Char **)));
    158   1.1       cgd     vec[0] = Strsave(dp);
    159   1.1       cgd     vec[1] = 0;
    160   1.1       cgd     setq(STRcwd, vec, &shvhed);
    161   1.1       cgd     Setenv(STRPWD, dp);
    162   1.1       cgd }
    163   1.1       cgd 
    164   1.1       cgd #define DIR_LONG 1
    165   1.1       cgd #define DIR_VERT 2
    166   1.1       cgd #define DIR_LINE 4
    167   1.1       cgd 
    168   1.1       cgd static void
    169  1.17       wiz skipargs(Char ***v, char *str)
    170   1.1       cgd {
    171  1.17       wiz     Char  **n, *s;
    172   1.1       cgd 
    173  1.17       wiz     n = *v;
    174   1.1       cgd     dirflag = 0;
    175   1.1       cgd     for (n++; *n != NULL && (*n)[0] == '-'; n++)
    176   1.1       cgd 	for (s = &((*n)[1]); *s; s++)
    177   1.1       cgd 	    switch (*s) {
    178   1.1       cgd 	    case 'l':
    179   1.1       cgd 		dirflag |= DIR_LONG;
    180   1.1       cgd 		break;
    181  1.17       wiz 	    case 'n':
    182  1.17       wiz 		dirflag |= DIR_LINE;
    183  1.17       wiz 		break;
    184   1.1       cgd 	    case 'v':
    185   1.1       cgd 		dirflag |= DIR_VERT;
    186   1.1       cgd 		break;
    187   1.1       cgd 	    default:
    188   1.7   mycroft 		stderror(ERR_DIRUS, vis_str(**v), str);
    189  1.13   mycroft 		/* NOTREACHED */
    190   1.1       cgd 	    }
    191   1.1       cgd     *v = n;
    192   1.1       cgd }
    193   1.1       cgd 
    194   1.1       cgd /*
    195   1.1       cgd  * dodirs - list all directories in directory loop
    196   1.1       cgd  */
    197   1.1       cgd void
    198   1.7   mycroft /*ARGSUSED*/
    199  1.17       wiz dodirs(Char **v, struct command *t)
    200   1.1       cgd {
    201   1.1       cgd     skipargs(&v, "");
    202   1.1       cgd 
    203  1.14   mycroft     if (*v != NULL)
    204   1.1       cgd 	stderror(ERR_DIRUS, "dirs", "");
    205   1.1       cgd     printdirs();
    206   1.1       cgd }
    207   1.1       cgd 
    208   1.1       cgd static void
    209  1.17       wiz printdirs(void)
    210   1.1       cgd {
    211  1.10       tls     struct directory *dp;
    212  1.17       wiz     Char *hp, *s;
    213  1.17       wiz     int cur, idx, len;
    214   1.1       cgd 
    215  1.17       wiz     hp = value(STRhome);
    216   1.1       cgd     if (*hp == '\0')
    217   1.1       cgd 	hp = NULL;
    218   1.1       cgd     dp = dcwd;
    219   1.1       cgd     idx = 0;
    220   1.1       cgd     cur = 0;
    221   1.1       cgd     do {
    222   1.1       cgd 	if (dp == &dhead)
    223   1.1       cgd 	    continue;
    224   1.1       cgd 	if (dirflag & DIR_VERT) {
    225  1.17       wiz 	    (void)fprintf(cshout, "%d\t", idx++);
    226   1.1       cgd 	    cur = 0;
    227   1.1       cgd 	}
    228   1.1       cgd 	if (!(dirflag & DIR_LONG) && hp != NULL && !eq(hp, STRslash) &&
    229   1.7   mycroft 	    (len = Strlen(hp), Strncmp(hp, dp->di_name, len) == 0) &&
    230   1.7   mycroft 	    (dp->di_name[len] == '\0' || dp->di_name[len] == '/'))
    231   1.7   mycroft 	    len = Strlen(s = (dp->di_name + len)) + 2;
    232   1.1       cgd 	else
    233   1.1       cgd 	    len = Strlen(s = dp->di_name) + 1;
    234   1.1       cgd 
    235   1.1       cgd 	cur += len;
    236   1.1       cgd 	if ((dirflag & DIR_LINE) && cur >= 80 - 1 && len < 80) {
    237  1.17       wiz 	    (void)fprintf(cshout, "\n");
    238   1.1       cgd 	    cur = len;
    239   1.1       cgd 	}
    240  1.16        is 	(void) fprintf(cshout, "%s%s%c", (s != dp->di_name)? "~" : "",
    241  1.16        is 	    vis_str(s), (dirflag & DIR_VERT) ? '\n' : ' ');
    242   1.1       cgd     } while ((dp = dp->di_prev) != dcwd);
    243   1.1       cgd     if (!(dirflag & DIR_VERT))
    244  1.17       wiz 	(void)fprintf(cshout, "\n");
    245   1.1       cgd }
    246   1.1       cgd 
    247   1.1       cgd void
    248  1.17       wiz dtildepr(Char *home, Char *dir)
    249   1.1       cgd {
    250   1.1       cgd     if (!eq(home, STRslash) && prefix(home, dir))
    251  1.17       wiz 	(void)fprintf(cshout, "~%s", vis_str(dir + Strlen(home)));
    252   1.1       cgd     else
    253  1.17       wiz 	(void)fprintf(cshout, "%s", vis_str(dir));
    254   1.1       cgd }
    255   1.1       cgd 
    256   1.1       cgd void
    257  1.17       wiz dtilde(void)
    258   1.1       cgd {
    259  1.17       wiz     struct directory *d;
    260   1.1       cgd 
    261  1.17       wiz     d = dcwd;
    262   1.1       cgd     do {
    263   1.1       cgd 	if (d == &dhead)
    264   1.1       cgd 	    continue;
    265   1.1       cgd 	d->di_name = dcanon(d->di_name, STRNULL);
    266   1.1       cgd     } while ((d = d->di_prev) != dcwd);
    267   1.1       cgd 
    268   1.1       cgd     dset(dcwd->di_name);
    269   1.1       cgd }
    270   1.1       cgd 
    271   1.1       cgd 
    272   1.1       cgd /* dnormalize():
    273   1.1       cgd  *	If the name starts with . or .. then we might need to normalize
    274   1.1       cgd  *	it depending on the symbolic link flags
    275   1.1       cgd  */
    276  1.17       wiz Char *
    277  1.17       wiz dnormalize(Char *cp)
    278   1.1       cgd {
    279   1.1       cgd #define UC (unsigned char)
    280   1.1       cgd #define ISDOT(c) (UC(c)[0] == '.' && ((UC(c)[1] == '\0') || (UC(c)[1] == '/')))
    281   1.1       cgd #define ISDOTDOT(c) (UC(c)[0] == '.' && ISDOT(&((c)[1])))
    282   1.1       cgd     if ((unsigned char) cp[0] == '/')
    283   1.1       cgd 	return (Strsave(cp));
    284   1.1       cgd 
    285   1.1       cgd     if (adrof(STRignore_symlinks)) {
    286   1.1       cgd 	int     dotdot = 0;
    287   1.1       cgd 	Char   *dp, *cwd;
    288   1.1       cgd 
    289  1.17       wiz 	cwd = (Char *)xmalloc((size_t)((Strlen(dcwd->di_name) + 3) *
    290  1.17       wiz 	    sizeof(Char)));
    291  1.17       wiz 	(void)Strcpy(cwd, dcwd->di_name);
    292   1.1       cgd 
    293   1.1       cgd 	/*
    294   1.1       cgd 	 * Ignore . and count ..'s
    295   1.1       cgd 	 */
    296   1.1       cgd 	while (*cp) {
    297   1.1       cgd 	    if (ISDOT(cp)) {
    298   1.1       cgd 		if (*++cp)
    299   1.1       cgd 		    cp++;
    300   1.1       cgd 	    }
    301   1.1       cgd 	    else if (ISDOTDOT(cp)) {
    302   1.1       cgd 		dotdot++;
    303   1.1       cgd 		cp += 2;
    304   1.1       cgd 		if (*cp)
    305   1.1       cgd 		    cp++;
    306   1.1       cgd 	    }
    307   1.1       cgd 	    else
    308   1.1       cgd 		break;
    309   1.1       cgd 	}
    310  1.13   mycroft 	while (dotdot > 0) {
    311  1.13   mycroft 	    dp = Strrchr(cwd, '/');
    312  1.13   mycroft 	    if (dp) {
    313   1.1       cgd 		*dp = '\0';
    314   1.1       cgd 		dotdot--;
    315   1.1       cgd 	    }
    316   1.1       cgd 	    else
    317   1.1       cgd 		break;
    318  1.13   mycroft 	}
    319   1.1       cgd 
    320   1.1       cgd 	if (*cp) {
    321   1.1       cgd 	    cwd[dotdot = Strlen(cwd)] = '/';
    322   1.1       cgd 	    cwd[dotdot + 1] = '\0';
    323   1.1       cgd 	    dp = Strspl(cwd, cp);
    324   1.1       cgd 	    xfree((ptr_t) cwd);
    325   1.1       cgd 	    return dp;
    326   1.1       cgd 	}
    327   1.1       cgd 	else {
    328   1.1       cgd 	    if (!*cwd) {
    329   1.1       cgd 		cwd[0] = '/';
    330   1.1       cgd 		cwd[1] = '\0';
    331   1.1       cgd 	    }
    332   1.1       cgd 	    return cwd;
    333   1.1       cgd 	}
    334   1.1       cgd     }
    335   1.1       cgd     return Strsave(cp);
    336   1.1       cgd }
    337   1.1       cgd 
    338   1.1       cgd /*
    339   1.1       cgd  * dochngd - implement chdir command.
    340   1.1       cgd  */
    341   1.1       cgd void
    342   1.7   mycroft /*ARGSUSED*/
    343  1.17       wiz dochngd(Char **v, struct command *t)
    344   1.1       cgd {
    345  1.17       wiz     struct directory *dp;
    346  1.10       tls     Char *cp;
    347   1.1       cgd 
    348   1.1       cgd     skipargs(&v, " [<dir>]");
    349   1.1       cgd     printd = 0;
    350   1.1       cgd     if (*v == NULL) {
    351  1.14   mycroft 	if ((cp = value(STRhome)) == NULL || *cp == 0)
    352   1.1       cgd 	    stderror(ERR_NAME | ERR_NOHOMEDIR);
    353  1.14   mycroft 	if (chdir(short2str(cp)) < 0)
    354   1.1       cgd 	    stderror(ERR_NAME | ERR_CANTCHANGE);
    355   1.1       cgd 	cp = Strsave(cp);
    356   1.1       cgd     }
    357  1.14   mycroft     else if (v[1] != NULL)
    358   1.1       cgd 	stderror(ERR_NAME | ERR_TOOMANY);
    359   1.1       cgd     else if ((dp = dfind(*v)) != 0) {
    360   1.1       cgd 	char   *tmp;
    361   1.1       cgd 
    362   1.1       cgd 	printd = 1;
    363  1.14   mycroft 	if (chdir(tmp = short2str(dp->di_name)) < 0)
    364   1.1       cgd 	    stderror(ERR_SYSTEM, tmp, strerror(errno));
    365   1.1       cgd 	dcwd->di_prev->di_next = dcwd->di_next;
    366   1.1       cgd 	dcwd->di_next->di_prev = dcwd->di_prev;
    367   1.1       cgd 	dfree(dcwd);
    368   1.1       cgd 	dnewcwd(dp);
    369   1.1       cgd 	return;
    370   1.1       cgd     }
    371   1.1       cgd     else
    372   1.1       cgd 	cp = dfollow(*v);
    373  1.17       wiz     dp = (struct directory *)xcalloc(sizeof(struct directory), 1);
    374   1.1       cgd     dp->di_name = cp;
    375   1.1       cgd     dp->di_count = 0;
    376   1.1       cgd     dp->di_next = dcwd->di_next;
    377   1.1       cgd     dp->di_prev = dcwd->di_prev;
    378   1.1       cgd     dp->di_prev->di_next = dp;
    379   1.1       cgd     dp->di_next->di_prev = dp;
    380   1.1       cgd     dfree(dcwd);
    381   1.1       cgd     dnewcwd(dp);
    382   1.1       cgd }
    383   1.1       cgd 
    384   1.1       cgd static Char *
    385  1.17       wiz dgoto(Char *cp)
    386   1.1       cgd {
    387  1.17       wiz     Char *dp;
    388   1.1       cgd 
    389   1.1       cgd     if (*cp != '/') {
    390  1.10       tls 	Char *p, *q;
    391  1.17       wiz 	int cwdlen;
    392   1.1       cgd 
    393   1.7   mycroft 	for (p = dcwd->di_name; *p++;)
    394   1.7   mycroft 	    continue;
    395   1.1       cgd 	if ((cwdlen = p - dcwd->di_name - 1) == 1)	/* root */
    396   1.1       cgd 	    cwdlen = 0;
    397   1.7   mycroft 	for (p = cp; *p++;)
    398   1.7   mycroft 	    continue;
    399  1.17       wiz 	dp = (Char *)xmalloc((size_t)((cwdlen + (p - cp) + 1) * sizeof(Char)));
    400   1.7   mycroft 	for (p = dp, q = dcwd->di_name; (*p++ = *q++) != '\0';)
    401   1.7   mycroft 	    continue;
    402   1.1       cgd 	if (cwdlen)
    403   1.1       cgd 	    p[-1] = '/';
    404   1.1       cgd 	else
    405   1.1       cgd 	    p--;		/* don't add a / after root */
    406   1.7   mycroft 	for (q = cp; (*p++ = *q++) != '\0';)
    407   1.7   mycroft 	    continue;
    408   1.1       cgd 	xfree((ptr_t) cp);
    409   1.1       cgd 	cp = dp;
    410   1.1       cgd 	dp += cwdlen;
    411   1.1       cgd     }
    412   1.1       cgd     else
    413   1.1       cgd 	dp = cp;
    414   1.1       cgd 
    415   1.1       cgd     cp = dcanon(cp, dp);
    416   1.1       cgd     return cp;
    417   1.1       cgd }
    418   1.1       cgd 
    419   1.1       cgd /*
    420   1.1       cgd  * dfollow - change to arg directory; fall back on cdpath if not valid
    421   1.1       cgd  */
    422   1.1       cgd static Char *
    423  1.17       wiz dfollow(Char *cp)
    424   1.1       cgd {
    425  1.17       wiz     char ebuf[MAXPATHLEN];
    426  1.17       wiz     struct varent *c;
    427  1.10       tls     Char *dp;
    428   1.1       cgd     int serrno;
    429   1.1       cgd 
    430   1.1       cgd     cp = globone(cp, G_ERROR);
    431   1.1       cgd     /*
    432   1.1       cgd      * if we are ignoring symlinks, try to fix relatives now.
    433   1.1       cgd      */
    434   1.1       cgd     dp = dnormalize(cp);
    435   1.1       cgd     if (chdir(short2str(dp)) >= 0) {
    436   1.1       cgd 	xfree((ptr_t) cp);
    437   1.1       cgd 	return dgoto(dp);
    438   1.1       cgd     }
    439   1.1       cgd     else {
    440   1.1       cgd 	xfree((ptr_t) dp);
    441   1.1       cgd 	if (chdir(short2str(cp)) >= 0)
    442   1.1       cgd 	    return dgoto(cp);
    443   1.1       cgd 	serrno = errno;
    444   1.1       cgd     }
    445   1.1       cgd 
    446   1.1       cgd     if (cp[0] != '/' && !prefix(STRdotsl, cp) && !prefix(STRdotdotsl, cp)
    447   1.1       cgd 	&& (c = adrof(STRcdpath))) {
    448   1.1       cgd 	Char  **cdp;
    449  1.10       tls 	Char *p;
    450   1.1       cgd 	Char    buf[MAXPATHLEN];
    451   1.1       cgd 
    452   1.1       cgd 	for (cdp = c->vec; *cdp; cdp++) {
    453   1.7   mycroft 	    for (dp = buf, p = *cdp; (*dp++ = *p++) != '\0';)
    454   1.7   mycroft 		continue;
    455   1.1       cgd 	    dp[-1] = '/';
    456   1.7   mycroft 	    for (p = cp; (*dp++ = *p++) != '\0';)
    457   1.7   mycroft 		continue;
    458   1.1       cgd 	    if (chdir(short2str(buf)) >= 0) {
    459   1.1       cgd 		printd = 1;
    460   1.1       cgd 		xfree((ptr_t) cp);
    461   1.1       cgd 		cp = Strsave(buf);
    462   1.1       cgd 		return dgoto(cp);
    463   1.1       cgd 	    }
    464   1.1       cgd 	}
    465   1.1       cgd     }
    466   1.1       cgd     dp = value(cp);
    467   1.1       cgd     if ((dp[0] == '/' || dp[0] == '.') && chdir(short2str(dp)) >= 0) {
    468   1.1       cgd 	xfree((ptr_t) cp);
    469   1.1       cgd 	cp = Strsave(dp);
    470   1.1       cgd 	printd = 1;
    471   1.1       cgd 	return dgoto(cp);
    472   1.1       cgd     }
    473  1.17       wiz     (void)strcpy(ebuf, short2str(cp));
    474   1.1       cgd     xfree((ptr_t) cp);
    475   1.1       cgd     stderror(ERR_SYSTEM, ebuf, strerror(serrno));
    476  1.13   mycroft     /* NOTREACHED */
    477   1.1       cgd }
    478   1.1       cgd 
    479   1.1       cgd /*
    480   1.1       cgd  * dopushd - push new directory onto directory stack.
    481   1.1       cgd  *	with no arguments exchange top and second.
    482   1.1       cgd  *	with numeric argument (+n) bring it to top.
    483   1.1       cgd  */
    484   1.1       cgd void
    485   1.7   mycroft /*ARGSUSED*/
    486  1.17       wiz dopushd(Char **v, struct command *t)
    487   1.1       cgd {
    488  1.10       tls     struct directory *dp;
    489   1.1       cgd 
    490   1.1       cgd     skipargs(&v, " [<dir>|+<n>]");
    491   1.1       cgd     printd = 1;
    492   1.1       cgd     if (*v == NULL) {
    493   1.1       cgd 	char   *tmp;
    494   1.1       cgd 
    495   1.1       cgd 	if ((dp = dcwd->di_prev) == &dhead)
    496   1.1       cgd 	    dp = dhead.di_prev;
    497  1.14   mycroft 	if (dp == dcwd)
    498   1.1       cgd 	    stderror(ERR_NAME | ERR_NODIR);
    499   1.1       cgd 	if (chdir(tmp = short2str(dp->di_name)) < 0)
    500   1.1       cgd 	    stderror(ERR_SYSTEM, tmp, strerror(errno));
    501   1.1       cgd 	dp->di_prev->di_next = dp->di_next;
    502   1.1       cgd 	dp->di_next->di_prev = dp->di_prev;
    503   1.1       cgd 	dp->di_next = dcwd->di_next;
    504   1.1       cgd 	dp->di_prev = dcwd;
    505   1.1       cgd 	dcwd->di_next->di_prev = dp;
    506   1.1       cgd 	dcwd->di_next = dp;
    507   1.1       cgd     }
    508  1.14   mycroft     else if (v[1] != NULL)
    509   1.1       cgd 	stderror(ERR_NAME | ERR_TOOMANY);
    510   1.7   mycroft     else if ((dp = dfind(*v)) != NULL) {
    511   1.1       cgd 	char   *tmp;
    512   1.1       cgd 
    513  1.14   mycroft 	if (chdir(tmp = short2str(dp->di_name)) < 0)
    514   1.1       cgd 	    stderror(ERR_SYSTEM, tmp, strerror(errno));
    515   1.1       cgd     }
    516   1.1       cgd     else {
    517  1.10       tls 	Char *ccp;
    518   1.1       cgd 
    519   1.1       cgd 	ccp = dfollow(*v);
    520  1.17       wiz 	dp = (struct directory *)xcalloc(sizeof(struct directory), 1);
    521   1.1       cgd 	dp->di_name = ccp;
    522   1.1       cgd 	dp->di_count = 0;
    523   1.1       cgd 	dp->di_prev = dcwd;
    524   1.1       cgd 	dp->di_next = dcwd->di_next;
    525   1.1       cgd 	dcwd->di_next = dp;
    526   1.1       cgd 	dp->di_next->di_prev = dp;
    527   1.1       cgd     }
    528   1.1       cgd     dnewcwd(dp);
    529   1.1       cgd }
    530   1.1       cgd 
    531   1.1       cgd /*
    532   1.1       cgd  * dfind - find a directory if specified by numeric (+n) argument
    533   1.1       cgd  */
    534   1.1       cgd static struct directory *
    535  1.17       wiz dfind(Char *cp)
    536   1.1       cgd {
    537  1.10       tls     struct directory *dp;
    538  1.17       wiz     Char *ep;
    539  1.10       tls     int i;
    540   1.1       cgd 
    541   1.1       cgd     if (*cp++ != '+')
    542   1.1       cgd 	return (0);
    543   1.1       cgd     for (ep = cp; Isdigit(*ep); ep++)
    544   1.1       cgd 	continue;
    545   1.1       cgd     if (*ep)
    546   1.1       cgd 	return (0);
    547   1.1       cgd     i = getn(cp);
    548   1.1       cgd     if (i <= 0)
    549   1.1       cgd 	return (0);
    550   1.1       cgd     for (dp = dcwd; i != 0; i--) {
    551   1.1       cgd 	if ((dp = dp->di_prev) == &dhead)
    552   1.1       cgd 	    dp = dp->di_prev;
    553  1.14   mycroft 	if (dp == dcwd)
    554   1.1       cgd 	    stderror(ERR_NAME | ERR_DEEP);
    555   1.1       cgd     }
    556   1.1       cgd     return (dp);
    557   1.1       cgd }
    558   1.1       cgd 
    559   1.1       cgd /*
    560   1.1       cgd  * dopopd - pop a directory out of the directory stack
    561   1.1       cgd  *	with a numeric argument just discard it.
    562   1.1       cgd  */
    563   1.1       cgd void
    564   1.7   mycroft /*ARGSUSED*/
    565  1.17       wiz dopopd(Char **v, struct command *t)
    566   1.1       cgd {
    567  1.10       tls     struct directory *dp, *p = NULL;
    568   1.1       cgd 
    569   1.1       cgd     skipargs(&v, " [+<n>]");
    570   1.1       cgd     printd = 1;
    571   1.1       cgd     if (*v == NULL)
    572   1.1       cgd 	dp = dcwd;
    573  1.14   mycroft     else if (v[1] != NULL)
    574   1.1       cgd 	stderror(ERR_NAME | ERR_TOOMANY);
    575  1.14   mycroft     else if ((dp = dfind(*v)) == 0)
    576   1.1       cgd 	stderror(ERR_NAME | ERR_BADDIR);
    577  1.14   mycroft     if (dp->di_prev == &dhead && dp->di_next == &dhead)
    578   1.1       cgd 	stderror(ERR_NAME | ERR_EMPTY);
    579   1.1       cgd     if (dp == dcwd) {
    580  1.17       wiz 	char *tmp;
    581   1.1       cgd 
    582   1.1       cgd 	if ((p = dp->di_prev) == &dhead)
    583   1.1       cgd 	    p = dhead.di_prev;
    584  1.14   mycroft 	if (chdir(tmp = short2str(p->di_name)) < 0)
    585   1.1       cgd 	    stderror(ERR_SYSTEM, tmp, strerror(errno));
    586   1.1       cgd     }
    587   1.1       cgd     dp->di_prev->di_next = dp->di_next;
    588   1.1       cgd     dp->di_next->di_prev = dp->di_prev;
    589   1.1       cgd     if (dp == dcwd)
    590   1.1       cgd 	dnewcwd(p);
    591   1.1       cgd     else {
    592   1.1       cgd 	printdirs();
    593   1.1       cgd     }
    594   1.1       cgd     dfree(dp);
    595   1.1       cgd }
    596   1.1       cgd 
    597   1.1       cgd /*
    598   1.1       cgd  * dfree - free the directory (or keep it if it still has ref count)
    599   1.1       cgd  */
    600   1.1       cgd void
    601  1.17       wiz dfree(struct directory *dp)
    602   1.1       cgd {
    603   1.1       cgd 
    604   1.1       cgd     if (dp->di_count != 0) {
    605   1.1       cgd 	dp->di_next = dp->di_prev = 0;
    606   1.1       cgd     }
    607   1.1       cgd     else {
    608   1.1       cgd 	xfree((char *) dp->di_name);
    609   1.1       cgd 	xfree((ptr_t) dp);
    610   1.1       cgd     }
    611   1.1       cgd }
    612   1.1       cgd 
    613   1.1       cgd /*
    614   1.1       cgd  * dcanon - canonicalize the pathname, removing excess ./ and ../ etc.
    615   1.1       cgd  *	we are of course assuming that the file system is standardly
    616   1.1       cgd  *	constructed (always have ..'s, directories have links)
    617   1.1       cgd  */
    618  1.17       wiz Char *
    619  1.17       wiz dcanon(Char *cp, Char *p)
    620   1.1       cgd {
    621  1.18     lukem     Char slink[MAXPATHLEN];
    622  1.17       wiz     char tlink[MAXPATHLEN];
    623  1.17       wiz     Char *newcp, *sp;
    624  1.10       tls     Char *p1, *p2;	/* general purpose */
    625  1.17       wiz     int cc;
    626  1.17       wiz     bool slash;
    627   1.1       cgd 
    628   1.1       cgd     /*
    629   1.1       cgd      * christos: if the path given does not start with a slash prepend cwd. If
    630   1.1       cgd      * cwd does not start with a path or the result would be too long abort().
    631   1.1       cgd      */
    632   1.1       cgd     if (*cp != '/') {
    633  1.17       wiz 	Char tmpdir[MAXPATHLEN];
    634   1.1       cgd 
    635   1.1       cgd 	p1 = value(STRcwd);
    636   1.1       cgd 	if (p1 == NULL || *p1 != '/')
    637   1.1       cgd 	    abort();
    638   1.1       cgd 	if (Strlen(p1) + Strlen(cp) + 1 >= MAXPATHLEN)
    639   1.1       cgd 	    abort();
    640  1.17       wiz 	(void)Strcpy(tmpdir, p1);
    641  1.17       wiz 	(void)Strcat(tmpdir, STRslash);
    642  1.17       wiz 	(void)Strcat(tmpdir, cp);
    643   1.1       cgd 	xfree((ptr_t) cp);
    644   1.1       cgd 	cp = p = Strsave(tmpdir);
    645   1.1       cgd     }
    646   1.1       cgd 
    647   1.1       cgd     while (*p) {		/* for each component */
    648   1.1       cgd 	sp = p;			/* save slash address */
    649   1.1       cgd 	while (*++p == '/')	/* flush extra slashes */
    650   1.7   mycroft 	    continue;
    651   1.1       cgd 	if (p != ++sp)
    652   1.7   mycroft 	    for (p1 = sp, p2 = p; (*p1++ = *p2++) != '\0';)
    653   1.7   mycroft 		continue;
    654   1.1       cgd 	p = sp;			/* save start of component */
    655   1.1       cgd 	slash = 0;
    656   1.1       cgd 	while (*++p)		/* find next slash or end of path */
    657   1.1       cgd 	    if (*p == '/') {
    658   1.1       cgd 		slash = 1;
    659   1.1       cgd 		*p = 0;
    660   1.1       cgd 		break;
    661   1.1       cgd 	    }
    662   1.1       cgd 
    663  1.15  christos 	if (*sp == '\0') {	/* if component is null */
    664   1.1       cgd 	    if (--sp == cp)	/* if path is one char (i.e. /) */
    665   1.1       cgd 		break;
    666   1.1       cgd 	    else
    667   1.1       cgd 		*sp = '\0';
    668  1.15  christos 	} else if (sp[0] == '.' && sp[1] == 0) {
    669   1.1       cgd 	    if (slash) {
    670   1.7   mycroft 		for (p1 = sp, p2 = p + 1; (*p1++ = *p2++) != '\0';)
    671   1.7   mycroft 		    continue;
    672   1.1       cgd 		p = --sp;
    673   1.1       cgd 	    }
    674   1.1       cgd 	    else if (--sp != cp)
    675   1.1       cgd 		*sp = '\0';
    676   1.1       cgd 	}
    677   1.1       cgd 	else if (sp[0] == '.' && sp[1] == '.' && sp[2] == 0) {
    678   1.1       cgd 	    /*
    679   1.1       cgd 	     * We have something like "yyy/xxx/..", where "yyy" can be null or
    680   1.1       cgd 	     * a path starting at /, and "xxx" is a single component. Before
    681   1.1       cgd 	     * compressing "xxx/..", we want to expand "yyy/xxx", if it is a
    682   1.1       cgd 	     * symbolic link.
    683   1.1       cgd 	     */
    684   1.1       cgd 	    *--sp = 0;		/* form the pathname for readlink */
    685   1.1       cgd 	    if (sp != cp && !adrof(STRignore_symlinks) &&
    686   1.1       cgd 		(cc = readlink(short2str(cp), tlink,
    687   1.1       cgd 			       sizeof tlink)) >= 0) {
    688  1.18     lukem 		(void)Strcpy(slink, str2short(tlink));
    689  1.18     lukem 		slink[cc] = '\0';
    690   1.1       cgd 
    691   1.1       cgd 		if (slash)
    692   1.1       cgd 		    *p = '/';
    693   1.1       cgd 		/*
    694   1.1       cgd 		 * Point p to the '/' in "/..", and restore the '/'.
    695   1.1       cgd 		 */
    696   1.1       cgd 		*(p = sp) = '/';
    697   1.1       cgd 		/*
    698   1.1       cgd 		 * find length of p
    699   1.1       cgd 		 */
    700   1.7   mycroft 		for (p1 = p; *p1++;)
    701   1.7   mycroft 		    continue;
    702  1.18     lukem 		if (*slink != '/') {
    703   1.1       cgd 		    /*
    704   1.1       cgd 		     * Relative path, expand it between the "yyy/" and the
    705   1.1       cgd 		     * "/..". First, back sp up to the character past "yyy/".
    706   1.1       cgd 		     */
    707   1.7   mycroft 		    while (*--sp != '/')
    708   1.7   mycroft 			continue;
    709   1.1       cgd 		    sp++;
    710   1.1       cgd 		    *sp = 0;
    711   1.1       cgd 		    /*
    712  1.18     lukem 		     * New length is "yyy/" + slink + "/.." and rest
    713   1.1       cgd 		     */
    714  1.17       wiz 		    p1 = newcp = (Char *)xmalloc(
    715  1.17       wiz 		        (size_t)(((sp - cp) + cc + (p1 - p)) * sizeof(Char)));
    716   1.1       cgd 		    /*
    717   1.1       cgd 		     * Copy new path into newcp
    718   1.1       cgd 		     */
    719   1.7   mycroft 		    for (p2 = cp; (*p1++ = *p2++) != '\0';)
    720   1.7   mycroft 			continue;
    721  1.18     lukem 		    for (p1--, p2 = slink; (*p1++ = *p2++) != '\0';)
    722   1.7   mycroft 			continue;
    723   1.7   mycroft 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
    724   1.7   mycroft 			continue;
    725   1.1       cgd 		    /*
    726   1.1       cgd 		     * Restart canonicalization at expanded "/xxx".
    727   1.1       cgd 		     */
    728   1.1       cgd 		    p = sp - cp - 1 + newcp;
    729   1.1       cgd 		}
    730   1.1       cgd 		else {
    731   1.1       cgd 		    /*
    732  1.18     lukem 		     * New length is slink + "/.." and rest
    733   1.1       cgd 		     */
    734  1.17       wiz 		    p1 = newcp = (Char *)xmalloc(
    735  1.17       wiz 		        (size_t)((cc + (p1 - p)) * sizeof(Char)));
    736   1.1       cgd 		    /*
    737   1.1       cgd 		     * Copy new path into newcp
    738   1.1       cgd 		     */
    739  1.18     lukem 		    for (p2 = slink; (*p1++ = *p2++) != '\0';)
    740   1.7   mycroft 			continue;
    741   1.7   mycroft 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
    742   1.7   mycroft 			continue;
    743   1.1       cgd 		    /*
    744   1.1       cgd 		     * Restart canonicalization at beginning
    745   1.1       cgd 		     */
    746   1.1       cgd 		    p = newcp;
    747   1.1       cgd 		}
    748   1.1       cgd 		xfree((ptr_t) cp);
    749   1.1       cgd 		cp = newcp;
    750   1.1       cgd 		continue;	/* canonicalize the link */
    751   1.1       cgd 	    }
    752   1.1       cgd 	    *sp = '/';
    753   1.1       cgd 	    if (sp != cp)
    754   1.7   mycroft 		while (*--sp != '/')
    755   1.7   mycroft 		    continue;
    756   1.1       cgd 	    if (slash) {
    757   1.7   mycroft 		for (p1 = sp + 1, p2 = p + 1; (*p1++ = *p2++) != '\0';)
    758   1.7   mycroft 		    continue;
    759   1.1       cgd 		p = sp;
    760   1.1       cgd 	    }
    761   1.1       cgd 	    else if (cp == sp)
    762   1.1       cgd 		*++sp = '\0';
    763   1.1       cgd 	    else
    764   1.1       cgd 		*sp = '\0';
    765   1.1       cgd 	}
    766   1.1       cgd 	else {			/* normal dir name (not . or .. or nothing) */
    767   1.1       cgd 
    768   1.1       cgd 	    if (sp != cp && adrof(STRchase_symlinks) &&
    769   1.1       cgd 		!adrof(STRignore_symlinks) &&
    770  1.17       wiz 		(cc = readlink(short2str(cp), tlink, sizeof(tlink))) >= 0) {
    771  1.18     lukem 		(void)Strcpy(slink, str2short(tlink));
    772  1.18     lukem 		slink[cc] = '\0';
    773   1.1       cgd 
    774   1.1       cgd 		/*
    775   1.1       cgd 		 * restore the '/'.
    776   1.1       cgd 		 */
    777   1.1       cgd 		if (slash)
    778   1.1       cgd 		    *p = '/';
    779   1.1       cgd 
    780   1.1       cgd 		/*
    781   1.1       cgd 		 * point sp to p (rather than backing up).
    782   1.1       cgd 		 */
    783   1.1       cgd 		sp = p;
    784   1.1       cgd 
    785   1.1       cgd 		/*
    786   1.1       cgd 		 * find length of p
    787   1.1       cgd 		 */
    788   1.7   mycroft 		for (p1 = p; *p1++;)
    789   1.7   mycroft 		    continue;
    790  1.18     lukem 		if (*slink != '/') {
    791   1.1       cgd 		    /*
    792   1.1       cgd 		     * Relative path, expand it between the "yyy/" and the
    793   1.1       cgd 		     * remainder. First, back sp up to the character past
    794   1.1       cgd 		     * "yyy/".
    795   1.1       cgd 		     */
    796   1.7   mycroft 		    while (*--sp != '/')
    797   1.7   mycroft 			continue;
    798   1.1       cgd 		    sp++;
    799   1.1       cgd 		    *sp = 0;
    800   1.1       cgd 		    /*
    801  1.18     lukem 		     * New length is "yyy/" + slink + "/.." and rest
    802   1.1       cgd 		     */
    803  1.17       wiz 		    p1 = newcp = (Char *)xmalloc(
    804  1.17       wiz 		        (size_t)(((sp - cp) + cc + (p1 - p)) * sizeof(Char)));
    805   1.1       cgd 		    /*
    806   1.1       cgd 		     * Copy new path into newcp
    807   1.1       cgd 		     */
    808   1.7   mycroft 		    for (p2 = cp; (*p1++ = *p2++) != '\0';)
    809   1.7   mycroft 			continue;
    810  1.18     lukem 		    for (p1--, p2 = slink; (*p1++ = *p2++) != '\0';)
    811   1.7   mycroft 			continue;
    812   1.7   mycroft 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
    813   1.7   mycroft 			continue;
    814   1.1       cgd 		    /*
    815   1.1       cgd 		     * Restart canonicalization at expanded "/xxx".
    816   1.1       cgd 		     */
    817   1.1       cgd 		    p = sp - cp - 1 + newcp;
    818   1.1       cgd 		}
    819   1.1       cgd 		else {
    820   1.1       cgd 		    /*
    821  1.18     lukem 		     * New length is slink + the rest
    822   1.1       cgd 		     */
    823  1.17       wiz 		    p1 = newcp = (Char *)xmalloc(
    824  1.17       wiz 		        (size_t)((cc + (p1 - p)) * sizeof(Char)));
    825   1.1       cgd 		    /*
    826   1.1       cgd 		     * Copy new path into newcp
    827   1.1       cgd 		     */
    828  1.18     lukem 		    for (p2 = slink; (*p1++ = *p2++) != '\0';)
    829   1.7   mycroft 			continue;
    830   1.7   mycroft 		    for (p1--, p2 = p; (*p1++ = *p2++) != '\0';)
    831   1.7   mycroft 			continue;
    832   1.1       cgd 		    /*
    833   1.1       cgd 		     * Restart canonicalization at beginning
    834   1.1       cgd 		     */
    835   1.1       cgd 		    p = newcp;
    836   1.1       cgd 		}
    837   1.1       cgd 		xfree((ptr_t) cp);
    838   1.1       cgd 		cp = newcp;
    839   1.1       cgd 		continue;	/* canonicalize the link */
    840   1.1       cgd 	    }
    841   1.1       cgd 	    if (slash)
    842   1.1       cgd 		*p = '/';
    843   1.1       cgd 	}
    844   1.1       cgd     }
    845   1.1       cgd 
    846   1.1       cgd     /*
    847   1.1       cgd      * fix home...
    848   1.1       cgd      */
    849   1.1       cgd     p1 = value(STRhome);
    850   1.1       cgd     cc = Strlen(p1);
    851   1.1       cgd     /*
    852   1.1       cgd      * See if we're not in a subdir of STRhome
    853   1.1       cgd      */
    854   1.1       cgd     if (p1 && *p1 == '/' &&
    855   1.1       cgd 	(Strncmp(p1, cp, cc) != 0 || (cp[cc] != '/' && cp[cc] != '\0'))) {
    856  1.13   mycroft 	static ino_t home_ino;
    857  1.13   mycroft 	static dev_t home_dev = NODEV;
    858   1.1       cgd 	static Char *home_ptr = NULL;
    859   1.1       cgd 	struct stat statbuf;
    860   1.1       cgd 
    861   1.1       cgd 	/*
    862   1.1       cgd 	 * Get dev and ino of STRhome
    863   1.1       cgd 	 */
    864   1.1       cgd 	if (home_ptr != p1 &&
    865   1.1       cgd 	    stat(short2str(p1), &statbuf) != -1) {
    866   1.1       cgd 	    home_dev = statbuf.st_dev;
    867   1.1       cgd 	    home_ino = statbuf.st_ino;
    868   1.1       cgd 	    home_ptr = p1;
    869   1.1       cgd 	}
    870   1.1       cgd 	/*
    871   1.1       cgd 	 * Start comparing dev & ino backwards
    872   1.1       cgd 	 */
    873  1.18     lukem 	p2 = Strcpy(slink, cp);
    874   1.1       cgd 	for (sp = NULL; *p2 && stat(short2str(p2), &statbuf) != -1;) {
    875   1.1       cgd 	    if (statbuf.st_dev == home_dev &&
    876   1.1       cgd 		statbuf.st_ino == home_ino) {
    877   1.1       cgd 		sp = (Char *) - 1;
    878   1.1       cgd 		break;
    879   1.1       cgd 	    }
    880   1.7   mycroft 	    if ((sp = Strrchr(p2, '/')) != NULL)
    881   1.1       cgd 		*sp = '\0';
    882   1.1       cgd 	}
    883   1.1       cgd 	/*
    884   1.1       cgd 	 * See if we found it
    885   1.1       cgd 	 */
    886   1.1       cgd 	if (*p2 && sp == (Char *) -1) {
    887   1.1       cgd 	    /*
    888   1.1       cgd 	     * Use STRhome to make '~' work
    889   1.1       cgd 	     */
    890   1.7   mycroft 	    newcp = Strspl(p1, cp + Strlen(p2));
    891   1.1       cgd 	    xfree((ptr_t) cp);
    892   1.1       cgd 	    cp = newcp;
    893   1.1       cgd 	}
    894   1.1       cgd     }
    895   1.1       cgd     return cp;
    896   1.1       cgd }
    897   1.1       cgd 
    898   1.1       cgd 
    899   1.1       cgd /*
    900   1.1       cgd  * dnewcwd - make a new directory in the loop the current one
    901   1.1       cgd  */
    902   1.1       cgd static void
    903  1.17       wiz dnewcwd(struct directory *dp)
    904   1.1       cgd {
    905   1.1       cgd     dcwd = dp;
    906   1.1       cgd     dset(dcwd->di_name);
    907   1.1       cgd     if (printd && !(adrof(STRpushdsilent)))
    908   1.1       cgd 	printdirs();
    909   1.1       cgd }
    910