]> cloudbase.mooo.com Git - z180-stamp.git/blobdiff - avr/cmd_fat.c
add fat command mv
[z180-stamp.git] / avr / cmd_fat.c
index fdd05b447dd6c0a2a721208870ff6e5dfe117f1a..41821e11584d0a7fcde879fd3689d21f73a6a2be 100644 (file)
@@ -8,8 +8,8 @@
  * FAT filesystem commands
  */
 
+#include "common.h"
 #include "cmd_fat.h"
-#include <ctype.h>
 #include <time.h>
 uint32_t fat_time(const struct tm * timeptr);
 
@@ -21,30 +21,36 @@ uint32_t fat_time(const struct tm * timeptr);
 #include "timer.h"
 #include "debug.h"
 #include "env.h"
+#include "getopt-min.h"
 
 #define DEBUG_FA               0       /* set to 1 to debug */
+#define DEBUG_LS               0       /* set to 1 to debug */
+#define DEBUG_RM               0       /* set to 1 to debug */
+#define DEBUG_CP               0       /* set to 1 to debug */
 
 #define debug_fa(fmt, args...)                                                        \
        debug_cond(DEBUG_FA, fmt, ##args)
+#define debug_ls(fmt, args...)                                                        \
+       debug_cond(DEBUG_LS, fmt, ##args)
+#define debug_rm(fmt, args...)                                                        \
+       debug_cond(DEBUG_RM, fmt, ##args)
+#define debug_cp(fmt, args...)                                                        \
+       debug_cond(DEBUG_CP, fmt, ##args)
 
 
-/* TODO: use memory size test function (detect_ramsize() in cmd_loadihex.c) */
-/* TODO: detect_ramsize() should be moved to z80-if.c */
-#define MAX_MEMORY     CONFIG_SYS_RAMSIZE_MAX
-#define BUFFER_SIZE    FF_MAX_SS
-#define PATH_MAX       CONFIG_SYS_MAX_PATHLEN
+/* TODO: use memory size test function (z80_memsize_detect() ) */
+#define MAX_MEMORY             CONFIG_SYS_RAMSIZE_MAX
+#define BUFFER_SIZE            FF_MAX_SS
+#define CPY_BUF_SIZE   (2*FF_MAX_SS)
+#define PATH_MAX               CONFIG_SYS_MAX_PATHLEN
 
 
 /*
  * Multible (fat) partitions per physical drive are not supported,
  * but we have up to 2 sdcard slots.
  */
-FATFS FatFs0;
-FATFS FatFs1;
-
-command_ret_t command_ret;
-char *cmdname;
-
+static FATFS FatFs0;
+static FATFS FatFs1;
 
 void setup_fatfs(void)
 {
@@ -64,7 +70,8 @@ DWORD get_fattime (void)
 }
 
 
-static bool check_abort(void)
+static
+bool check_abort(void)
 {
        bool ret = ctrlc();
 
@@ -99,13 +106,13 @@ static const FLASH char * const FLASH rc_strings[] = {
                };
 
 
-
 const FLASH char * fat_rctostr(FRESULT rc)
 {
        return  rc < ARRAY_SIZE(rc_strings) ? rc_strings[rc] : PSTR(" Unknown Error");
 }
 
-static void swirl(void)
+static
+void swirl(void)
 {
        static const FLASH char swirlchar[] = { '-','\\','|','/' };
        static uint_fast8_t cnt;
@@ -119,83 +126,6 @@ static void swirl(void)
        }
 }
 
-typedef struct {
-       char *p_end;                            /* pointer to NULL at end of path */
-       char p_path[PATH_MAX + 1];      /* pointer to the start of a path */
-} PATH_T;
-
-
-static char *path_skip_heading(char *p)
-{
-       if (isdigit(p[0]) &&  p[1] == ':') {
-               p += 2;
-       } else {
-               char *q = p;
-               if (*q++ == '.') {
-                       if (*q == '.')
-                               ++q;
-                       if (*q == '\0' || *q == '/')
-                               p = q;
-               }
-               return p;
-       }
-       if (*p == '/')
-               ++p;
-
-       return p;
-}
-
-static void strip_trailing_slash(PATH_T *p)
-{
-       char *beg = path_skip_heading(p->p_path);
-       char *end = p->p_end;
-
-       while (end > beg && end[-1] == '/')
-               *--end = '\0';
-
-       p->p_end =end;
-}
-
-/*
- * Move specified string into path.  Convert "" to "." to handle BSD
- * semantics for a null path.  Strip trailing slashes.
- */
-static PATH_T *path_setup(char *string)
-{
-       if (strlen(string) > PATH_MAX) {
-               cmd_error(0, 0, PSTR("'%s': Name too long"), string);
-               return NULL;
-       }
-
-       PATH_T *p = (PATH_T *) malloc(sizeof *p);
-       if (p == NULL) {
-               cmd_error(0, ENOMEM, NULL);
-               return NULL;
-       }
-
-       strcpy(p->p_path, string);
-       size_t len = strlen(string);
-       if (len > 1 && p->p_path[1] == ':' && p->p_path[2] != '/') {
-               if (len < PATH_MAX) {
-                       memmove(p->p_path+3, p->p_path+2, len-1);
-                       p->p_path[2] = '/';
-                       len += 1;
-               } else {
-                       cmd_error(0, ENOMEM, NULL);
-                       return NULL;
-               }
-       }
-
-       p->p_end = p->p_path + len;
-       if (p->p_path == p->p_end) {
-               *p->p_end++ = '.';
-               *p->p_end = '\0';
-       }
-
-       strip_trailing_slash(p);
-       return p;
-}
-
 /*
  * pwd - Print current directory of the current drive.
  *
@@ -203,23 +133,15 @@ static PATH_T *path_setup(char *string)
 command_ret_t do_pwd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc UNUSED, char * const argv[] UNUSED)
 {
        FRESULT res;
-       char *buf;
+       TCHAR buf[PATH_MAX];
 
-       buf = (char *) malloc(PATH_MAX);
-       if (buf == NULL)
-               cmd_error(CMD_RET_FAILURE, ENOMEM, NULL);
-       *buf = '\0';
        res = f_getcwd(buf, PATH_MAX);  /* Get current directory path */
 
-       debug_fa("### f_getcwd():   buf: '%s', res: %d\n", buf, res);
-
-       if (res == FR_OK) {
-               puts(buf);
-       }
-       free(buf);
        if (res != FR_OK)
                cmd_error(CMD_RET_FAILURE, res, NULL);
 
+       puts(buf);
+
        return CMD_RET_SUCCESS;
 }
 
@@ -230,30 +152,23 @@ command_ret_t do_pwd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc
  */
 command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
-       char *arg;
+       TCHAR *path;
        FRESULT res = FR_OK;
 
        if (argc < 2) {
-               arg = getenv_str(PSTR(ENV_HOME));
-               if (arg == NULL) {
-                       cmd_error(CMD_RET_FAILURE, 0, PSTR("\"%S\" is not set"), PSTR(ENV_HOME));
+               path = getenv_str(PSTR(ENV_HOME));
+               if (path == NULL) {
+                       cmd_error(CMD_RET_FAILURE, 0, PSTR("\"%S\" not set"), PSTR(ENV_HOME));
                }
        } else
-               arg = argv[1];
+               path = argv[1];
 
-       PATH_T *path = path_setup(arg);
-       if (path == NULL)
-               return CMD_RET_FAILURE;
+       if (strlen(path) > 1 && path[1] == ':')
+               res = f_chdrive(path);
+
+       if (res == FR_OK)
+               res = f_chdir(path);
 
-       if (strlen(path->p_path) > 1 && path->p_path[1] == ':') {
-               res = f_chdrive(path->p_path);
-               debug_fa("### f_chdrive(): p_path: '%s', res: %d\n", path->p_path, res);
-       }
-       if (res == FR_OK) {
-               res = f_chdir(path->p_path);
-               debug_fa("### f_chdir():   p_path: '%s', res: %d\n", path->p_path, res);
-       }
-       free(path);
        if (res != FR_OK)
                cmd_error(CMD_RET_FAILURE, res, NULL);
 
@@ -261,6 +176,54 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc,
 }
 
 
+static
+void print_dirent(FILINFO *f)
+{
+       printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu  %s\n"),
+                               (f->fattrib & AM_DIR) ? 'D' : '-',
+                               (f->fattrib & AM_RDO) ? 'R' : '-',
+                               (f->fattrib & AM_HID) ? 'H' : '-',
+                               (f->fattrib & AM_SYS) ? 'S' : '-',
+                               (f->fattrib & AM_ARC) ? 'A' : '-',
+                               (f->fdate >> 9) + 1980, (f->fdate >> 5) & 15, f->fdate & 31,
+                               (f->ftime >> 11), (f->ftime >> 5) & 63,
+                               f->fsize, f->fname);
+}
+
+char *path_split(char *p)
+{
+       if (isdigit(p[0]) && (p[1] == ':'))
+               p += 2;
+
+       char *ps = strrchr(p, '/');
+       if (ps) {
+               if (ps == p) {
+                       ++ps;
+                       memmove(ps+1, ps, strlen(ps)+1);
+               }
+               *ps++ = '\0';
+       }
+
+       return ps;
+}
+
+command_ret_t do_mkdir(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
+{
+       int ret = CMD_RET_SUCCESS;
+    FRESULT res;
+
+    if (argc < 1)
+               return CMD_RET_USAGE;
+
+    for (uint8_t i = 1; i < argc; i++) {
+        if ((res = f_mkdir(argv[i])) != FR_OK) {
+                       ret = CMD_RET_FAILURE;
+                       cmd_error(0, res, PSTR("cannot create directory '%s'"), argv[i]);
+               }
+    }
+    return ret;
+}
+
 /*
  * ls path - Directory listing
  *
@@ -268,100 +231,370 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc,
 command_ret_t do_ls(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
 {
        FATFS *fs;
-       DIR Dir;                                        /* Directory object */
-       FILINFO Finfo;
+       DIR dir;                                        /* Directory object */
+       FILINFO finfo;
        unsigned long p1;
        unsigned int s1, s2;
        FRESULT res = FR_OK;
-       char *buf;
+       char buf[PATH_MAX];
+       char *path = buf;
+       char *pattern;
 
 
-       buf = (char *) malloc(PATH_MAX);
-       if (buf == NULL)
-               cmd_error(CMD_RET_FAILURE, ENOMEM, NULL);
+       memset(buf, 0, PATH_MAX);
+       if (argc < 2) {
+               buf[0] = '.';
+       } else {
+               strncpy(path, argv[1], PATH_MAX-1);
+       }
+       pattern = path_split(path);
+       debug_ls("### path, pattern: '%s', '%s'\n", path[0] ? path : "<NULL>", pattern ? pattern : "<NULL>");
 
-       if (argc < 2)
-               res = f_getcwd(buf, PATH_MAX);  /* Get current directory path */
-       else
-               strncpy(buf, argv[1], PATH_MAX);
+       if (pattern == NULL) {
+        res = f_opendir(&dir, path);
+        if (res == FR_NO_PATH || res == FR_INVALID_NAME) {
+                       pattern = path;
+            path = ".";
+        } else if (res != FR_OK) {
+                       cmd_error(CMD_RET_FAILURE, res, PSTR("'%s'"), path);
+        }
+    }
+       debug_ls("### path, pattern: '%s', '%s'\n", path, pattern ? pattern : "<NULL>");
 
-       if (res == FR_OK)
-               res = f_opendir(&Dir, buf);
-       if (res != FR_OK) {
-               free(buf);
-               cmd_error(CMD_RET_FAILURE, res, NULL);
-       }
+    if (pattern == NULL || *pattern == '\0')
+               pattern = "*";
+
+       debug_ls("### path, pattern: '%s', '%s'\n", path, pattern ? pattern : "<NULL>");
+
+       res = f_findfirst(&dir, &finfo, path, pattern);
 
        p1 = s1 = s2 = 0;
        for(;;) {
-               res = f_readdir(&Dir, &Finfo);
-               if ((res != FR_OK) || !Finfo.fname[0])
+               if (res != FR_OK)
+                       cmd_error(CMD_RET_FAILURE, res, NULL);
+               if (!finfo.fname[0])
                        break;
-               if (Finfo.fattrib & AM_DIR) {
+               if (finfo.fattrib & AM_DIR) {
                        s2++;
                } else {
-                       s1++; p1 += Finfo.fsize;
+                       s1++; p1 += finfo.fsize;
                }
-               printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu  %s\n"),
-                                       (Finfo.fattrib & AM_DIR) ? 'D' : '-',
-                                       (Finfo.fattrib & AM_RDO) ? 'R' : '-',
-                                       (Finfo.fattrib & AM_HID) ? 'H' : '-',
-                                       (Finfo.fattrib & AM_SYS) ? 'S' : '-',
-                                       (Finfo.fattrib & AM_ARC) ? 'A' : '-',
-                                       (Finfo.fdate >> 9) + 1980, (Finfo.fdate >> 5) & 15, Finfo.fdate & 31,
-                                       (Finfo.ftime >> 11), (Finfo.ftime >> 5) & 63,
-                                       Finfo.fsize, Finfo.fname);
+               print_dirent(&finfo);
                if (check_abort())
                        break;
+               res = f_findnext(&dir, &finfo);
        }
 
        if (res == FR_OK) {
                printf_P(PSTR("%4u File(s),%10lu bytes total\n%4u Dir(s)"), s1, p1, s2);
-               if (f_getfree(buf, (DWORD*)&p1, &fs) == FR_OK)
+               if (f_getfree(path, (DWORD*)&p1, &fs) == FR_OK)
                        printf_P(PSTR(", %10luK bytes free\n"), p1 * fs->csize / 2);
        }
 
-       free(buf);
        if (res)
                cmd_error(CMD_RET_FAILURE, res, NULL);
 
        return CMD_RET_SUCCESS;
 }
 
-#if 0
-static
-FRESULT mkpath(TCHAR *path)
+
+typedef void (*fatfunc_t)(const TCHAR* path_old, const TCHAR* path_new);
+
+command_ret_t exit_val;
+uint8_t cmd_flags;
+#define I_FLAG (1<<1)  // prompt before overwrite (overrides a previous -n option)
+#define N_FLAG (1<<2)  // do not overwrite an existing file (overrides a previous -i option)
+#define F_FLAG (1<<3)  // overwrite existing file ignoring write protection
+#define P_FLAG (1<<4)  // preserve attributes and timestamps
+#define V_FLAG (1<<5)  // explain what is being done
+
+char* splitpath(const char* path)
+{
+    char* fs = strrchr(path, '/');
+    char* bs = strrchr(path, '\\');
+    if (fs > bs) {
+        *fs = '\0';
+        return fs + 1;
+    } else if (bs != NULL) {
+        *bs = '\0';
+        return bs + 1;
+    }
+    return NULL;
+}
+
+/*
+ * Copy File
+*/
+FRESULT copy_file(const TCHAR* src, const TCHAR* dst)
+{
+    FIL fsrc, fdst;
+    FRESULT res;
+
+       /* File copy buffer */
+       uint8_t *buffer = (uint8_t *) malloc(CPY_BUF_SIZE);
+       if (buffer == NULL) {
+               res = (FRESULT) ENOMEM;
+       } else {
+
+               /* Open source file */
+               res = f_open(&fsrc, src, FA_READ);
+               if (res == FR_OK) {
+
+                       /* Create destination file */
+                       res = f_open(&fdst, dst, FA_WRITE | FA_CREATE_NEW);
+                       if (res == FR_OK) {
+                               UINT br, bw;                                            /* File read/write count */
+
+                               /* Copy source to destination */
+                               for (;;) {
+                                       res = f_read(&fsrc, buffer, CPY_BUF_SIZE, &br); /* Read a chunk of source file */
+                                       if (res || br == 0)
+                                               break;                                          /* error or eof */
+                                       res = f_write(&fdst, buffer, br, &bw); /* Write it to the destination file */
+                                       if (res != FR_OK)
+                                               break;
+                                       if (bw < br) {
+                                               res = (FRESULT) EFULL;          /* disk full */
+                                               break;
+                                       }
+                               }
+
+debug_cp("==== copy() res: %d, br: %d, bw: %d\n", res, br, bw);
+                               f_close(&fdst);
+                               if (res != FR_OK)
+                                       f_unlink(dst);
+                       }
+                       f_close(&fsrc);
+               }
+               free(buffer);
+       }
+
+    return res;
+}
+
+void ff_remove(const TCHAR *file, const TCHAR *dest UNUSED)
 {
-       /* TODO: */
-       (void) path;
-       FILINFO fd
-       TCHAR *p, *q;
-       FRESULT ret;
-
-       res = f_stat (path, &fd)
-
-       p = strchr(path, ':');
-       if (p == NULL || *++p == '\0' || *p++ != '/')
-               return FR_OK;
-
-       while ((q = strchr(p, '/')) != NULL) {
-               *q = '\0';
-               ret = f_mkdir(path);
-               *q = '/';
-                       if (ret != FR_OK && ret != FR_EXIST)
-                               return ret;
-               p = q + 1;
+    FRESULT res = FR_OK;
+
+       debug_rm("==== ff_remove: '%s'\n", file);
+
+       if (!(cmd_flags & N_FLAG)) {
+               if ((res = f_unlink(file)) == FR_OK) {
+                       if (cmd_flags & V_FLAG)
+                               printf_P(PSTR("removed: '%s'\n"), file);
+               } else {
+                       cmd_error(0, res, PSTR("cannot remove '%s'"), file);
+               }
+       } else {
+               printf_P(PSTR("not removed: '%s'\n"), file);
        }
 
-       return FR_OK;
+       exit_val = (res != FR_OK);
+       return;
+}
+
+void ff_copy(const TCHAR* path_old, const TCHAR* path_new)
+{
+    FRESULT res;
+
+       debug_cp("==== ff_copy: '%s' --> '%s'\n", path_old, path_new);
+
+       if (cmd_flags & V_FLAG)
+               printf_P(PSTR("'%s' -> '%s'\n"), path_old, path_new);
+    if ((res = copy_file(path_old, path_new)) != FR_OK)
+               cmd_error(0, res, PSTR("error copying '%s' to '%s'"), path_old, path_new);
+
+       exit_val = (res != FR_OK);
+    return;
+}
+
+void ff_move(const TCHAR* path_old, const TCHAR* path_new)
+{
+    FRESULT res;
+
+       if (cmd_flags & V_FLAG)
+               printf_P(PSTR("'%s' -> '%s'\n"), path_old, path_new);
+    if ((res = f_rename(path_old, path_new)) != FR_OK)
+               cmd_error(0, res, PSTR("error copying '%s' to '%s'"), path_old, path_new);
+
+       exit_val = (res != FR_OK);
+    return;
+}
+
+void ff_iterate(fatfunc_t fatfunc, int count, char* const file[], char* dest)
+{
+    FRESULT res = 0;
+       DIR dir;
+       FILINFO finfo;
+    char srcpath[PATH_MAX], destpath[PATH_MAX];
+
+    uint8_t dest_is_dir = dest != NULL && f_stat(dest, &finfo) == FR_OK && finfo.fattrib & AM_DIR;
+    for (uint8_t i = 0; i < count; i++) {
+        char* pattern = NULL;
+        strcpy(srcpath, file[i]);
+        char* p1 = path_split(srcpath);
+
+        if (p1 != NULL) {
+                       pattern = (char *) malloc(strlen(p1)+1);
+                       strcpy(pattern, p1);
+               }
+        if (pattern != NULL) {
+            res = f_findfirst(&dir, &finfo, srcpath, pattern);
+                       p1 = srcpath+strlen(srcpath)-1;
+                               if (*p1++ != '/')
+                                       *(p1++) = '/';
+        } else {
+            res = f_findfirst(&dir, &finfo, ".", file[i]);
+            p1 = srcpath;
+               }
+               if ((res != FR_OK) || (finfo.fname[0] == 0))  {
+                       cmd_error(0, res, PSTR("'%s': no such file or directory"), file[i]);
+                       exit_val = CMD_RET_FAILURE;
+               } else {
+
+                       while (res == FR_OK && finfo.fname[0] != 0) {
+                               strcpy(p1, finfo.fname);
+                               if (dest != NULL) {
+                                       strcpy(destpath, dest);
+                                       if (dest_is_dir) {
+                                               strcat_P(destpath, PSTR("/"));
+                                               strcat(destpath, finfo.fname);
+                                       }
+                               }
+                               fatfunc(srcpath, destpath);
+                               res = f_findnext(&dir, &finfo);
+                       }
+                       if (res != FR_OK)
+                               cmd_error(CMD_RET_FAILURE, res, PSTR("error enumerating files"));
+               }
+        f_closedir(&dir);
+        free(pattern);
+    }
+}
+
+command_ret_t do_rm(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
+{
+       exit_val = CMD_RET_SUCCESS;
+       cmd_flags = 0;
+
+       int opt;
+       while ((opt = getopt(argc, argv, PSTR("nv"))) != -1) {
+               switch (opt) {
+                       case 'n':
+                               cmd_flags |=  N_FLAG;
+                               break;
+                       case 'v':
+                               cmd_flags |=  V_FLAG;
+                               break;
+                       default:
+                               return CMD_RET_USAGE;
+                               break;
+               }
+       }
+       argc -= optind;
+       argv += optind;
+
+       debug_rm("==== do_rm:     argc, argv[0]: %d, '%s'\n", argc, argv[0]);
+
+    if (argc < 1)
+               return CMD_RET_USAGE;
+
+    ff_iterate(ff_remove, argc, argv, NULL);
+
+       return exit_val;
+}
+
+command_ret_t do_cp_or_mv(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
+{
+       exit_val = CMD_RET_SUCCESS;
+       cmd_flags = 0;
+       fatfunc_t func = (argv[0][0] == 'c') ? ff_copy : ff_move;
+
+       int opt;
+       while ((opt = getopt(argc, argv, PSTR("v"))) != -1) {
+               switch (opt) {
+                       case 'v':
+                               cmd_flags |=  V_FLAG;
+                               break;
+                       default:
+                               return CMD_RET_USAGE;
+                               break;
+               }
+       }
+       argc -= optind;
+       argv += optind;
+
+       debug_cp("==== do_rm:     argc, argv[0]: %d, '%s'\n", argc, argv[0]);
+
+    if (argc < 2)
+               return CMD_RET_USAGE;
+
+    ff_iterate(func, argc - 1, argv, argv[argc - 1]);
+
+    return exit_val;
+}
+
+/*
+ * tst path - for debugging: test access with different functions
+ *
+ */
+command_ret_t do_tst(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, char * const argv[])
+{
+       DIR Dir;                                        /* Directory object */
+       FILINFO finfo;
+       FRESULT res = FR_OK;
+       char *path = "";
+       char *pattern = "*";
+
+       printf_P(PSTR("sizeof DIR: %u, sizeof FIL: %u\n"), sizeof (DIR), sizeof (FILINFO));
+
+       char * buf = (char *) malloc(BUFFER_SIZE);
+       if (buf == NULL) {
+               cmd_error(CMD_RET_FAILURE, ENOMEM, NULL);
+       }
+       res = f_getcwd(buf, BUFFER_SIZE);  /* Get current directory path */
+
+       if (!res) {
+               printf_P(PSTR("cwd: '%s'\n"), buf);
+       }
+       free(buf);
+       if (res)
+               cmd_error(CMD_RET_FAILURE, res, NULL);
+
+       if (argc > 1)
+               path = argv[1];
+       if (argc > 2)
+               pattern = argv[2];
+
+       printf_P(PSTR("arg: '%s' '%s'\n"), path, pattern);
+       printf_P(PSTR("==== f_stat:      "));
+       res = f_stat(path, &finfo);
+       cmd_error(0, res, NULL);
+       if (res == FR_OK) {
+               print_dirent(&finfo);
+       }
+
+       printf_P(PSTR("==== f_findfirst: "));
+       res = f_findfirst(&Dir, &finfo, path, pattern);  /* Start to search for files */
+       cmd_error(CMD_RET_FAILURE, res, NULL);
+       if (res == FR_OK) {
+               print_dirent(&finfo);
+       }
+       f_closedir(&Dir);
+
+       printf_P(PSTR("==== f_opendir:   "));
+       res = f_opendir(&Dir, path);
+       cmd_error(CMD_RET_FAILURE, res, NULL);
+       f_closedir(&Dir);
+
+       return CMD_RET_SUCCESS;
 }
-#endif
 
 /* Work register for fs command */
 struct stat_dat_s {
        DWORD AccSize;
        WORD  AccFiles, AccDirs;
-       FILINFO Finfo;
+       FILINFO finfo;
 };
 
 static
@@ -379,12 +612,12 @@ FRESULT scan_files (
        swirl();
        if (res == FR_OK) {
                i = strlen(path);
-               while (((res = f_readdir(&dirs, &statp->Finfo)) == FR_OK) &&
-                                       statp->Finfo.fname[0]) {
-                       if (FF_FS_RPATH && statp->Finfo.fname[0] == '.')
+               while (((res = f_readdir(&dirs, &statp->finfo)) == FR_OK) &&
+                                       statp->finfo.fname[0]) {
+                       if (FF_FS_RPATH && statp->finfo.fname[0] == '.')
                                continue;
-                       fn = statp->Finfo.fname;
-                       if (statp->Finfo.fattrib & AM_DIR) {
+                       fn = statp->finfo.fname;
+                       if (statp->finfo.fattrib & AM_DIR) {
                                statp->AccDirs++;
                                path[i] = '/';
                                strcpy(path+i+1, fn);
@@ -395,7 +628,7 @@ FRESULT scan_files (
                        } else {
                                //printf_P(PSTR("%s/%s\n"), path, fn);
                                statp->AccFiles++;
-                               statp->AccSize += statp->Finfo.fsize;
+                               statp->AccSize += statp->finfo.fsize;
                        }
                        if (check_abort()) {
                                res = 255;
@@ -608,11 +841,47 @@ CMD_TBL_ITEM(
        "Change the current/working directory.",
        "path"
 ),
+CMD_TBL_ITEM(
+       mkdir,          CONFIG_SYS_MAXARGS,     0,              do_mkdir,
+       "Create the DIRECTORY(ies), if they do not already exist.",
+       "DIRECTORY..."
+),
 CMD_TBL_ITEM(
        ls,             2,      CTBL_RPT|CTBL_SUBCMDAUTO,       do_ls,
        "Directory listing",
        "path"
 ),
+CMD_TBL_ITEM(
+       tst,    3,      CTBL_DBG|CTBL_RPT,      do_tst,
+       "FatFS test function",
+       "[path [pattern]]"
+),
+CMD_TBL_ITEM(
+       rm,             CONFIG_SYS_MAXARGS,     0,                      do_rm,
+       "Remove FILE(s) or empty DIRECTORY(ies)",
+       "[OPTION]... [FILE]...\n"
+       //"    -i prompt before removal\n"
+       "    -n do not remove\n"
+       "    -v explain what is being done"
+),
+CMD_TBL_ITEM(
+       cp,     CONFIG_SYS_MAXARGS,     0,      do_cp_or_mv,
+       "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.",
+       "[OPTION]... SOURCE... DEST\n"
+//     "    -f overwrite existing file ignoring write protection\n"
+//     "       this option is ignored when the -n option is also used\n"
+//     "    -i prompt before overwrite (overrides a previous -n option)\n"
+//     "    -n do not overwrite an existing file (overrides a previous -i option)\n"
+//     "    -p preserve attributes and timestamps\n"
+       "    -v explain what is being done"
+),
+CMD_TBL_ITEM(
+       mv,     CONFIG_SYS_MAXARGS,     0,      do_cp_or_mv,
+       "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.",
+       "[OPTION]... SOURCE DEST\n"
+       "    -v explain what is being done"
+),
+
 CMD_TBL_ITEM(
        load,   5,      0,      do_rw,
        "load binary file from a dos filesystem",