* by Ano: make static compileable on solaris; the path needs to be allocated next...

[citadel.git] / webcit / static.c

diff --git a/webcit/static.c b/webcit/static.c
index 139cd32b481790d5b44173e58c26652bfaf3aaef..0b4f449c440f4495ec23546c457b2ff27512d814 100644 (file)
--- a/webcit/static.c
+++ b/webcit/static.c
@@ -98,9 +98,10 @@ int LoadStaticDir(const char *DirName, HashList *DirList, const char *RelDir)
        StrBuf *WebDir = NULL;
        StrBuf *OneWebName = NULL;
        DIR *filedir = NULL;
-       struct dirent d;
+       struct dirent *d;
        struct dirent *filedir_entry;
-       int d_namelen;
+       int d_type = 0;
+        int d_namelen;
        int d_without_ext;
        int istoplevel;
                
@@ -109,32 +110,39 @@ int LoadStaticDir(const char *DirName, HashList *DirList, const char *RelDir)
                return 0;
        }
 
+       d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1);
+       if (d == NULL) {
+               return 0;
+       }
+
        Dir = NewStrBufPlain(DirName, -1);
        WebDir = NewStrBufPlain(RelDir, -1);
        istoplevel = IsEmptyStr(RelDir);
        OneWebName = NewStrBuf();
 
-               while ((readdir_r(filedir, &d, &filedir_entry) == 0) &&
+       while ((readdir_r(filedir, d, &filedir_entry) == 0) &&
               (filedir_entry != NULL))
        {
                char *PStart;
 #ifdef _DIRENT_HAVE_D_NAMELEN
                d_namelen = filedir_entry->d_namelen;
+               d_type = filedir_entry->d_type;
 #else
+
+#ifndef DT_UNKNOWN
+#define DT_UNKNOWN     0
+#define DT_DIR         4
+#define DT_REG         8
+#define DT_LNK         10
+
+#define IFTODT(mode)   (((mode) & 0170000) >> 12)
+#define DTTOIF(dirtype)        ((dirtype) << 12)
+#endif
                d_namelen = strlen(filedir_entry->d_name);
+               d_type = DT_UNKNOWN;
 #endif
                d_without_ext = d_namelen;
 
-               if (filedir_entry->d_type == DT_UNKNOWN) {
-                       struct stat s;
-                       char path[PATH_MAX];
-                       snprintf(path, PATH_MAX, "%s/%s", 
-                               DirName, filedir_entry->d_name);
-                       if (stat(path, &s) == 0) {
-                               filedir_entry->d_type = IFTODT(s.st_mode);
-                       }
-               }
-
                if ((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~')
                        continue; /* Ignore backup files... */
 
@@ -147,7 +155,17 @@ int LoadStaticDir(const char *DirName, HashList *DirList, const char *RelDir)
                    (filedir_entry->d_name[1] == '.'))
                        continue;
 
-               switch (filedir_entry->d_type)
+               if (d_type == DT_UNKNOWN) {
+                       struct stat s;
+                       char path[PATH_MAX];
+                       snprintf(path, PATH_MAX, "%s/%s", 
+                               DirName, filedir_entry->d_name);
+                       if (stat(path, &s) == 0) {
+                               d_type = IFTODT(s.st_mode);
+                       }
+               }
+
+               switch (d_type)
                {
                case DT_DIR:
                        /* Skip directories we are not interested in... */
@@ -190,6 +208,7 @@ int LoadStaticDir(const char *DirName, HashList *DirList, const char *RelDir)
 
 
        }
+       free(d);
        closedir(filedir);
        FreeStrBuf(&Dir);
        FreeStrBuf(&WebDir);