add listdir

base/hbase.c

@@ -99,6 +99,7 @@ char* safe_strncpy(char* dest, const char* src, size_t n) {
     while (*src != '\0' && --n > 0) {
         *dest++ = *src++;
     }
+    *dest = '\0';
     return ret;
 }
 
@@ -110,6 +111,7 @@ char* safe_strncat(char* dest, const char* src, size_t n) {
     while (*src != '\0' && --n > 0) {
         *dest++ = *src++;
     }
+    *dest = '\0';
     return ret;
 }
 

base/hdef.h

@@ -275,7 +275,7 @@ typedef std::map<std::string, std::string> keyval_t;
 #define BEGIN_NAMESPACE(ns)
 #define END_NAMESPACE(ns)
 
-#define EXTERN_C
+#define EXTERN_C    extern
 #define BEGIN_EXTERN_C
 #define END_EXTERN_C
 

base/hdir.cpp

@@ -0,0 +1,90 @@
+#include "hdir.h"
+
+#include <string.h>
+
+#include "hplatform.h"
+#include "hbase.h"
+
+#ifdef OS_WIN
+//FILETIME starts from 1601-01-01 UTC, epoch from 1970-01-01 UTC
+//FILETIME unit (100ns)
+#define FILETIME_EPOCH_DIFF     11644473600 // s
+time_t FileTime2Epoch(FILETIME filetime) {
+    uint64_t ll = (((uint64_t)filetime.dwHighDateTime) << 32) | filetime.dwLowDateTime;
+    ll /= 1e7; // s
+    return ll - FILETIME_EPOCH_DIFF;
+}
+#endif
+
+static bool less(const hdir_t& lhs, const hdir_t& rhs) {
+    return stricmp(lhs.name, rhs.name) < 0;
+}
+
+int listdir(const char* dir, std::list<hdir_t>& dirs) {
+    int dirlen = strlen(dir);
+    if (dirlen > 256) {
+        return -1;
+    }
+    char path[512];
+    strcpy(path, dir);
+    if (dir[dirlen-1] != '/') {
+        strcat(path, "/");
+        ++dirlen;
+    }
+    dirs.clear();
+#ifdef OS_UNIX
+    // opendir -> readdir -> closedir
+    DIR* dp = opendir(dir);
+    if (dp == NULL) return -1;
+    struct dirent  de;
+    struct dirent* result = NULL;
+    struct stat st;
+    hdir_t tmp;
+    while (readdir_r(dp, &de, &result) == 0 && result) {
+        memset(&tmp, 0, sizeof(hdir_t));
+        safe_strncpy(tmp.name, result->d_name, sizeof(tmp.name));
+        safe_strncpy(path+dirlen, result->d_name, sizeof(path)-dirlen);
+        if (lstat(path, &st) == 0) {
+            if (S_ISREG(st.st_mode))        tmp.type = 'f';
+            else if (S_ISDIR(st.st_mode))   tmp.type = 'd';
+            else if (S_ISLNK(st.st_mode))   tmp.type = 'l';
+            else if (S_ISBLK(st.st_mode))   tmp.type = 'b';
+            else if (S_ISCHR(st.st_mode))   tmp.type = 'c';
+            else if (S_ISSOCK(st.st_mode))  tmp.type = 's';
+            else if (S_ISFIFO(st.st_mode))  tmp.type = 'p';
+            else                            tmp.type = '-';
+            tmp.size = st.st_size;
+            tmp.atime = st.st_atime;
+            tmp.mtime = st.st_mtime;
+            tmp.ctime = st.st_ctime;
+        }
+        dirs.push_back(tmp);
+    }
+    closedir(dp);
+#elif defined(OS_WIN)
+    // FindFirstFile -> FindNextFile -> FindClose
+    strcat(path, "*");
+    WIN32_FIND_DATA data;
+    HANDLE h = FindFirstFile(path, &data);
+    if (h == NULL) {
+        return -1;
+    }
+    hdir_t tmp;
+    do {
+        memset(&tmp, 0, sizeof(hdir_t));
+        safe_strncpy(tmp.name, data.cFileName, sizeof(tmp.name));
+        tmp.type = 'f';
+        if (data.dwFileAttributes & _A_SUBDIR) {
+            tmp.type = 'd';
+        }
+        tmp.size = (((uint64_t)data.nFileSizeHigh) << 32) | data.nFileSizeLow;
+        tmp.atime = FileTime2Epoch(data.ftLastAccessTime);
+        tmp.mtime = FileTime2Epoch(data.ftLastWriteTime);
+        tmp.ctime = FileTime2Epoch(data.ftCreationTime);
+        dirs.push_back(tmp);
+    } while (FindNextFile(h, &data));
+    FindClose(h);
+#endif
+    dirs.sort(less);
+    return dirs.size();
+}

base/hdir.h

@@ -0,0 +1,51 @@
+#ifndef HW_DIR_H_
+#define HW_DIR_H_
+
+/*
+ *@code
+int main(int argc, char* argv[]) {
+    const char* dir = ".";
+    if (argc > 1) {
+        dir = argv[1];
+    }
+    std::list<hdir_t> dirs;
+    listdir(dir, dirs);
+    for (auto& item : dirs) {
+        printf("%c\t", item.type);
+        float hsize = item.size / 1024.0f;
+        if (hsize < 1.0f) {
+            printf("%lu\t", item.size);
+        }
+        else if (hsize > 1024.0f) {
+            printf("%.02fM\t", hsize/1024.0f);
+        }
+        else {
+            printf("%.02fK\t", hsize);
+        }
+        struct tm* tm = localtime(&item.mtime);
+        printf("%04d-%02d-%02d %02d:%02d:%02d\t%s\n",
+                tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec,
+                item.name);
+    }
+    return 0;
+}
+*/
+
+#include <string.h>
+#include <time.h>
+
+#include <list>
+
+typedef struct hdir_s {
+    char    name[256];
+    char    type; // f:file d:dir l:link b:block c:char s:socket p:pipe
+    size_t  size;
+    time_t  atime;
+    time_t  mtime;
+    time_t  ctime;
+} hdir_t;
+
+// listdir: same as ls on unix, dir on win
+int listdir(const char* dir, std::list<hdir_t>& dirs);
+
+#endif // HW_DIR_H_

winbuild/libhw/libhw.vcxproj

@@ -138,6 +138,7 @@
     <ClInclude Include="..\..\base\hbase.h" />
     <ClInclude Include="..\..\base\hbuf.h" />
     <ClInclude Include="..\..\base\hdef.h" />
+    <ClInclude Include="..\..\base\hdir.h" />
     <ClInclude Include="..\..\base\heap.h" />
     <ClInclude Include="..\..\base\herr.h" />
     <ClInclude Include="..\..\base\hfile.h" />
@@ -195,6 +196,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\base\hbase.c" />
+    <ClCompile Include="..\..\base\hdir.cpp" />
     <ClCompile Include="..\..\base\herr.c" />
     <ClCompile Include="..\..\base\hlog.c" />
     <ClCompile Include="..\..\base\hsocket.c" />
@@ -214,7 +216,6 @@
     <ClCompile Include="..\..\event\overlapio.c" />
     <ClCompile Include="..\..\event\poll.c" />
     <ClCompile Include="..\..\event\select.c" />
-    <ClCompile Include="..\..\http\client\http_client.cpp" />
     <ClCompile Include="..\..\http\HttpParser.cpp" />
     <ClCompile Include="..\..\http\http_content.cpp" />
     <ClCompile Include="..\..\http\http_parser.c" />