diff options
Diffstat (limited to 'contrib/cvs/src/find_names.c')
-rw-r--r-- | contrib/cvs/src/find_names.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/cvs/src/find_names.c b/contrib/cvs/src/find_names.c index 6fb927b..e34232e 100644 --- a/contrib/cvs/src/find_names.c +++ b/contrib/cvs/src/find_names.c @@ -269,7 +269,7 @@ find_rcs (dir, list) /* read the dir, grabbing the ,v files */ errno = 0; - while ((dp = readdir (dirp)) != NULL) + while ((dp = CVS_READDIR (dirp)) != NULL) { if (CVS_FNMATCH (RCSPAT, dp->d_name, 0) == 0) { @@ -288,11 +288,11 @@ find_rcs (dir, list) if (errno != 0) { int save_errno = errno; - (void) closedir (dirp); + (void) CVS_CLOSEDIR (dirp); errno = save_errno; return 1; } - (void) closedir (dirp); + (void) CVS_CLOSEDIR (dirp); return (0); } @@ -321,9 +321,9 @@ find_dirs (dir, list, checkadm, entries) Emptydir. Except in the CVSNULLREPOS case, Emptydir is just a normal directory name. */ if (isabsolute (dir) - && strncmp (dir, CVSroot_directory, strlen (CVSroot_directory)) == 0 - && ISDIRSEP (dir[strlen (CVSroot_directory)]) - && strcmp (dir + strlen (CVSroot_directory) + 1, CVSROOTADM) == 0) + && strncmp (dir, current_parsed_root->directory, strlen (current_parsed_root->directory)) == 0 + && ISDIRSEP (dir[strlen (current_parsed_root->directory)]) + && strcmp (dir + strlen (current_parsed_root->directory) + 1, CVSROOTADM) == 0) skip_emptydir = 1; /* set up to read the dir */ @@ -332,7 +332,7 @@ find_dirs (dir, list, checkadm, entries) /* read the dir, grabbing sub-dirs */ errno = 0; - while ((dp = readdir (dirp)) != NULL) + while ((dp = CVS_READDIR (dirp)) != NULL) { if (strcmp (dp->d_name, ".") == 0 || strcmp (dp->d_name, "..") == 0 || @@ -414,11 +414,11 @@ find_dirs (dir, list, checkadm, entries) if (errno != 0) { int save_errno = errno; - (void) closedir (dirp); + (void) CVS_CLOSEDIR (dirp); errno = save_errno; return 1; } - (void) closedir (dirp); + (void) CVS_CLOSEDIR (dirp); if (tmp != NULL) free (tmp); return (0); |