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

Timestamp:

Jul 13, 2020, 8:07:55 PM (4 years ago)

Author:

coas-nagasima

Message:

ntshellアプリはnewlibを使うよう変更し、syscallの実装部分と区別がつくよう更新。

File:

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

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

@@ -45 +45 @@
 #include "kernel_cfg.h"
 #include "syssvc/syslog.h"
-#include "util/ntstdio.h"
 
 #ifndef _MSC_VER
 #ifndef strcat_s
-#define strcat_s(dst, dsz, src) ntlibc_strcat(dst, src)
+#define strcat_s(dst, dsz, src) strcat(dst, src)
 #endif
 #endif
@@ -62 +61 @@
 #define NULL 0
 #endif /* NULL */
-
-extern ntstdio_t *ntstdio;
 
 /*-----------------------------------------------------------------------------------*/
@@ -77 +74 @@
         res = f_opendir(&dir, path);
         if (res == FR_OK) {
-                i = ntlibc_strlen(path);
+                i = strlen(path);
                 for (;;) {
                         res = f_readdir(&dir, &fno);
@@ -83 +80 @@
                         fn = fno.fname;
                         if (fno.fattrib & AM_DIR) {
-                                ntstdio_sprintf(&path[i], "0:/%s", fn);
+                                sprintf(&path[i], "0:/%s", fn);
                                 res = scan_files(path, size);
                                 if (res != FR_OK) break;
@@ -89 +86 @@
                         }
                         else {
-                                ntstdio_printf(ntstdio, "%s/%s\n", path, fn);
+                                printf("%s/%s\n", path, fn);
                         }
                 }
@@ -114 +111 @@
         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);
+                        printf("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);
+                        printf("f_readdir(%s) => %d\n", name, res);
                         return 0;
                 }
@@ -132 +129 @@
 
                 if (res != FR_OK) {
-                        ntstdio_printf(ntstdio, "f_open(%s) => %d %x\n", name, res, fno.fattrib);
+                        printf("f_open(%s) => %d %x\n", name, res, fno.fattrib);
                         return 0;
                 }
@@ -139 +136 @@
         file->len = fd->fsize;
 
-        //ntstdio_printf(ntstdio, "httpd_fs_open(%s) %d\n", name, file->len);
+        //printf("httpd_fs_open(%s) %d\n", name, file->len);
 
         return 1;
@@ -158 +155 @@
 
         if ((res = f_open(fd, name, FA_CREATE_ALWAYS | FA_WRITE)) != FR_OK) {
-                ntstdio_printf(ntstdio, "f_open(%s) => %d\n", name, res);
+                printf("f_open(%s) => %d\n", name, res);
                 return 0;
         }
@@ -165 +162 @@
         file->len = 0;
 
-        //ntstdio_printf(ntstdio, "httpd_fs_create(%s) %d\n", file->name, file->len);
+        //printf("httpd_fs_create(%s) %d\n", file->name, file->len);
 
         return 1;
@@ -179 +176 @@
 
         if ((ret = f_lseek(fd, file->pos)) != FR_OK) {
-                ntstdio_printf(ntstdio, "f_lseek(%s, %d) => %d\n", file->name, file->pos, ret);
+                printf("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);
+                printf("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);
+                printf("f_read(%s, 0x%p, %d) => %d\n", file->name, dst, len, ret);
+                return 0;
+        }
+
+        //printf("httpd_fs_read(%s, %d, %d) => %d\n", file->name, file->pos, len, rlen);
 
         return rlen;
@@ -206 +203 @@
 
         if ((ret = f_lseek(fd, file->pos)) != FR_OK) {
-                ntstdio_printf(ntstdio, "f_lseek(%s, %d) => %d\n", file->name, file->pos, ret);
+                printf("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);
+                printf("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);
+                printf("f_write(%s, 0x%p, %d) => %d\n", file->name, src, len, ret);
                 return 0;
         }
@@ -222 +219 @@
         file->len += rlen;
 
-        //ntstdio_printf(ntstdio, "httpd_fs_write(%s, %d, %d) => %d\n", file->name, file->pos, len, rlen);
+        //printf("httpd_fs_write(%s, %d, %d) => %d\n", file->name, file->pos, len, rlen);
 
         return rlen;
@@ -234 +231 @@
 
         if ((ret = f_close(fd)) != FR_OK) {
-                ntstdio_printf(ntstdio, "f_close(%s) => %d\n", file->name, ret);
+                printf("f_close(%s) => %d\n", file->name, ret);
                 return 0;
         }