# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1378082034 0
# Node ID 7029fe8ae0bc49a45448994ffea8f3739c474d97
# Parent  02ece4d8c755c086200464ec61fd3b9f2227b446
pirexplore: FFS find command implemented

diff -r 02ece4d8c755 -r 7029fe8ae0bc target-utils/libmpffs/Makefile
--- a/target-utils/libmpffs/Makefile	Sun Sep 01 21:55:51 2013 +0000
+++ b/target-utils/libmpffs/Makefile	Mon Sep 02 00:33:54 2013 +0000
@@ -4,7 +4,7 @@
 AR=	arm-elf-ar
 RANLIB=	arm-elf-ranlib
 
-OBJS=	globals.o init.o
+OBJS=	basicfind.o globals.o init.o
 
 all:	libmpffs.a
 
diff -r 02ece4d8c755 -r 7029fe8ae0bc target-utils/libmpffs/basicfind.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/target-utils/libmpffs/basicfind.c	Mon Sep 02 00:33:54 2013 +0000
@@ -0,0 +1,166 @@
+#include <sys/types.h>
+#include "types.h"
+#include "struct.h"
+#include "globals.h"
+#include "macros.h"
+
+extern char *index();
+
+static u8 *
+find_endofchunk(ino)
+{
+	struct inode *irec = mpffs_active_index + ino;
+	u8 *p;
+	int i;
+
+	p = inode_to_dataptr(irec) + irec->len;
+	for (i = 0; i < 16; i++) {
+		p--;
+		if (!*p)
+			return(p);
+		if (*p != 0xFF)
+			break;
+	}
+	printf("Error: inode #%x has no valid termination\n", ino);
+	return(p);	/* XXX */
+}
+
+static
+find_named_child(start, seekname)
+	char *seekname;
+{
+	int ino;
+	struct inode *irec;
+
+	for (ino = start; ino != 0xFFFF; ino = irec->sibling) {
+		irec = mpffs_active_index + ino;
+		if (!irec->type)
+			continue;
+		if (!strcmp(inode_to_dataptr(irec), seekname))
+			return(ino);
+	}
+	return(0);
+}
+
+mpffs_pathname_to_inode(pathname)
+	char *pathname;
+{
+	int ino, stat;
+	struct inode *irec;
+	char *cur, *next;
+
+	stat = mpffs_init();
+	if (stat < 0)
+		return(stat);
+	cur = pathname;
+	if (*cur == '/')
+		cur++;
+	for (ino = mpffs_root_ino; cur; cur = next) {
+		if (!*cur)
+			break;
+		next = index(cur, '/');
+		if (next == cur) {
+		    printf("malformed pathname: multiple adjacent slashes\n");
+			return(-1);
+		}
+		if (next)
+			*next++ = '\0';
+		irec = mpffs_active_index + ino;
+		if (irec->type != OBJTYPE_DIR) {
+			printf("Error: non-terminal non-directory\n");
+			if (next)
+				next[-1] = '/';
+			return(-1);
+		}
+		ino = find_named_child(irec->descend, cur);
+		if (next)
+			next[-1] = '/';
+		if (!ino) {
+			printf("Error: pathname component not found\n");
+			return(-1);
+		}
+	}
+	return(ino);
+}
+
+mpffs_find_file(pathname, startret, sizeret, continue_ret)
+	char *pathname;
+	u8 **startret;
+	size_t *sizeret;
+	int *continue_ret;
+{
+	int ino, cont;
+	struct inode *irec;
+	u8 *start, *end;
+	size_t size;
+
+	ino = mpffs_pathname_to_inode(pathname);
+	if (ino <= 0)
+		return(-1);
+	irec = mpffs_active_index + ino;
+	if (irec->type != OBJTYPE_FILE) {
+		printf("Error: %s is not a regular file\n", pathname);
+		return(-1);
+	}
+	start = inode_to_dataptr(irec);
+	start += strlen(start) + 1;
+	end = find_endofchunk(ino);
+	size = end - start;
+	if (size < 0)
+		size = 0;
+	cont = irec->descend;
+	if (cont == 0xFFFF)
+		cont = 0;
+	if (startret)
+		*startret = start;
+	if (sizeret)
+		*sizeret = size;
+	if (continue_ret)
+		*continue_ret = cont;
+	return(0);
+}
+
+mpffs_get_segment(ino, startret, sizeret, continue_ret)
+	int ino;
+	u8 **startret;
+	size_t *sizeret;
+	int *continue_ret;
+{
+	int cont;
+	struct inode *irec;
+	u8 *start, *end;
+	size_t size;
+
+	for (;;) {
+		irec = mpffs_active_index + ino;
+		if (irec->type)
+			break;
+		if (irec->sibling == 0xFFFF) {
+		    printf("Error: segment inode #%d: deleted and no sibling\n",
+				ino);
+			return(-1);
+		}
+		ino = irec->sibling;
+	}
+	if (irec->type != OBJTYPE_SEGMENT) {
+		printf("Error: inode #%x is not a segment\n", ino);
+		return(-1);
+	}
+	start = inode_to_dataptr(irec);
+	end = find_endofchunk(ino);
+	size = end - start;
+	if (size <= 0) {
+		printf("Error: segment inode #%x: bad length\n", ino);
+		return(-1);
+	}
+	cont = irec->descend;
+	if (cont == 0xFFFF)
+		cont = 0;
+	if (startret)
+		*startret = start;
+	if (sizeret)
+		*sizeret = size;
+	if (continue_ret)
+		*continue_ret = cont;
+	return(0);
+}
diff -r 02ece4d8c755 -r 7029fe8ae0bc target-utils/pirexplore/Makefile
--- a/target-utils/pirexplore/Makefile	Sun Sep 01 21:55:51 2013 +0000
+++ b/target-utils/pirexplore/Makefile	Mon Sep 02 00:33:54 2013 +0000
@@ -5,7 +5,7 @@
 OBJCOPY=arm-elf-objcopy
 
 PROG=	pirexplore
-OBJS=	crt0.o cmdtab.o ffsparam.o lcd.o main.o mygetchar.o rtc.o
+OBJS=	crt0.o cmdtab.o ffs.o ffsparam.o lcd.o main.o mygetchar.o rtc.o
 LIBS=	../libcommon/libcommon.a ../libmpffs/libmpffs.a ../libprintf/libprintf.a
 LDS=	../env/iram.lds
 
diff -r 02ece4d8c755 -r 7029fe8ae0bc target-utils/pirexplore/cmdtab.c
--- a/target-utils/pirexplore/cmdtab.c	Sun Sep 01 21:55:51 2013 +0000
+++ b/target-utils/pirexplore/cmdtab.c	Mon Sep 02 00:33:54 2013 +0000
@@ -2,6 +2,7 @@
 
 extern void cmd_baud_switch();
 extern void cmd_dieid();
+extern void cmd_find();
 extern void cmd_jump();
 extern void cmd_lcdfill();
 extern void cmd_lcdinit();
@@ -22,6 +23,7 @@
 	{"baud", cmd_baud_switch},
 	{"dieid", cmd_dieid},
 	{"ffsinit", mpffs_init},
+	{"find", cmd_find},
 	{"jump", cmd_jump},
 	{"lcdfill", cmd_lcdfill},
 	{"lcdinit", cmd_lcdinit},
diff -r 02ece4d8c755 -r 7029fe8ae0bc target-utils/pirexplore/ffs.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/target-utils/pirexplore/ffs.c	Mon Sep 02 00:33:54 2013 +0000
@@ -0,0 +1,25 @@
+#include <sys/types.h>
+#include "types.h"
+
+void
+cmd_find(argbulk)
+	char *argbulk;
+{
+	char *argv[2];
+	int stat, cont;
+	u8 *start;
+	size_t size;
+
+	if (parse_args(argbulk, 1, 1, argv, 0) < 0)
+		return;
+	stat = mpffs_find_file(argv[0], &start, &size, &cont);
+	if (stat < 0)
+		return;
+	printf("chunk @%08X size %x\n", (u32)start, (u32)size);
+	while (cont) {
+		stat = mpffs_get_segment(cont, &start, &size, &cont);
+		if (stat < 0)
+			return;
+		printf("chunk @%08X size %x\n", (u32)start, (u32)size);
+	}
+}