Changeset 442 for EcnlProtoTool/trunk/ntshell/src/io_stub.c

Timestamp:

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

Author:

coas-nagasima

Message:

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

File:

• EcnlProtoTool/trunk/ntshell/src/io_stub.c (modified) (5 diffs)

EcnlProtoTool/trunk/ntshell/src/io_stub.c

@@ -36 +36 @@
  */
 #include "shellif.h"
-#include <stdint.h>
 #include "ff.h"
 #include <kernel.h>
@@ -42 +41 @@
 #include <t_stdlib.h>
 #include <sil.h>
-#include <string.h>
 #include "syssvc/serial.h"
 #include "syssvc/syslog.h"
 #include "fdtable.h"
-#include "util/ntstdio.h"
 #include "usrcmd.h"
 #include "core/ntlibc.h"
@@ -305 +302 @@
         fi.lfsize = sizeof lfn;
 #endif
-        if (ntlibc_strcmp(path, ".") == 0) {
+        if (strcmp(path, ".") == 0) {
                 char cwd[FF_MAX_LFN];
                 if ((ret = f_getcwd(cwd, sizeof(cwd))) != FR_OK) {
                         return fresult2errno(ret);
                 }
-                int l = ntlibc_strlen(cwd);
+                int l = strlen(cwd);
                 // ルートディレクトリの場合
                 if (cwd[l - 2] == ':' && cwd[l - 1] == '/') {
@@ -485 +482 @@
         memset(de, 0, sizeof(*de));
 #if FF_USE_LFN
-        ntlibc_strlcpy(de->d_name, *fno.lfname ? fno.lfname : fno.fname, sizeof(de->d_name));
+        strlcpy(de->d_name, *fno.lfname ? fno.lfname : fno.fname, sizeof(de->d_name));
 #else
-        ntlibc_strlcpy(de->d_name, fno.fname, sizeof(de->d_name));
+        strlcpy(de->d_name, fno.fname, sizeof(de->d_name));
 #endif
 
@@ -559 +556 @@
 pid_t shell_getpid(void)
 {
-        return 1;
+        return 2;
 }