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

Timestamp:

Jul 10, 2020, 9:09:25 PM (4 years ago)

Author:

coas-nagasima

Message:

NTShellタスクを更新

File:

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

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

@@ -63 +63 @@
 #endif /* NULL */
 
-extern ntstdio_t ntstdio;
+extern ntstdio_t *ntstdio;
 
 /*-----------------------------------------------------------------------------------*/
@@ -89 +89 @@
                         }
                         else {
-                                ntstdio_printf(&ntstdio, "%s/%s\n", path, fn);
+                                ntstdio_printf(ntstdio, "%s/%s\n", path, fn);
                         }
                 }
@@ -114 +114 @@
         if ((res = f_open(fd, name, FA_OPEN_EXISTING | FA_READ)) != FR_OK) {
                 if ((res = f_opendir(&dir, name)) != FR_OK) {
-                        ntstdio_printf(&ntstdio, "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) {
-                        ntstdio_printf(&ntstdio, "f_readdir(%s) => %d\n", name, res);
+                        ntstdio_printf(ntstdio, "f_readdir(%s) => %d\n", name, res);
                         return 0;
                 }
@@ -132 +132 @@
 
                 if (res != FR_OK) {
-                        ntstdio_printf(&ntstdio, "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;
                 }
@@ -139 +139 @@
         file->len = fd->fsize;
 
-        //ntstdio_printf(&ntstdio, "httpd_fs_open(%s) %d\n", name, file->len);
+        //ntstdio_printf(ntstdio, "httpd_fs_open(%s) %d\n", name, file->len);
 
         return 1;
@@ -158 +158 @@
 
         if ((res = f_open(fd, name, FA_CREATE_ALWAYS | FA_WRITE)) != FR_OK) {
-                ntstdio_printf(&ntstdio, "f_open(%s) => %d\n", name, res);
+                ntstdio_printf(ntstdio, "f_open(%s) => %d\n", name, res);
                 return 0;
         }
@@ -165 +165 @@
         file->len = 0;
 
-        //ntstdio_printf(&ntstdio, "httpd_fs_create(%s) %d\n", file->name, file->len);
+        //ntstdio_printf(ntstdio, "httpd_fs_create(%s) %d\n", file->name, file->len);
 
         return 1;
@@ -179 +179 @@
 
         if ((ret = f_lseek(fd, file->pos)) != FR_OK) {
-                ntstdio_printf(&ntstdio, "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) {
-                ntstdio_printf(&ntstdio, "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) {
-                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);
+                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;
@@ -206 +206 @@
 
         if ((ret = f_lseek(fd, file->pos)) != FR_OK) {
-                ntstdio_printf(&ntstdio, "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) {
-                ntstdio_printf(&ntstdio, "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) {
-                ntstdio_printf(&ntstdio, "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;
         }
@@ -222 +222 @@
         file->len += rlen;
 
-        //ntstdio_printf(&ntstdio, "httpd_fs_write(%s, %d, %d) => %d\n", 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;
@@ -234 +234 @@
 
         if ((ret = f_close(fd)) != FR_OK) {
-                ntstdio_printf(&ntstdio, "f_close(%s) => %d\n", file->name, ret);
+                ntstdio_printf(ntstdio, "f_close(%s) => %d\n", file->name, ret);
                 return 0;
         }