about summary refs log tree commit diff
path: root/Src/Modules/files.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-03-24 12:52:07 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-03-24 12:52:07 +0000
commit9defc9850d0d73742856165f595899f0d8a87c6d (patch)
tree8bebfe4eca127de68e8032340ef6e8b9d2bd3c25 /Src/Modules/files.c
parentee71aa006e412fa2e0532d58f5f028b9c3686a5e (diff)
downloadzsh-9defc9850d0d73742856165f595899f0d8a87c6d.tar.gz
zsh-9defc9850d0d73742856165f595899f0d8a87c6d.tar.xz
zsh-9defc9850d0d73742856165f595899f0d8a87c6d.zip
26772: better error handling and fix runaway chdir on failed cd
Diffstat (limited to 'Src/Modules/files.c')
-rw-r--r--Src/Modules/files.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/Src/Modules/files.c b/Src/Modules/files.c
index 0b991c556..3fbccf576 100644
--- a/Src/Modules/files.c
+++ b/Src/Modules/files.c
@@ -382,9 +382,7 @@ recursivecmd(char *nam, int opt_noerr, int opt_recurse, int opt_safe,
     reccmd.dirpost_func = dirpost_func;
     reccmd.leaf_func = leaf_func;
     reccmd.magic = magic;
-    ds.ino = ds.dev = 0;
-    ds.dirname = NULL;
-    ds.dirfd = ds.level = -1;
+    init_dirsav(&ds);
     if (opt_recurse || opt_safe) {
 	if ((ds.dirfd = open(".", O_RDONLY|O_NOCTTY)) < 0 &&
 	    zgetdir(&ds) && *ds.dirname != '/')
@@ -476,9 +474,7 @@ recursivecmd_dorec(struct recursivecmd const *reccmd,
     }
     err = err1;
 
-    dsav.ino = dsav.dev = 0;
-    dsav.dirname = NULL;
-    dsav.dirfd = dsav.level = -1;
+    init_dirsav(&dsav);
     d = opendir(".");
     if(!d) {
 	if(!reccmd->opt_noerr)