Changeset 442 for EcnlProtoTool/trunk/ntshell/ntshell/core

Timestamp:

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

Author:

coas-nagasima

Message:

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

Location:

EcnlProtoTool/trunk/ntshell/ntshell/core

Files:

• ntshell.c (modified) (8 diffs)
• text_history.c (modified) (2 diffs)

EcnlProtoTool/trunk/ntshell/ntshell/core/ntshell.c

@@ -108 +108 @@
  * @param HANDLE A pointer of the handle.
  */
-#define PROMPT_WRITE(HANDLE)            SERIAL_WRITE((HANDLE), (HANDLE)->prompt, ntlibc_strlen((HANDLE)->prompt))
+#define PROMPT_WRITE(HANDLE)            SERIAL_WRITE((HANDLE), (HANDLE)->prompt, strlen((HANDLE)->prompt))
 
 /**
@@ -115 +115 @@
  * @param HANDLE A pointer of the handle.
  */
-#define PROMPT_NEWLINE(HANDLE)          SERIAL_WRITE((HANDLE), NTSHELL_PROMPT_NEWLINE, ntlibc_strlen(NTSHELL_PROMPT_NEWLINE))
+#define PROMPT_NEWLINE(HANDLE)          SERIAL_WRITE((HANDLE), NTSHELL_PROMPT_NEWLINE, strlen(NTSHELL_PROMPT_NEWLINE))
 
 /**
@@ -400 +400 @@
                                  * Found the suggestion.
                                  */
-                                int n = ntlibc_strlen((const char *)buf);
+                                int n = strlen((const char *)buf);
                                 VTSEND_ERASE_LINE(ntshell);
                                 VTSEND_CURSOR_HEAD(ntshell);
@@ -430 +430 @@
                          * Found the suggestion.
                          */
-                        int n = ntlibc_strlen((const char *)buf);
+                        int n = strlen((const char *)buf);
                         VTSEND_ERASE_LINE(ntshell);
                         VTSEND_CURSOR_HEAD(ntshell);
@@ -442 +442 @@
                          * Recall the previous input text string.
                          */
-                        int n = ntlibc_strlen(SUGGEST_SOURCE(ntshell));
+                        int n = strlen(SUGGEST_SOURCE(ntshell));
                         VTSEND_ERASE_LINE(ntshell);
                         VTSEND_CURSOR_HEAD(ntshell);
@@ -485 +485 @@
         UNUSED_VARIABLE(ch);
         text_editor_get_text(GET_EDITOR(ntshell), buf, sizeof(buf));
-        len = ntlibc_strlen((const char *)buf);
+        len = strlen((const char *)buf);
         VTSEND_CURSOR_HEAD(ntshell);
         PROMPT_WRITE(ntshell);
@@ -607 +607 @@
         p->func_callback = func_callback;
         p->extobj = extobj;
-        ntlibc_strcpy(p->prompt, NTSHELL_PROMPT_DEFAULT);
+        strcpy(p->prompt, NTSHELL_PROMPT_DEFAULT);
 
         p->vtrecv.user_data = p;
@@ -667 +667 @@
         }
 
-        ntlibc_strcpy(p->prompt, prompt);
+        strcpy(p->prompt, prompt);
 }
 

EcnlProtoTool/trunk/ntshell/ntshell/core/text_history.c

@@ -146 +146 @@
         char *buf, const int siz)
 {
-        const int text_len = ntlibc_strlen((const char *)text);
+        const int text_len = strlen((const char *)text);
         int found = 0;
         int i;
@@ -152 +152 @@
                 int target = (p->rp + i) % TEXTHISTORY_DEPTH;
                 char *txtp = p->history + (TEXTHISTORY_MAXLEN * target);
-                const int target_len = ntlibc_strlen((const char *)txtp);
+                const int target_len = strlen((const char *)txtp);
                 int comp_len = (target_len < text_len) ? target_len : text_len;
-                if ((ntlibc_strncmp(
+                if ((strncmp(
                         (const char *)txtp,
                         (const char *)text, comp_len) == 0) && (comp_len > 0)) {
                         if (found == index) {
-                                if (siz <= ntlibc_strlen(txtp)) {
+                                if (siz <= strlen(txtp)) {
                                         return -1;
                                 }
-                                ntlibc_strcpy((char *)buf, (char *)txtp);
+                                strcpy((char *)buf, (char *)txtp);
                                 return 0;
                         }