Changeset 155 for uKadecot/trunk/uip/apps/webserver/httpd-fs.c

Timestamp:

Feb 4, 2016, 11:11:09 PM (8 years ago)

Author:

coas-nagasima

Message:

URLがフォルダを指している場合、/index.htmlにリダイレクトするよう変更。

File:

• uKadecot/trunk/uip/apps/webserver/httpd-fs.c (modified) (5 diffs)

uKadecot/trunk/uip/apps/webserver/httpd-fs.c

@@ -40 +40 @@
 #include "mmc_rspi.h"
 #include <string.h>
+#include "http-strings.h"
+
+#ifndef _MSC_VER
+#ifndef strcat_s
+#define strcat_s(dst, dsz, src) strcat(dst, src)
+#endif
+#endif
 
 //#define FILE_DUMP
@@ -114 +121 @@
 /*-----------------------------------------------------------------------------------*/
 int
-httpd_fs_open(int drv, const char *name, struct httpd_fs_file *file)
+httpd_fs_open(int drv, char *name, int len, struct httpd_fs_file *file)
 {
         FRESULT res;
-        FATFS *fs = (FATFS *)file->fs;
+        FATFS *fs = (FATFS *)&file->fs;
+        FILINFO fno;
+        DIR dir;
 
         file->pos = 0;
@@ -123 +132 @@
         file->drv = drv;
         file->name = name;
+        file->redirect = 0;
         memset(fs, 0, sizeof(FATFS));
 
@@ -143 +153 @@
         }
 
-        if((res = pf_open(fs, name)) != FR_OK){
-                printf("pf_open(%d:%s) => %d\n", drv, name, res);
-                return 0;
+        if ((res = pf_open(fs, name)) != FR_OK) {
+                dir.fs = fs;
+                if ((res = pf_opendir(&dir, name)) != FR_OK) {
+                        printf("pf_opendir(%d:%s) => %d\n", drv, name, res);
+                        return 0;
+                }
+
+                if ((res = pf_readdir(&dir, &fno)) != FR_OK) {
+                        printf("pf_readdir(%d:%s) => %d\n", drv, name, res);
+                        return 0;
+                }
+
+                if (len != 0/*fno.fattrib & AM_DIR*/) {
+                        strcat_s(name, len, http_index_html);
+                        res = pf_open(fs, name);
+                        file->redirect = res == FR_OK;
+                }
+                else
+                        res = FR_NO_FILE;
+
+                if (res != FR_OK) {
+                        printf("pf_open(%d:%s) => %d %x\n", drv, name, res, fno.fattrib);
+                        return 0;
+                }
         }
 
@@ -160 +191 @@
         FRESULT ret;
         UINT rlen;
-        FATFS *fs = (FATFS *)file->fs;
+        FATFS *fs = (FATFS *)&file->fs;
 
         if((ret = pf_lseek(fs, file->pos)) != FR_OK){