#include "timer.h"
#include "debug.h"
#include "env.h"
+#include "getopt-min.h"
/* TODO: use memory size test function (cmd_mem.c) */
#define MAX_MEMORY (1ul << 19)
FATFS *fs;
DWORD nfreeclst;
FRESULT res;
- char *path;
+ char *buf;
+ char *path = "";
struct stat_dat_s statp;
(void) cmdtp; (void) flag; (void) argc;
- path = (char *) malloc(BUFFER_SIZE);
- if (path == NULL) {
- printf_P(PSTR("fatstat: Out of Memory!\n"));
- free(path);
+ buf = (char *) malloc(BUFFER_SIZE);
+ if (buf == NULL) {
+ printf_P(PSTR("fat stat: Out of Memory!\n"));
return CMD_RET_FAILURE;
}
- res = f_getfree(argv[1], &nfreeclst, &fs);
+ if (argc > 1)
+ path = argv[1];
+ res = f_getfree(path, &nfreeclst, &fs);
if (!res) {
printf_P(PSTR(
"FAT type: %u\n"
fs->fatbase, fs->dirbase, fs->database);
#if _USE_LABEL
- TCHAR label[12];
DWORD serial;
- res = f_getlabel(argv[1], label, &serial);
+ res = f_getlabel(path, buf, &serial);
if (!res) {
printf_P(PSTR(
"Volume name: %s\n"
"Volume S/N: %04X-%04X\n"),
- label, (WORD)(serial >> 16), (WORD)(serial & 0xFFFF));
+ buf, (WORD)(serial >> 16), (WORD)(serial & 0xFFFF));
}
#endif
if (!res) {
my_puts_P(PSTR("\nCounting... "));
statp.AccSize = statp.AccFiles = statp.AccDirs = 0;
- strcpy(path, argv[1]);
+ strcpy(buf, path);
- res = scan_files(path, &statp);
+ res = scan_files(buf, &statp);
}
if (!res) {
printf_P(PSTR("\r%u files, %lu bytes.\n%u folders.\n"
}
}
- free(path);
+ free(buf);
if (res) {
put_rc(res);
return CMD_RET_FAILURE;
return CMD_RET_SUCCESS;
}
+#define MAX_PATHLEN 255
+
+ /* Remove trailing slashes,
+ * but keep a leading slash (absolute path)
+ */
+void strip_trailing_slash_relpath(char *p)
+{
+ int n = strlen(p);
+
+ if (n >= 2 && (p[0] & 0x38) == '0' && p[1] == ':') {
+ p += 2;
+ n -= 2;
+ }
+ if (n >= 1 && p[0] == '/') {
+ p++;
+ n--;
+ }
+ while (n-- != 0 && p[n] == '/')
+ p[n] = '\0';
+}
+
+int print_dirent(FILINFO *f)
+{
+ return 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);
+}
/*
* fatls path - Directory listing
FILINFO Finfo;
unsigned long p1;
unsigned int s1, s2;
- FRESULT res = FR_OK;
- char *buf;
-
+ FRESULT res;
(void) cmdtp; (void) flag; (void) argc;
- buf = (char *) malloc(BUFFER_SIZE);
- 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 */
- else
- strncpy(buf, argv[1], BUFFER_SIZE);
+ char *path = "";
+ if (argc > 1)
+ path = argv[1];
+ strip_trailing_slash_relpath(path);
- if (res == FR_OK)
- res = f_opendir(&Dir, buf);
- if (res != FR_OK) {
- free(buf);
- put_rc(res);
- return CMD_RET_FAILURE;
+ char *p = strrchr(path, '/');
+ if (p)
+ p++;
+ else {
+ p = path;
+ char *q = p;
+ if ((*q++ & 0x38) == '0' && *q++ == ':')
+ p = q;
+ }
+
+ char *pattern = NULL;
+ if (strpbrk_P(p, PSTR("*?")) ||
+ (f_stat(path, &Finfo) == FR_OK && !(Finfo.fattrib & AM_DIR))) {
+ pattern = strdup(p);
+ *p = '\0';
}
+ strip_trailing_slash_relpath(path);
+
+printf_P(PSTR("*: |%s| |%s|\n"), path ? path : "<NULL>", pattern ? pattern : "<NULL>");
p1 = s1 = s2 = 0;
- for(;;) {
- res = f_readdir(&Dir, &Finfo);
- if ((res != FR_OK) || !Finfo.fname[0])
- break;
+ res = f_findfirst(&Dir, &Finfo, path, pattern ? pattern : "*"); /* Start to search for files */
+ while (res == FR_OK && Finfo.fname[0]) {
if (Finfo.fattrib & AM_DIR) {
s2++;
} else {
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);
}
+ f_closedir(&Dir);
+ free(pattern);
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);
}
+ if (res) {
+ put_rc(res);
+ return CMD_RET_FAILURE;
+ }
+
+ return CMD_RET_SUCCESS;
+}
+
+command_ret_t do_tst(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ DIR Dir; /* Directory object */
+ FILINFO Finfo;
+ FRESULT res = FR_OK;
+ char *path;
+
+ (void) cmdtp; (void) flag;
+
+ printf_P(PSTR("sizeof DIR: %u, sizeof FIL: %u\n"), sizeof (DIR), sizeof (FILINFO));
+
+ char * buf = (char *) malloc(BUFFER_SIZE);
+ if (buf == NULL) {
+ printf_P(PSTR("pwd: Out of Memory!\n"));
+ free(buf);
+ return CMD_RET_FAILURE;
+ }
+ res = f_getcwd(buf, BUFFER_SIZE); /* Get current directory path */
+
+ if (!res) {
+ printf_P(PSTR("cwd: |%s|\n"), buf);
+ }
free(buf);
if (res) {
put_rc(res);
return CMD_RET_FAILURE;
}
+ if (argc > 1)
+ path = argv[1];
+ else
+ path = "";
+
+ printf_P(PSTR("arg: |%s|\n"), path);
+ printf_P(PSTR("==== f_stat: "));
+ res = f_stat(path, &Finfo);
+ put_rc(res);
+ if (res == FR_OK) {
+ print_dirent(&Finfo);
+ }
+
+ printf_P(PSTR("==== f_findfirst: "));
+ res = f_findfirst(&Dir, &Finfo, path, "*"); /* Start to search for files */
+ put_rc(res);
+ if (res == FR_OK) {
+ print_dirent(&Finfo);
+ }
+ f_closedir(&Dir);
+
+ printf_P(PSTR("==== f_opendir: "));
+ res = f_opendir(&Dir, path);
+ put_rc(res);
+ f_closedir(&Dir);
+
return CMD_RET_SUCCESS;
}
unsigned long pos;
unsigned long bytes_rw;
- bool dowrite = (argv[0][3] == 'w');
+ bool dowrite = (argv[0][0] == 'w');
FRESULT res = FR_OK;
bool buserr = 0;
uint32_t timer;
return CMD_RET_SUCCESS;
}
+/* ========================================================================== */
+
+
+typedef struct {
+ char *p_end; /* pointer to NULL at end of path */
+ char p_path[MAX_PATHLEN + 1]; /* pointer to the start of a path */
+} PATH_T;
+
+static inline void strip_trailing_slash(PATH_T *p)
+{
+ while (p->p_end > p->p_path && p->p_end[-1] == '/')
+ *--p->p_end = 0;
+}
+
+/*
+ * Move specified string into path. Convert "" to "." to handle BSD
+ * semantics for a null path. Strip trailing slashes.
+ */
+int
+path_set(PATH_T *p, char *string)
+{
+ if (strlen(string) > MAX_PATHLEN) {
+ //err("%s: name too long", string);
+ return(0);
+ }
+
+ (void)strcpy(p->p_path, string);
+ p->p_end = p->p_path + strlen(p->p_path);
+
+ if (p->p_path == p->p_end) {
+ *p->p_end++ = '.';
+ *p->p_end = 0;
+ }
+
+ strip_trailing_slash(p);
+ return(1);
+}
+
+#define R_FLAG (1<<0)
+#define I_FLAG (1<<1)
+#define N_FLAG (1<<2)
+#define F_FLAG (1<<3)
+#define P_FLAG (1<<4)
+#define V_FLAG (1<<5)
+
+command_ret_t do_cp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+
+ FRESULT fr; /* Return value */
+ DIR dj; /* Directory search object */
+ FILINFO fno; /* File information */
+
+ uint8_t flags = 0;
+
+
+ /* reset getopt() */
+ optind = 0;
+
+ int opt;
+ while ((opt = getopt(argc, argv, PSTR("Rrfip"))) != -1) {
+ switch (opt) {
+ case 'f':
+ flags &= I_FLAG;
+ break;
+ case 'i':
+ flags |= I_FLAG;
+ flags &= F_FLAG;
+ break;
+ case 'p':
+ flags |= P_FLAG;
+ break;
+ case 'R':
+ case 'r':
+ flags |= R_FLAG;
+ break;
+ case 'v':
+ flags |= V_FLAG;
+ break;
+ default:
+ return CMD_RET_USAGE;
+ break;
+ }
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (argc < 2)
+ return CMD_RET_USAGE;
+
+#if 0
+ /* consume last argument first. */
+ if (!path_set(&to, argv[--argc]))
+ exit(1);
+
+
+ if (flags & V_FLAG)
+ printf_P((PSTR("%s %s -> %s\n", badcp ? : "ERR:" : " ",
+ curr->fts_path, to.p_path);
+#endif
+
+/* Search a directory for objects and display it */
+
+
+ fr = f_findfirst(&dj, &fno, argv[1], argv[2]); /* Start to search for files */
+
+ while (fr == FR_OK && fno.fname[0]) { /* Repeat while an item is found */
+ printf_P(PSTR("%c%c%c%c%c %u/%02u/%02u %02u:%02u %9lu %s\n"),
+ (fno.fattrib & AM_DIR) ? 'D' : '-',
+ (fno.fattrib & AM_RDO) ? 'R' : '-',
+ (fno.fattrib & AM_HID) ? 'H' : '-',
+ (fno.fattrib & AM_SYS) ? 'S' : '-',
+ (fno.fattrib & AM_ARC) ? 'A' : '-',
+ (fno.fdate >> 9) + 1980, (fno.fdate >> 5) & 15, fno.fdate & 31,
+ (fno.ftime >> 11), (fno.ftime >> 5) & 63,
+ fno.fsize, fno.fname);
+ fr = f_findnext(&dj, &fno); /* Search for next item */
+ }
+
+ f_closedir(&dj);
+
+ return CMD_RET_SUCCESS;
+}
+
static
command_ret_t do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
"path"
),
CMD_TBL_ITEM(
- ls, 2, 1, do_ls,
+ ls, CONFIG_SYS_MAXARGS, 1, do_ls,
"Directory listing",
"path"
),
+CMD_TBL_ITEM(
+ tst, 2, 1, do_tst,
+ "FatFS test function",
+ "path"
+),
CMD_TBL_ITEM(
load, 5, 0, do_rw,
"load binary file from a dos filesystem",
" starting at address 'addr'.\n"
),
+CMD_TBL_ITEM(
+ cp, CONFIG_SYS_MAXARGS, 0, do_cp,
+ "copy files",
+ "cp [-R] [-f | -i | -n] [-aprv] source_file target_file\n"
+ " - \n"
+),
+
CMD_TBL_ITEM(
help, CONFIG_SYS_MAXARGS, 1, do_help,
"Print sub command description/usage",
projects / z180-stamp.git / commitdiff