path functions (WIP)

[z180-stamp.git] / avr / cmd_fat.c

diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c
index d434cbded1f62a113a91ede3b44b5176b2f5745f..2d64251fbb2f2275ecf08b60ed770695b2ff4899 100644 (file)
--- a/avr/cmd_fat.c
+++ b/avr/cmd_fat.c
@@ -9,6 +9,7 @@
  */
 
 #include "cmd_fat.h"
+#include <ctype.h>
 
 #include "ff.h"
 #include "z80-if.h"
@@ -30,7 +31,9 @@
 /* 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    512
+#define BUFFER_SIZE    FF_MAX_SS
+#define PATH_MAX       CONFIG_SYS_MAX_PATHLEN
+
 
 /*
  * Multible (fat) partitions per physical drive are not supported,
@@ -39,6 +42,10 @@
 FATFS FatFs0;
 FATFS FatFs1;
 
+command_ret_t command_ret;
+char *cmdname;
+
+
 void setup_fatfs(void)
 {
        f_mount(&FatFs0, "0:", 0);
@@ -105,6 +112,18 @@ void put_rc (FRESULT rc)
 }
 
 
+void err(const char *fmt, ...)
+{
+       va_list ap;
+       va_start(ap, fmt);
+       printf_P(PSTR("fat %s: "), cmdname);
+       vfprintf_P(stdout, fmt, ap);
+       va_end(ap);
+       printf_P(PSTR("\n"));
+       _delay_ms(20);
+       command_ret = CMD_RET_FAILURE;
+}
+
 static void swirl(void)
 {
        static const FLASH char swirlchar[] = { '-','\\','|','/' };
@@ -119,6 +138,83 @@ 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) {
+               err(PSTR("'%s': name too long"), string);
+               return NULL;
+       }
+
+       PATH_T *p = (PATH_T *) malloc(sizeof *p);
+       if (p == NULL) {
+               err(PSTR("'%s': Out of Memory"), string);
+               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 {
+                       err(PSTR("'%s': Out of Memory"), string);
+                       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.
  *
@@ -128,13 +224,14 @@ command_ret_t do_pwd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc
        FRESULT res;
        char *buf;
 
-       buf = (char *) malloc(BUFFER_SIZE);
+       buf = (char *) malloc(PATH_MAX);
        if (buf == NULL) {
                printf_P(PSTR("pwd: Out of Memory!\n"));
                return CMD_RET_FAILURE;
        }
+       *buf = '\0';
+       res = f_getcwd(buf, PATH_MAX);  /* Get current directory path */
 
-       res = f_getcwd(buf, BUFFER_SIZE);  /* Get current directory path */
        debug_fa("### f_getcwd():   buf: '%s', res: %d\n", buf, res);
 
        if (res == FR_OK) {
@@ -156,7 +253,9 @@ 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;
-       FRESULT res = 0;
+       FRESULT res = FR_OK;
+
+       cmdname = argv[0];
 
        if (argc < 2) {
                arg = getenv_str(PSTR(ENV_HOME));
@@ -167,18 +266,19 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc,
        } else
                arg = argv[1];
 
-       if (strlen(arg) > 1 && arg[1] == ':') {
-               res = f_chdrive(arg);
-               debug_fa("### f_chdrive(): arg: '%s', res: %d\n", arg, res);
-               if (arg[2] == '\0') {
-                       arg[0] = '/';
-                       arg[1] = '\0';
-               }
+       PATH_T *path = path_setup(arg);
+       if (path == NULL)
+               return CMD_RET_FAILURE;
+
+       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(arg);
-               debug_fa("### f_chdir():   arg: '%s', res: %d\n", arg, res);
+               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) {
                put_rc(res);
                return CMD_RET_FAILURE;
@@ -202,17 +302,16 @@ command_ret_t do_ls(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc,
        char *buf;
 
 
-       buf = (char *) malloc(BUFFER_SIZE);
+       buf = (char *) malloc(PATH_MAX);
        if (buf == NULL) {
                printf_P(PSTR("pwd: Out of Memory!\n"));
-               free(buf);
                return CMD_RET_FAILURE;
        }
 
        if (argc < 2)
-               res = f_getcwd(buf, BUFFER_SIZE);  /* Get current directory path */
+               res = f_getcwd(buf, PATH_MAX);  /* Get current directory path */
        else
-               strncpy(buf, argv[1], BUFFER_SIZE);
+               strncpy(buf, argv[1], PATH_MAX);
 
        if (res == FR_OK)
                res = f_opendir(&Dir, buf);
@@ -353,7 +452,7 @@ command_ret_t do_stat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int arg
        char *path = "";
        struct stat_dat_s statp;
 
-       buf = (char *) malloc(BUFFER_SIZE);
+       buf = (char *) malloc(PATH_MAX);
        if (buf == NULL) {
                printf_P(PSTR("fat stat: Out of Memory!\n"));
                return CMD_RET_FAILURE;
@@ -454,7 +553,6 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc,
        buffer = (uint8_t *) malloc(BUFFER_SIZE);
        if (buffer == NULL) {
                printf_P(PSTR("fatstat: Out of Memory!\n"));
-               free(buffer);
                return CMD_RET_FAILURE;
        }