Add lcd and lls commands

Author: padelsbach

examples/sftpclient/sftpclient.c

@@ -358,6 +358,8 @@ static void ShowCommands(void)
     printf("\tcd  <string>                      change directory\n");
     printf("\tchmod <mode> <path>               change mode\n");
     printf("\tget <remote file> <local file>    pulls file(s) from server\n");
+    printf("\tlcd <path>                        change local directory\n");
+    printf("\tlls                               list local directory\n");
     printf("\tls                                list current directory\n");
     printf("\tmkdir <dir name>                  creates new directory on server\n");
     printf("\tput <local file> <remote file>    push file(s) to server\n");
@@ -731,6 +733,28 @@ static int doCmds(func_args* args)
             continue;
         }
 
+        /* lcd must be checked before cd so that WSTRNSTR
+         * does not match "cd" inside "lcd" */
+        if ((pt = WSTRNSTR(msg, "lcd", MAX_CMD_SZ)) != NULL) {
+            int sz;
+
+            pt += sizeof("lcd");
+            sz = (int)WSTRLEN(pt);
+
+            if (sz > 0 && pt[sz - 1] == '\n') {
+                pt[sz - 1] = '\0';
+            }
+
+            if (WCHDIR(ssh->fs, pt) != 0) {
+                if (SFTP_FPUTS(args,
+                        "Error changing local directory\n") < 0) {
+                    err_msg("fputs error");
+                    return -1;
+                }
+            }
+            continue;
+        }
+
         if ((pt = WSTRNSTR(msg, "cd", MAX_CMD_SZ)) != NULL) {
             WS_SFTP_FILEATRB atrb;
             int sz;
@@ -1071,6 +1095,68 @@ static int doCmds(func_args* args)
 
         }
 
+    #ifndef NO_WOLFSSH_DIR
+        /* lls must be checked before ls so that WSTRNSTR
+         * does not match "ls" inside "lls" */
+        if (WSTRNSTR(msg, "lls", MAX_CMD_SZ) != NULL) {
+            WDIR dir;
+            char cwd[WOLFSSH_MAX_FILENAME];
+            int llsErr = 0;
+
+            if (WGETCWD(ssh->fs, cwd, sizeof(cwd)) == NULL) {
+                if (SFTP_FPUTS(args,
+                        "Error getting local directory\n") < 0) {
+                    err_msg("fputs error");
+                    return -1;
+                }
+                continue;
+            }
+
+            if (WOPENDIR(ssh->fs, NULL, &dir, cwd) != 0) {
+                if (SFTP_FPUTS(args,
+                        "Error opening local directory\n") < 0) {
+                    err_msg("fputs error");
+                    return -1;
+                }
+                continue;
+            }
+
+        #ifdef WOLFSSH_ZEPHYR
+            {
+                struct fs_dirent dp;
+
+                while (fs_readdir(&dir, &dp) == 0 &&
+                        dp.name[0] != '\0') {
+                    if (SFTP_FPUTS(args, dp.name) < 0 ||
+                            SFTP_FPUTS(args, "\n") < 0) {
+                        err_msg("fputs error");
+                        llsErr = 1;
+                        break;
+                    }
+                }
+            }
+        #else
+            {
+                struct dirent* dp;
+
+                while ((dp = WREADDIR(ssh->fs, &dir)) != NULL) {
+                    if (SFTP_FPUTS(args, dp->d_name) < 0 ||
+                            SFTP_FPUTS(args, "\n") < 0) {
+                        err_msg("fputs error");
+                        llsErr = 1;
+                        break;
+                    }
+                }
+            }
+        #endif
+            WCLOSEDIR(ssh->fs, &dir);
+            if (llsErr) {
+                return -1;
+            }
+            continue;
+        }
+    #endif /* NO_WOLFSSH_DIR */
+
         if (WSTRNSTR(msg, "ls", MAX_CMD_SZ) != NULL) {
             WS_SFTPNAME* tmp;
             WS_SFTPNAME* current;

tests/sftp.c

@@ -61,13 +61,23 @@ static const char* cmds[] = {
 #endif
     "rm configure.ac",
     "cd ../",
+    "pwd",
     "ls",
     "rename test-get test-get-2",
     "rmdir a",
     "ls",
     "chmod 600 test-get-2",
     "rm test-get-2",
     "ls -s",
+    "cd /nonexistent_path_xyz",
+    "cd",
+#ifndef NO_WOLFSSH_DIR
+    "lls",
+    "lcd /tmp",
+    "lls",
+    "lcd /nonexistent_path_xyz",
+    "lcd",
+#endif
     "exit"
 };
 static int commandIdx = 0;
@@ -129,14 +139,71 @@ static int Expected(int command)
                 return 0;
             }
 
-        case 10:
-            return (WSTRNSTR(inBuf, "test-get", sizeof(inBuf)) == NULL);
+        case 10: /* pwd after cd ../ */
+            for (i = 0; i < (int)sizeof(inBuf); i++) {
+                if (inBuf[i] == '\n') {
+                    inBuf[i] = '\0';
+                    break;
+                }
+            }
+            if (WSTRLEN(inBuf) >= 2 &&
+                    inBuf[WSTRLEN(inBuf) - 1] == 'a' &&
+                    inBuf[WSTRLEN(inBuf) - 2] == '/') {
+                printf("pwd still in /a after cd ../: %s\n", inBuf);
+                return -1;
+            }
+            break;
+
+        case 11: /* ls after cd ../ */
+            return (WSTRNSTR(inBuf, "test-get",
+                        sizeof(inBuf)) == NULL);
+
+        case 14: /* ls after rmdir */
+            return (WSTRNSTR(inBuf, "test-get-2",
+                        sizeof(inBuf)) == NULL);
 
-        case 13:
-            return (WSTRNSTR(inBuf, "test-get-2", sizeof(inBuf)) == NULL);
+        case 17: /* ls -s */
+            return (WSTRNSTR(inBuf, "size in bytes",
+                        sizeof(inBuf)) == NULL);
 
-        case 16:
-            return (WSTRNSTR(inBuf, "size in bytes", sizeof(inBuf)) == NULL);
+        case 18: /* cd to nonexistent path */
+            if (WSTRNSTR(inBuf, "Error changing directory",
+                    sizeof(inBuf)) == NULL) {
+                fprintf(stderr,
+                    "cd: expected error not found in %s\n", inBuf);
+                return 1;
+            }
+            return 0;
+
+    #ifndef NO_WOLFSSH_DIR
+        case 20: /* lls from working directory */
+            if (WSTRNSTR(inBuf, "configure.ac",
+                    sizeof(inBuf)) == NULL) {
+                fprintf(stderr,
+                    "lls: configure.ac not found in %s\n", inBuf);
+                return 1;
+            }
+            return 0;
+
+        case 23: /* lcd to nonexistent path */
+            if (WSTRNSTR(inBuf, "Error changing local directory",
+                    sizeof(inBuf)) == NULL) {
+                fprintf(stderr,
+                    "lcd: expected error not found in %s\n", inBuf);
+                return 1;
+            }
+            return 0;
+
+        case 24: /* lcd with empty path */
+            if (WSTRNSTR(inBuf, "Error changing local directory",
+                    sizeof(inBuf)) == NULL) {
+                fprintf(stderr,
+                    "lcd: expected error on empty path in %s\n",
+                    inBuf);
+                return 1;
+            }
+            return 0;
+    #endif /* NO_WOLFSSH_DIR */
 
         default:
             break;