Changeset 364 for asp3_tinet_ecnl_rx/trunk/ntshell/src/netcmd.c

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/ntshell/src/netcmd.c (modified) (6 diffs)

asp3_tinet_ecnl_rx/trunk/ntshell/src/netcmd.c

@@ -239 +239 @@
 int usrcmd_ping(int argc, char **argv)
 {
-        int     tmo, size;
-        char    apip = DEFAULT_API_PROTO;
+        int tmo = 3, size = 64;
+        char apip = DEFAULT_API_PROTO;
         char *line = argv[1];
 #if defined(SUPPORT_INET6)
@@ -262 +262 @@
 
 #if defined(SUPPORT_INET6) && defined(SUPPORT_INET4)
+        if (argc <= 2)
+                return 0;
+
         if ('0' <= *line && *line <= '9') {
                 if (*line == '6')
@@ -269 +272 @@
                 line++;
         }
+
+        line = argv[2];
+#else
+        if (argc <= 1)
+                return 0;
 #endif  /* of #if defined(SUPPORT_INET6) && defined(SUPPORT_INET4) */
 
@@ -276 +284 @@
         }
 
-        line = argv[2];
-        if ('0' <= *line && *line <= '9')
-                line = get_int(&tmo, line);
-        else
-                tmo = 3;
-
-        line = argv[3];
-        if ('0' <= *line && *line <= '9')
-                line = get_int(&size, line);
-        else
-                size = 64;
+        if (argc > 2) {
+                line = argv[2];
+                if ('0' <= *line && *line <= '9')
+                        line = get_int(&tmo, line);
+
+                if (argc > 3) {
+                        line = argv[3];
+                        if ('0' <= *line && *line <= '9')
+                                line = get_int(&size, line);
+                }
+        }
 
 #if defined(SUPPORT_INET6)
@@ -337 +345 @@
 {
         ER ret;
+
+        if (argc < 2)
+                return 0;
+
         if (ntlibc_strcmp(argv[1], "rel") == 0) {
                 ret = dhcp4c_rel_info();
@@ -348 +360 @@
                 dhcp4c_info();
         }
+
         return 0;
 }