fix bug that caused du to core dump while working on execute only directories

SCCS-vsn: usr.bin/du/du.c 4.7

diff --git a/usr/src/usr.bin/du/du.c b/usr/src/usr.bin/du/du.c
index cedc186..df6cbbb 100644 (file)
--- a/usr/src/usr.bin/du/du.c
+++ b/usr/src/usr.bin/du/du.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)du.c        4.6 (Berkeley) %G%";
+static char *sccsid = "@(#)du.c        4.7 (Berkeley) %G%";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -115,16 +115,19 @@ descend(base, name)
                        printf("%ld\t%s\n", kbytes, base);
                return (kbytes);
        }
                        printf("%ld\t%s\n", kbytes, base);
                return (kbytes);
        }

-       if (chdir(name) < 0)
-               return (0);

        if (dirp != NULL)
                closedir(dirp);
        if (dirp != NULL)
                closedir(dirp);

-       dirp = opendir(".");
+       dirp = opendir(name);

        if (dirp == NULL) {
                perror(base);
                *ebase0 = 0;
                return (0);
        }
        if (dirp == NULL) {
                perror(base);
                *ebase0 = 0;
                return (0);
        }

+       if (chdir(name) < 0) {
+               perror(base);
+               *ebase0 = 0;
+               return (0);
+       }

        while (dp = readdir(dirp)) {
                if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
                        continue;
        while (dp = readdir(dirp)) {
                if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
                        continue;


@@ -134,6 +137,10 @@ descend(base, name)
                *ebase = 0;
                if (dirp == NULL) {
                        dirp = opendir(".");
                *ebase = 0;
                if (dirp == NULL) {
                        dirp = opendir(".");

+                       if (dirp == NULL) {
+                               perror(".");
+                               return (0);
+                       }

                        seekdir(dirp, curoff);
                }
        }
                        seekdir(dirp, curoff);
                }
        }