Changeset 436 for EcnlProtoTool/trunk/ntshell/webserver/httpd-fs.c

Timestamp:

Jul 6, 2020, 9:22:43 PM (4 years ago)

Author:

coas-nagasima

Message:

ntstdio_snprintfの動作が間違っていたのを修正。
Webサーバーを更新

File:

• EcnlProtoTool/trunk/ntshell/webserver/httpd-fs.c (modified) (12 diffs)

EcnlProtoTool/trunk/ntshell/webserver/httpd-fs.c

@@ -1 +1 @@
 /*
- *  TOPPERS ECHONET Lite Communication Middleware
- *
- *  Copyright (C) 2017 Cores Co., Ltd. Japan
+ *  TOPPERS PROJECT Home Network Working Group Software
+ *
+ *  Copyright (C) 2017-2019 Cores Co., Ltd. Japan
  *
  *  上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -63 +63 @@
 #endif /* NULL */
 
+extern ntstdio_t ntstdio;
+
 /*-----------------------------------------------------------------------------------*/
 #ifdef FILE_DUMP
@@ -87 +89 @@
                         }
                         else {
-                                syslog(LOG_ERROR, "%s/%s\n", path, fn);
+                                ntstdio_printf(&ntstdio, "%s/%s\n", path, fn);
                         }
                 }
@@ -112 +114 @@
         if ((res = f_open(fd, name, FA_OPEN_EXISTING | FA_READ)) != FR_OK) {
                 if ((res = f_opendir(&dir, name)) != FR_OK) {
-                        syslog(LOG_ERROR, "f_opendir(%s) => %d\n", name, res);
+                        ntstdio_printf(&ntstdio, "f_opendir(%s) => %d\n", name, res);
                         return 0;
                 }
 
                 if ((res = f_readdir(&dir, &fno)) != FR_OK) {
-                        syslog(LOG_ERROR, "f_readdir(%s) => %d\n", name, res);
+                        ntstdio_printf(&ntstdio, "f_readdir(%s) => %d\n", name, res);
                         return 0;
                 }
@@ -130 +132 @@
 
                 if (res != FR_OK) {
-                        syslog(LOG_ERROR, "f_open(%s) => %d %x\n", name, res, fno.fattrib);
+                        ntstdio_printf(&ntstdio, "f_open(%s) => %d %x\n", name, res, fno.fattrib);
                         return 0;
                 }
@@ -137 +139 @@
         file->len = fd->fsize;
 
-        //syslog(LOG_ERROR, "httpd_fs_open(%d:%s) %d\n", drv, name, file->len);
+        //ntstdio_printf(&ntstdio, "httpd_fs_open(%s) %d\n", name, file->len);
 
         return 1;
@@ -156 +158 @@
 
         if ((res = f_open(fd, name, FA_CREATE_ALWAYS | FA_WRITE)) != FR_OK) {
-                syslog(LOG_ERROR, "f_open(%s) => %d\n", name, res);
+                ntstdio_printf(&ntstdio, "f_open(%s) => %d\n", name, res);
                 return 0;
         }
@@ -163 +165 @@
         file->len = 0;
 
-        //syslog(LOG_ERROR, "httpd_fs_create(%d:%s) %d\n", drv, name, file->len);
+        //ntstdio_printf(&ntstdio, "httpd_fs_create(%s) %d\n", file->name, file->len);
 
         return 1;
@@ -177 +179 @@
 
         if ((ret = f_lseek(fd, file->pos)) != FR_OK) {
-                syslog(LOG_ERROR, "f_lseek(%s, %d) => %d\n", file->name, file->pos, ret);
+                ntstdio_printf(&ntstdio, "f_lseek(%s, %d) => %d\n", file->name, file->pos, ret);
                 return 0;
         }
 
         if (file->pos != fd->fptr) {
-                syslog(LOG_ERROR, "f_lseek(%s, %d) != %d\n", file->name, file->pos, fd->fptr);
+                ntstdio_printf(&ntstdio, "f_lseek(%s, %d) != %d\n", file->name, file->pos, fd->fptr);
         }
 
         if ((ret = f_read(fd, dst, len, &rlen)) != FR_OK) {
-                syslog(LOG_ERROR, "f_read(%s, 0x%p, %d) => %d\n", file->name, dst, len, ret);
-                return 0;
-        }
-
-        //syslog(LOG_ERROR, "httpd_fs_read(%d:%s, %d, %d) => %d\n", file->drv, file->name, file->pos, len, rlen);
+                ntstdio_printf(&ntstdio, "f_read(%s, 0x%p, %d) => %d\n", file->name, dst, len, ret);
+                return 0;
+        }
+
+        //ntstdio_printf(&ntstdio, "httpd_fs_read(%s, %d, %d) => %d\n", file->name, file->pos, len, rlen);
 
         return rlen;
@@ -204 +206 @@
 
         if ((ret = f_lseek(fd, file->pos)) != FR_OK) {
-                syslog(LOG_ERROR, "f_lseek(%s, %d) => %d\n", file->name, file->pos, ret);
+                ntstdio_printf(&ntstdio, "f_lseek(%s, %d) => %d\n", file->name, file->pos, ret);
                 return 0;
         }
 
         if (file->pos != fd->fptr) {
-                syslog(LOG_ERROR, "f_lseek(%s, %d) != %d\n", file->name, file->pos, fd->fptr);
+                ntstdio_printf(&ntstdio, "f_lseek(%s, %d) != %d\n", file->name, file->pos, fd->fptr);
         }
 
         if ((ret = f_write(fd, src, len, &rlen)) != FR_OK) {
-                syslog(LOG_ERROR, "f_write(%s, 0x%p, %d) => %d\n", file->name, src, len, ret);
+                ntstdio_printf(&ntstdio, "f_write(%s, 0x%p, %d) => %d\n", file->name, src, len, ret);
                 return 0;
         }
@@ -220 +222 @@
         file->len += rlen;
 
-        //syslog(LOG_ERROR, "httpd_fs_write(%d:%s, %d, %d) => %d\n", file->drv, file->name, file->pos, len, rlen);
+        //ntstdio_printf(&ntstdio, "httpd_fs_write(%s, %d, %d) => %d\n", file->name, file->pos, len, rlen);
 
         return rlen;
@@ -232 +234 @@
 
         if ((ret = f_close(fd)) != FR_OK) {
-                syslog(LOG_ERROR, "f_close(%s) => %d\n", file->name, ret);
+                ntstdio_printf(&ntstdio, "f_close(%s) => %d\n", file->name, ret);
                 return 0;
         }