--- a/ffstools/tiffs-rd/ls.c	Sun Jan 26 19:03:33 2014 +0000
+++ b/ffstools/tiffs-rd/ls.c	Sun Jan 26 21:12:15 2014 +0000
@@ -33,7 +33,7 @@
 	size_head_chunk(inode_info[seghead_ino], &chi);
 	accum = chi.len;
 	iterate_seg_file(seghead_ino, segment_size_callback, (u_long) &accum,
-			 deleted);
+			 deleted, 0);
 	return(accum);
 }
 
@@ -45,7 +45,11 @@
 	struct chunkinfo chi;
 
 	size_extra_chunk(inf, &chi);
-	printf("seg #%04x length=%lu\n", inf->ino, (u_long) chi.len);
+	if (verbose2 > 1)
+		printf("seg #%04x @%08x length=%lu\n", inf->ino, inf->offset,
+			(u_long) chi.len);
+	else
+		printf("seg #%04x length=%lu\n", inf->ino, (u_long) chi.len);
 }
 
 ls_seg_file(seghead_ino, deleted)
@@ -54,12 +58,17 @@
 	struct chunkinfo chi;
 
 	size_head_chunk(inf, &chi);
-	printf("%lu bytes in seghead\n", (u_long) chi.len);
-	iterate_seg_file(seghead_ino, segment_ls_callback, 0L, deleted);
+	printf("%lu bytes in seghead", (u_long) chi.len);
+	if (verbose2 > 1)
+		printf(", starting at offset %lx",
+			(u_long)(inf->byte_after_name - image));
+	putchar('\n');
+	iterate_seg_file(seghead_ino, segment_ls_callback, 0L, deleted,
+			 verbose2 > 1);
 }
 
 void
-ls_callback(pathname, ino, depth)
+ls_tree_callback(pathname, ino, depth)
 	char *pathname;
 {
 	struct inode_info *inf = inode_info[ino];
@@ -94,28 +103,74 @@
 	}
 }
 
-ls_visible_tree()
+ls_by_pathname(pathname)
+	char *pathname;
 {
-	read_ffs_image();
-	find_inode_block();
-	alloc_inode_table();
-	find_root_inode();
-	traverse_visible_tree(ls_callback);
-	exit(0);
+	int ino;
+	struct inode_info *inf;
+	char *type;
+
+	printf("%s\n", pathname);
+	ino = find_pathname(pathname);
+	printf("inode #%x\n", ino);
+	inf = inode_info[ino];
+	switch (inf->type) {
+	case 0xE1:
+		type = "read-only file";
+		break;
+	case 0xF1:
+		type = "file";
+		break;
+	case 0xF2:
+		type = "directory";
+		break;
+	case 0xF3:
+		type = "symlink";
+		break;
+	default:
+		type = "???";
+	}
+	printf("object type %02X (%s)\n", inf->type, type);
+	if (!validate_obj_name(ino, ino == root_inode)) {
+		printf("No valid object name in the chunk!\n");
+		exit(1);
+	}
+	printf("object name: %s\n", inf->dataptr);
+	if (inf->type == 0xF1 || inf->type == 0xE1) {
+		printf("total size: %lu bytes\n",
+			(u_long) get_file_size(ino, 0));
+		if (verbose2)
+			ls_seg_file(ino, 0);
+	}
+	putchar('\n');
 }
 
 cmd_ls(argc, argv)
 	char **argv;
 {
-	char **ap;
+	extern int optind;
+	int c;
+
+	read_ffs_image();
+	find_inode_block();
+	alloc_inode_table();
+	find_root_inode();
 
-	ap = argv + 1;
-	if (*ap && !strcmp(*ap, "-v")) {
-		verbose2++;
-		ap++;
+	optind = 0;
+	while ((c = getopt(argc, argv, "v")) != EOF)
+		switch (c) {
+		case 'v':
+			verbose2++;
+			continue;
+		default:
+			fprintf(stderr, "usage: ls [-v[v]] [pathname...]\n");
+			exit(1);
+		}
+	if (optind >= argc) {
+		traverse_visible_tree(ls_tree_callback);
+		exit(0);
 	}
-	if (!*ap)
-		return ls_visible_tree();
-	fprintf(stderr, "ls of individual files not yet implemented\n");
-	exit(1);
+	for (; optind < argc; optind++)
+		ls_by_pathname(argv[optind]);
+	exit(0);
 }