mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-29 05:21:00 +01:00
Code Releases Activity

26772: better error handling and fix runaway chdir on failed cd

Browse source
This commit is contained in:
Peter Stephenson 2009-03-24 12:52:07 +00:00
parent ee71aa006e
commit 9defc9850d
5 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Src/utils.c
View file

@ -5356,6 +5356,21 @@ upchdir(int n)
return 0;
}
/*
* Initialize a "struct dirsav".
* The structure will be set to the directory we want to save
* the first time we change to a different directory.
*/
/**/
mod_export void
init_dirsav(Dirsav d)
{
d->ino = d->dev = 0;
d->dirname = NULL;
d->dirfd = d->level = -1;
}
/* Change directory, without following symlinks. Returns 0 on success, -1 *
* on failure. Sets errno to ENOTDIR if any symlinks are encountered. If *
* fchdir() fails, or the current directory is unreadable, we might end up *
@ -5379,9 +5394,7 @@ lchdir(char const *path, struct dirsav *d, int hard)
#endif
if (!d) {
ds.ino = ds.dev = 0;
ds.dirname = NULL;
ds.dirfd = -1;
init_dirsav(&ds);
d = &ds;
}
#ifdef HAVE_LSTAT
@ -5479,6 +5492,17 @@ lchdir(char const *path, struct dirsav *d, int hard)
}
}
if (restoredir(d)) {
int restoreerr = errno;
/*
* Failed to restore the directory.
* Just be definite, cd to root and report the result.
*/
zsfree(pwd);
pwd = ztrdup("/");
if (chdir(pwd) < 0)
zerr("lost current directory, failed to cd to /: %e", errno);
else
zerr("lost current directory: %e: changed to /", restoreerr);
if (d == &ds)
zsfree(ds.dirname);
#ifdef HAVE_FCHDIR