Changeset 1214 for trunk/src/kash/expand.c

Timestamp:

Oct 7, 2007, 10:39:58 PM (18 years ago)

Author:

bird

Message:

some more cleanup.

File:

• trunk/src/kash/expand.c (modified) (7 diffs)

trunk/src/kash/expand.c

@@ -33 +33 @@
  */
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
+#if 0
 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)expand.c    8.5 (Berkeley) 5/15/95";
 #else
 __RCSID("$NetBSD: expand.c,v 1.71 2005/06/01 15:41:19 lukem Exp $");
+#endif /* not lint */
 #endif
-#endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/stat.h>
 #include <errno.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <pwd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef __sun__
-#include <iso/limits_iso.h>
-#endif
 
 /*
@@ -267 +257 @@
 {
         char c, *startp = p;
-        struct passwd *pw;
         const char *home;
         int quotes = flag & (EXP_FULL | EXP_CASE);
@@ -292 +281 @@
                         goto lose;
         } else {
-                if ((pw = getpwnam(startp+1)) == NULL)
+                if ((home = sh_gethomedir(psh, startp+1)) == NULL)
                         goto lose;
-                home = pw->pw_dir;
         }
         if (*home == '\0')
@@ -1140 +1128 @@
         int metaflag;
         struct stat statb;
-        DIR *dirp;
-        struct dirent *dp;
+        shdir *dirp;
+        shdirent *dp;
         int atend;
         int matchdot;
@@ -1215 +1203 @@
                 enddir[-1] = '\0';
         }
-        if ((dirp = opendir(cp)) == NULL)
+        if ((dirp = shfile_opendir(&psh->fdtab, cp)) == NULL)
                 return;
         if (enddir != psh->expdir)
@@ -1233 +1221 @@
         if (*p == '.')
                 matchdot++;
-        while (! int_pending() && (dp = readdir(dirp)) != NULL) {
-                if (dp->d_name[0] == '.' && ! matchdot)
+        while (! int_pending() && (dp = shfile_readdir(dirp)) != NULL) {
+                if (dp->name[0] == '.' && ! matchdot)
                         continue;
-                if (patmatch(psh, start, dp->d_name, 0)) {
+                if (patmatch(psh, start, dp->name, 0)) {
                         if (atend) {
-                                scopy(dp->d_name, enddir);
+                                scopy(dp->name, enddir);
                                 addfname(psh, psh->expdir);
                         } else {
-                                for (p = enddir, cp = dp->d_name;
+                                for (p = enddir, cp = dp->name;
                                      (*p++ = *cp++) != '\0';)
                                         continue;
@@ -1249 +1237 @@
                 }
         }
-        closedir(dirp);
+        shfile_closedir(dirp);
         if (! atend)
                 endname[-1] = '/';