X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/177aa6a61bf776a3095308439f2ffb7bed5bfb8c..7439a2b57aa403a4b4d0b5cf85095447bd9a3703:/avr/cmd_fat.c diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index fcae8b0..2d64251 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -9,6 +9,7 @@ */ #include "cmd_fat.h" +#include #include "ff.h" #include "z80-if.h" @@ -20,10 +21,19 @@ #include "debug.h" #include "env.h" + +#define DEBUG_FA 0 /* set to 1 to debug */ + +#define debug_fa(fmt, args...) \ + debug_cond(DEBUG_FA, 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 512 +#define BUFFER_SIZE FF_MAX_SS +#define PATH_MAX CONFIG_SYS_MAX_PATHLEN + /* * Multible (fat) partitions per physical drive are not supported, @@ -32,6 +42,10 @@ FATFS FatFs0; FATFS FatFs1; +command_ret_t command_ret; +char *cmdname; + + void setup_fatfs(void) { f_mount(&FatFs0, "0:", 0); @@ -98,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[] = { '-','\\','|','/' }; @@ -105,10 +131,88 @@ static void swirl(void) static uint32_t tstamp; if (get_timer(0) > tstamp) { - printf_P(PSTR("\b%c"), swirlchar[cnt]); - cnt = (cnt+1) % ARRAY_SIZE(swirlchar); tstamp = get_timer(0) + 250; + putchar('\b'); + cnt = (cnt+1) & 3; + putchar(swirlchar[cnt]); + } +} + +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; } /* @@ -120,20 +224,21 @@ 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")); - free(buf); 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) { + if (res == FR_OK) { puts(buf); } free(buf); - if (res) { + if (res != FR_OK) { put_rc(res); return CMD_RET_FAILURE; } @@ -148,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)); @@ -159,18 +266,20 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, } else arg = argv[1]; - if (arg[1] == ':') { - char drv[3]; - drv[2] = '\0'; - drv[1] = ':'; - drv[0] = arg[0]; - res = f_chdrive(drv); + 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) { - res = f_chdir(arg); + if (res == FR_OK) { + res = f_chdir(path->p_path); + debug_fa("### f_chdir(): p_path: '%s', res: %d\n", path->p_path, res); } - - if (res) { + free(path); + if (res != FR_OK) { put_rc(res); return CMD_RET_FAILURE; } @@ -193,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); @@ -344,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; @@ -379,14 +487,15 @@ command_ret_t do_stat(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int arg } #endif if (!res) { - my_puts_P(PSTR("\nCounting... ")); statp.AccSize = statp.AccFiles = statp.AccDirs = 0; strcpy(buf, path); + my_puts_P(PSTR("\nCounting... ")); res = scan_files(buf, &statp); + putchar('\r'); } if (!res) { - printf_P(PSTR("\r%u files, %lu bytes.\n%u folders.\n" + printf_P(PSTR("%u files, %lu bytes.\n%u folders.\n" "%lu KB total disk space.\n%lu KB available.\n"), statp.AccFiles, statp.AccSize, statp.AccDirs, (fs->n_fatent - 2) * (fs->csize / 2), nfreeclst * (fs->csize / 2) @@ -444,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; } @@ -527,22 +635,22 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED, int argc, cmd_tbl_t cmd_tbl_fat[] = { CMD_TBL_ITEM( - stat, 2, CTBL_RPT, do_stat, + status, 2, CTBL_RPT, do_stat, "Show logical drive status", "dev" ), CMD_TBL_ITEM( - pwd, 2, CTBL_RPT, do_pwd, + pwd, 2, CTBL_RPT|CTBL_SUBCMDAUTO, do_pwd, "Print name of current/working directory", "" ), CMD_TBL_ITEM( - cd, 2, 0, do_cd, + cd, 2, 0|CTBL_SUBCMDAUTO, do_cd, "Change the current/working directory.", "path" ), CMD_TBL_ITEM( - ls, 2, CTBL_RPT, do_ls, + ls, 2, CTBL_RPT|CTBL_SUBCMDAUTO, do_ls, "Directory listing", "path" ), @@ -576,7 +684,7 @@ CMD_TBL_ITEM( /* This does not use the CMD_TBL_ITEM macro as ? can't be used in symbol names */ {FSTR("?"), CONFIG_SYS_MAXARGS, 1, do_help, - FSTR("Alias for 'help'"), + NULL, #ifdef CONFIG_SYS_LONGHELP FSTR(""), #endif /* CONFIG_SYS_LONGHELP */