From 1dc9127cd29e64f4d64263f2eb077339e0cca0c4 Mon Sep 17 00:00:00 2001 From: jay Date: Tue, 26 Jul 2005 11:59:40 +0000 Subject: [PATCH] Removed old code for antuqie version of savedir(). --- find/find.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/find/find.c b/find/find.c index c34d00e..ed4ccb7 100644 --- a/find/find.c +++ b/find/find.c @@ -1795,30 +1795,14 @@ process_dir (char *pathname, char *name, int pathlen, struct stat *statp, char * int idx; /* Which entry are we on? */ struct stat stat_buf; -#undef USE_OLD_SAVEDIR - -#if USE_OLD_SAVEDIR - char *name_space; /* Names of files in PATHNAME. */ - struct savedir_extrainfo *extra; -#else struct savedir_dirinfo *dirinfo; -#endif subdirs_left = statp->st_nlink - 2; /* Account for name and ".". */ errno = 0; -#if USE_OLD_SAVEDIR - name_space = savedirinfo (name, &extra); -#else dirinfo = xsavedir(name, 0); -#endif + - if ( -#if USE_OLD_SAVEDIR - name_space -#else - dirinfo -#endif - == NULL) + if (dirinfo == NULL) { assert(errno != 0); error (0, errno, "%s", pathname); @@ -1894,22 +1878,15 @@ process_dir (char *pathname, char *name, int pathlen, struct stat *statp, char * } } -#if USE_OLD_SAVEDIR - for (idx=0, namep = name_space; *namep; namep += file_len - pathname_len + 1, ++idx) -#else for (idx=0; idx < dirinfo->size; ++idx) -#endif { /* savedirinfo() may return dirinfo=NULL if extended information * is not available. */ -#if USE_OLD_SAVEDIR - mode_t mode = extra ? extra[idx].type_info : 0; -#else mode_t mode = (dirinfo->entries[idx].flags & SavedirHaveFileType) ? dirinfo->entries[idx].type_info : 0; namep = dirinfo->entries[idx].name; -#endif + /* Append this directory entry's name to the path being searched. */ file_len = pathname_len + strlen (namep); if (file_len > cur_path_size) @@ -2029,12 +2006,7 @@ process_dir (char *pathname, char *name, int pathlen, struct stat *statp, char * if (cur_path) free (cur_path); -#ifdef USE_OLD_SAVEDIR - free (name_space); - free (extra); -#else free_dirinfo(dirinfo); -#endif } } -- 2.11.4.GIT