6470471 find should work even if a parent directory is read-protected

1 files changed, 14 insertions, 4 deletions

diff --git a/usr/src/cmd/find/find.c b/usr/src/cmd/find/find.c
index bd5df9734c..8934b41988 100644
--- a/usr/src/cmd/find/find.c
+++ b/usr/src/cmd/find/find.c
@@ -341,10 +341,20 @@ main(int argc, char **argv)
 		 * error related to this
 		 */
 		if ((cwdpath = getcwd(NULL, PATH_MAX)) == NULL) {
-			(void) fprintf(stderr,
-			    gettext("%s : cannot get the current working "
-			    "directory\n"), cmdname);
-			exit(1);
+			if ((errno == EACCES) && (walkflags & FTW_CHDIR)) {
+				/*
+				 * A directory above cwd is inaccessible,
+				 * so don't do chdir(2)s. Slower, but at least
+				 * it works.
+				 */
+				walkflags &= ~FTW_CHDIR;
+				free(cwdpath);
+			} else {
+				(void) fprintf(stderr,
+				    gettext("%s : cannot get the current "
+				    "working directory\n"), cmdname);
+				exit(1);
+			}
 		} else
 			free(cwdpath);