 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.14 2011/07/10 23:35:12 matt Exp $
+#	$NetBSD: Makefile,v 1.15 2011/12/25 06:09:08 tsutsui Exp $
 WARNS		?= 1
 NOMAN		=
 BINMODE		= 444
 S		= ${.CURDIR}/../../../..
 COMMON		= ${.CURDIR}/../common
 LIBSADIR	= ${S}/lib/libsa
 SYSVBFSDIR	= ${S}/fs/sysvbfs
 EWS4800MIPSDIR	= ${.CURDIR}/../../ews4800mips
 DEVDIR		= ${.CURDIR}/../../dev
 @@ -79,27 +79,28 @@ CPPFLAGS	+= -D__daddr_t=int32_t
 CLEANFILES	+= ${BINKERNEL_DUMMY_O} ${BINKERNEL_O}
 CLEANFILES	+= ${PROG} ${PROG}.elf ${PROG}.coff ${PROG}.tmp ${PROG}.dis
 CLEANFILES	+= ${COFFHDRFIX}
 CLEANFILES	+= ${BOOT_KERNEL} ${BOOT_KERNEL}.elf ${BOOT_KERNEL}.tmp
 CLEANFILES	+= ${BOOT_KERNEL}.gz ${BOOT_KERNEL}.gz.tmp
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN=	${KERNLIB}
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ=		${ZLIB}
-SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
+CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes SA_ENABLE_LS_OP=yes
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=		${SALIB}
 LIBS		= ${LIBSA} ${LIBZ} ${LIBKERN}
 # fixup GNU binutils file offset error.
 coffhdrfix:	${COMMON}/coffhdrfix.c
 	${HOST_CC} -o ${COFFHDRFIX} ${COMMON}/coffhdrfix.c
 clean cleandir distclean: .WAIT cleanlibdir
 cleanlibdir:
 	-rm -rf lib

 @@ -1,14 +1,14 @@
-/*	$NetBSD: devopen.c,v 1.4 2008/04/28 20:23:18 martin Exp $	*/
+/*	$NetBSD: devopen.c,v 1.5 2011/12/25 06:09:09 tsutsui Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -36,32 +36,28 @@
 #include <lib/libsa/dev_net.h>
 #include <lib/libsa/ufs.h>
 #include <lib/libsa/nfs.h>
 #include <lib/libsa/dev_net.h>
 #include <machine/sbd.h>
 #include "local.h"
 extern uint8_t kernel_binary[];
 extern int kernel_binary_size;
 extern struct fs_ops datafs_ops;
 extern struct fs_ops bfs_ops;
-struct fs_ops ufs_ops = {
+struct fs_ops ufs_ops = FS_OPS(ufs);
-	ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat
+struct fs_ops nfs_ops = FS_OPS(nfs);
 };
 struct fs_ops nfs_ops = {
 	nfs_open, nfs_close, nfs_read, nfs_write, nfs_seek, nfs_stat
 };
 extern struct devsw netdevsw;
 extern struct devsw dkdevsw;
 char fname[16];
 /* Referenced by libsa/open.c */
 struct fs_ops file_system[1];
 int nfsys = 1;
 struct devsw devsw[1];
 int ndevs = 1;
 int
 devopen(struct open_file *f, const char *request, char **file)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: diskutil.c,v 1.4 2008/04/28 20:23:18 martin Exp $	*/
+/*	$NetBSD: diskutil.c,v 1.5 2011/12/25 06:09:09 tsutsui Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -75,34 +75,32 @@ cmd_ls(int argc, char *argp[], int inter
 		return 1;
+	}
 	if (!read_vtoc())
 		return 1;
 	i = strtoul(argp[1], 0, 0);
 	if (i < 0 || i >= VTOC_MAXPARTITIONS)
 		return 1;
 	if (!device_attach(-1, -1, i))
 		return 1;
 	switch (fstype(i)) {
 	case FSTYPE_UFS:
 		ufs_ls("/");
 		break;
 	case FSTYPE_BFS:
 		bfs_ls();
 		break;
 	default:
-		return 1;
+		ls("/");
 		break;
+	}
 	return 0;
+}
 void
 bfs_ls(void)
+{
 	struct bfs *bfs;
 	struct bfs_dirent *file;
 	struct bfs_inode *inode;
 	int i;

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.boot,v 1.55 2011/08/22 09:43:08 mrg Exp $
+# $NetBSD: Makefile.boot,v 1.56 2011/12/25 06:09:09 tsutsui Exp $
 S=	${.CURDIR}/../../../../..
 NOMAN=
 PROG?= boot
 NEWVERSWHAT?= "BIOS Boot"
 VERSIONFILE?= ${.CURDIR}/../version
 AFLAGS.biosboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c
 SRCS= ${SOURCES}
 .if !make(depend)
 @@ -66,26 +66,27 @@ CPPFLAGS+= -DCONSPEED=boot_params.bp_con
 CPPFLAGS+= -DCONSADDR=boot_params.bp_consaddr
 CPPFLAGS+= -DCONSOLE_KEYMAP=boot_params.bp_keymap
 CPPFLAGS+= -DSUPPORT_CD9660
 CPPFLAGS+= -DSUPPORT_USTARFS
 CPPFLAGS+= -DSUPPORT_DOSFS
 CPPFLAGS+= -DSUPPORT_EXT2FS
 CPPFLAGS+= -DPASS_BIOSGEOM
 CPPFLAGS+= -DPASS_MEMMAP
 #CPPFLAGS+= -DBOOTPASSWD
 CPPFLAGS+= -DEPIA_HACK
 #CPPFLAGS+= -DDEBUG_MEMSIZE
 #CPPFLAGS+= -DBOOT_MSG_COM0
 CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
 # The biosboot code is linked to 'virtual' address of zero and is
 # loaded at physical address 0x10000.
 # XXX The heap values should be determined from _end.
 SAMISCCPPFLAGS+= -DHEAP_START=0x40000 -DHEAP_LIMIT=0x70000
 SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG_SUPPORT
 SAMISCMAKEFLAGS+= SA_USE_CREAD=yes	# Read compressed kernels
 SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no	# Netboot via TFTP, NFS
 .if defined(HAVE_GCC) || defined(HAVE_PCC)
 CPPFLAGS+=	-Wno-pointer-sign
 .endif
 @@ -103,26 +104,27 @@ CLEANFILES+= machine x86
 	-rm -f lib && ln -s ${LIBOBJ}/lib lib
 	mkdir -p ${LIBOBJ}/lib
 .endif
 .endif
 ### find out what to use for libi386
 I386DIR= ${I386_STAND_DIR}/lib
 .include "${I386DIR}/Makefile.inc"
 LIBI386= ${I386LIB}
 ### find out what to use for libsa
 SA_AS= library
 SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
 SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes"
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA= ${SALIB}
 ### find out what to use for libkern
 KERN_AS= library
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN= ${KERNLIB}
 ### find out what to use for libz
 Z_AS= library
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ= ${ZLIB}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot2.c,v 1.56 2011/11/28 07:56:54 tls Exp $	*/
+/*	$NetBSD: boot2.c,v 1.57 2011/12/25 06:09:09 tsutsui Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -399,27 +399,27 @@ command_help(char *arg)
 	       "multiboot [xdNx:][filename] [<args>]\n"
 	       "userconf {command}\n"
 	       "rndseed {path_to_rndseed_file}\n"
 	       "help|?\n"
 	       "quit\n");
+}
 void
 command_ls(char *arg)
+{
 	const char *save = default_filename;
 	default_filename = "/";
-	ufs_ls(arg);
+	ls(arg);
 	default_filename = save;
+}
 /* ARGSUSED */
 void
 command_quit(char *arg)
+{
 	printf("Exiting...\n");
 	delay(1000000);
 	reboot();
 	/* Note: we shouldn't get to this point! */
 	panic("Could not reboot!");

 @@ -1,46 +1,47 @@
-#	$NetBSD: Makefile,v 1.26 2011/05/20 22:29:55 joerg Exp $
+#	$NetBSD: Makefile,v 1.27 2011/12/25 06:09:09 tsutsui Exp $
 S=	${.CURDIR}/../../../..
 BASE= dosboot
 PROG= ${BASE}.com
 NOMAN=	# defined
 NEWVERSWHAT=	"DOS Boot"
 STARTFILE=	${DOSSTART}
 RELOC=		0x100
 AFLAGS.dosboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.start_dos.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 SRCS= main.c devopen.c exec.c
 CPPFLAGS+= -DSLOW	# for libz
 CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
 CPPFLAGS+= -DXMS
 CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
 #uncomment if there are problems with memory detection
 #CPPFLAGS+= -DCONSERVATIVE_MEMDETECT
 #CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
 # XXX should go into library
 SRCS+= getopt.c
 .PATH: ${.CURDIR}/../libsa
 # XXX these should depend on the size of the image
 CPPFLAGS+= -DSTACK_START=0x10000
 SAMISCCPPFLAGS+= -DHEAP_START=0x20000 -DHEAP_LIMIT=0x50000
-SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_INCLUDE_NET=no
+SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_INCLUDE_NET=no SA_ENABLE_LS_OP=yes
 I386MISCMAKEFLAGS= I386_INCLUDE_DOS=yes
 VERSIONFILE= ${.CURDIR}/version
 PIE_CFLAGS=
 PIE_LDFLAGS=
 PIE_AFLAGS=
 .include <bsd.own.mk>
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${BINMODE} dosboot.com \
 	    ${RELEASEDIR}/${MACHINE}/installation/misc

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.30 2010/12/20 01:12:44 jakllsch Exp $	 */
+/*	$NetBSD: main.c,v 1.31 2011/12/25 06:09:09 tsutsui Exp $	 */
 /*
  * Copyright (c) 1996, 1997
  * 	Matthias Drochner.  All rights reserved.
  * Copyright (c) 1996, 1997
  * 	Perry E. Metzger.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -313,32 +313,28 @@ command_help(char *arg)
 	       "boot [xdNx:][filename] [-acdqsv]\n"
 	       "     (ex. \"sd0a:netbsd.old -s\"\n"
 	       "ls [path]\n"
 	       "mode ufs|dos\n"
 	       "dev xd[N[x]]:\n"
 	       "help|?\n"
 	       "quit\n");
+}
 void
 command_ls(char *arg)
+{
 	char *help = default_filename;
 	if (strcmp(current_fsmode, "ufs")) {
 		printf("UFS only\n");
 		return;
 	default_filename = "/";
-	ufs_ls(arg);
+	ls(arg);
 	default_filename = help;
+}
 /* ARGSUSED */
 void
 command_quit(char *arg)
+{
 	printf("Exiting... goodbye...\n");
 	_rtt();
+}
 void
 command_boot(char *arg)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs.c,v 1.18 2011/06/16 13:27:59 joerg Exp $	*/
+/*	$NetBSD: nfs.c,v 1.19 2011/12/25 06:09:09 tsutsui Exp $	*/
 /*-
  *  Copyright (c) 1993 John Brezak
  *  All rights reserved.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
 @@ -620,13 +620,22 @@ nfs_stat(struct open_file *f, struct sta
 	ftype = ntohl(fp->fa.fa_type);
 	mode  = ntohl(fp->fa.fa_mode);
 	mode |= nfs_stat_types[ftype & 7];
 	sb->st_mode  = mode;
 	sb->st_nlink = ntohl(fp->fa.fa_nlink);
 	sb->st_uid   = ntohl(fp->fa.fa_uid);
 	sb->st_gid   = ntohl(fp->fa.fa_gid);
 	sb->st_size  = ntohl(fp->fa.fa_size);
 	return (0);
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 nfs_ls(struct open_file *f, const char *pattern)
+{
 	printf("Currently ls command is unsupported by nfs\n");
 	return;
+}
 #endif

 @@ -1,41 +1,43 @@
-# $NetBSD: Makefile.boot,v 1.4 2011/01/22 19:19:19 joerg Exp $
+# $NetBSD: Makefile.boot,v 1.5 2011/12/25 06:09:09 tsutsui Exp $
 PROG?=		boot
 NEWVERSWHAT?=	"Boot"
 VERSIONFILE?=	${.CURDIR}/../version
 SRCS=	boot.S boot2.c bootinfo.c conf.c devopen.c monitor.c
 SRCS+=	delay.c getsecs.c
 SRCS+=	bios.S
 SRCS+=	biosdisk.c biosdisk_ll.c
 SRCS+=	scifcons.c cons.c prf.c
 .if !make(depend)
 SRCS+=	vers.c
 .endif
 LDFLAGS+=	-e boot_start
 CFLAGS=
 CPPFLAGS=	-DSUPPORT_FFSv1
 CPPFLAGS+=	-DSUPPORT_FFSv2
 CPPFLAGS+=	-DSUPPORT_DOSFS
 CPPFLAGS+=	-DSUPPORT_USTARFS
 CPPFLAGS+=	-DDBMONITOR
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP
 #CPPFLAGS+=	-DDEBUG
 SAMISCMAKEFLAGS+="SA_USE_CREAD=yes"
 SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
 SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes"
 .include "../Makefile.bootprogs"
 LIBLIST=	${LIBSA} ${LIBZ} ${LIBKERN}
 CLEANFILES+=	${PROG}.sym ${PROG}.map vers.c
 vers.c: ${VERSIONFILE} ${SOURCES} ${.CURDIR}/../Makefile.boot
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
 	    ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
 ${PROG}: ${OBJS} ${LIBLIST}
 	${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${SECONDARY_LOAD_ADDRESS} \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot2.c,v 1.2 2011/01/22 19:19:19 joerg Exp $	*/
+/*	$NetBSD: boot2.c,v 1.3 2011/12/25 06:09:09 tsutsui Exp $	*/
 /*
  * Copyright (c) 2003
  *	David Laight.  All rights reserved
  * Copyright (c) 1996, 1997, 1999
  * 	Matthias Drochner.  All rights reserved.
  * Copyright (c) 1996, 1997
  * 	Perry E. Metzger.  All rights reserved.
  * Copyright (c) 1997
  *	Jason R. Thorpe.  All rights reserved
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -319,27 +319,27 @@ bootcmd_help(char *arg)
 	    "     (ex. \"hd0a:netbsd.old -s\"\n"
 	    "ls [path]\n"
 	    "help|?\n"
 	    "halt\n"
 	    "quit\n");
+}
 static void
 bootcmd_ls(char *arg)
+{
 	const char *save = default_filename;
 	default_filename = "/";
-	ufs_ls(arg);
+	ls(arg);
 	default_filename = save;
+}
 /* ARGSUSED */
 static void
 bootcmd_quit(char *arg)
+{
 	printf("Exiting...\n");
 	delay(1000);
 	reboot();
 	/* Note: we shouldn't get to this point! */
 	panic("Could not reboot!");

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.20 2011/04/12 14:07:35 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.21 2011/12/25 06:09:09 tsutsui Exp $
 NOMAN=		# defined
 .include <bsd.own.mk>
 BOOT=		Multi-boot
 VERSIONFILE=	${.CURDIR}/version
 VERSION!=	${TOOL_AWK} -F: '$$1 ~ /^[0-9.]*$$/ { it = $$1; } \
 			END { print it }' ${VERSIONFILE}
 NEWVERSWHAT=	"${BOOT}"
 # text address
 TEXT=		006000
 @@ -30,26 +30,27 @@ COMMONDIR=	$M/stand/common
 SRCS+=		vers.c
 CLEANFILES+=	vers.c
 vers.c:	${VERSIONFILE}
 	${_MKTARGET_CREATE}
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
 	    ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
 CPPFLAGS+=	-nostdinc -I$S -I${.OBJDIR} -I$M/stand/libsa
 CPPFLAGS+=	-I$M/stand/libiocs -I${COMMONDIR}
 CPPFLAGS+=	-D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=	-DTEXTADDR="0x${TEXT}"
 CPPFLAGS+=	-DBOOT=\"${BOOT}\" -DBOOT_VERS=\"${VERSION}\"
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP
 CFLAGS=		-Wno-main -Os -m68020-60
 LINKFLAGS=	-N -static -T ${.CURDIR}/boot.ldscript
 LIBIOCS!=	cd $M/stand/libiocs && ${PRINTOBJDIR}
 LIBSA!=		cd $M/stand/libsa && ${PRINTOBJDIR}
 L=		${LIBSA}/lib
 LDLIBS= 	${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
 LDLIBS+=	${LIBIOCS}/libiocs.a
 .include "../Makefile.booters"
 realall: ${PROG}
 ${PROG}:	${OBJS} ${LDLIBS}
 	${_MKTARGET_LINK}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: boot.c,v 1.16 2011/01/22 19:19:24 joerg Exp $	*/
+/*	$NetBSD: boot.c,v 1.17 2011/12/25 06:09:09 tsutsui Exp $	*/
 /*
  * Copyright (c) 2001 Minoura Makoto
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -43,27 +43,27 @@
 #define HEAP_START	((void*) 0x00080000)
 #define HEAP_END	((void*) 0x000fffff)
 #define EXSCSI_BDID	((void*) 0x00ea0001)
 #define SRAM_MEMSIZE	(*((long*) 0x00ed0008))
 char default_kernel[20] = "sd0a:netbsd";
 int mpu, hostadaptor;
 int console_device = -1;
 static void help(void);
 static int get_scsi_host_adapter(void);
 static void doboot(const char *, int);
 static void boot(char *);
-static void ls(char *);
+static void cmd_ls(char *);
 int bootmenu(void);
 void bootmain(int);
 extern int detectmpu(void);
 extern int badbaddr(void *);
 /* from boot_ufs/bootmain.c */
 static int
 get_scsi_host_adapter(void)
+{
 	char *bootrom;
 	int ha;
 	bootrom = (char *) (IOCS_BOOTINF() & 0x00ffffe0);
 @@ -191,43 +191,43 @@ boot(char *arg)
 			if (parseopts(p, &flags) == 0)
 				return;
 		} else if (*p != 0) {
 			help();
 			return;
+		}
 		doboot(filename, flags);
 		return;
+	}
+}
 static void
-ls(char *arg)
+cmd_ls(char *arg)
+{
 	char filename[80];
 	devopen_open_dir = 1;
 	if (*arg == 0) {
 		strcpy(filename, default_kernel);
 		strcpy(strchr(filename, ':')+1, "/");
 	} else if (strchr(arg, ':') == 0) {
 		strcpy(filename, default_kernel);
 		strcpy(strchr(filename, ':')+1, arg);
 	} else {
 		strcpy(filename, arg);
 		if (*(strchr(arg, ':')+1) == 0)
 			strcat(filename, "/");
+	}
-	ufs_ls(filename);
+	ls(filename);
 	devopen_open_dir = 0;
+}
 int
 bootmenu(void)
+{
 	char input[80];
 	int n = 5, c;
 	printf("Press return to boot now, any other key for boot menu\n");
 	printf("booting %s - starting in %d seconds. ",
 		default_kernel, n);
 	while (n-- > 0 && (c = awaitkey_1sec()) == 0) {
 @@ -256,27 +256,27 @@ bootmenu(void)
 		printf("> ");
 		gets(input);
 		for (p = &input[0]; p - &input[0] < 80 && *p == ' '; p++);
 		options = gettrailer(p);
 		if (strcmp("boot", p) == 0)
 			boot(options);
 		else if (strcmp("help", p) == 0 ||
 			 strcmp("?", p) == 0)
 			help();
 		else if ((strcmp("halt", p) == 0) ||(strcmp("reboot", p) == 0))
 			exit(0);
 		else if (strcmp("ls", p) == 0)
-			ls(options);
+			cmd_ls(options);
 		else
 			printf("Unknown command %s\n", p);
+	}
+}
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
 /*
  * Arguments from the boot block:
  *   bootdev - specifies the device from which /boot was read, in
  *		bootdev format.

 @@ -1,47 +1,48 @@
-#	$NetBSD: Makefile,v 1.27 2011/10/11 13:07:06 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.28 2011/12/25 06:09:09 tsutsui Exp $
 S=		${.CURDIR}/../../../..
 CFLAGS+=	-m68020-60
 CPPFLAGS+=	-nostdinc -I${.OBJDIR} -I. -I${S}
 CPPFLAGS+=	-I${.CURDIR}/../libiocs -I${.CURDIR}/../common
 CPPFLAGS+=	-D_STANDALONE
 CPPFLAGS+=	-DHEAP_VARIABLE
 CPPFLAGS+=	-DHAVE_CHANGEDISK_HOOK
 CPPFLAGS+=	-DUSTAR_SECT_PER_CYL=16
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP
 #CPPFLAGS+=	-DDEBUG
 .PATH:	${LIBSADIR} ${LIBKERNDIR} ${LIBZDIR} ${LIBZDIST}
 .include "../Makefile.booters"
 # only needed during build
 libinstall::
 .include <bsd.prog.mk>
 ### find out what to use for libkern
 KERN_AS= library
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN= ${KERNLIB}
 ### find out what to use for libz
 Z_AS= library
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ= ${ZLIB}
 ### find out what to use for libsa
 SA_AS= library
-SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes SA_EXTRADIR=${.CURDIR}
+SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes SA_ENABLE_LS_OP=yes SA_EXTRADIR=${.CURDIR}
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA= ${SALIB}
 LIBS= ${LIBKERN} ${LIBZ} ${LIBSA}
 all realall: ${LIBS}
 cleandir distclean: .WAIT cleanlibdir
 cleanlibdir:
 	-rm -rf lib

 @@ -1,59 +1,60 @@
-#	$NetBSD: Makefile,v 1.6 2011/01/23 13:17:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2011/12/25 06:09:10 tsutsui Exp $
 PROG=		zboot
 S=		${.CURDIR}/../../../..
 SRCS=		crt0.c
 SRCS+=		boot.c bootinfo.c bootmenu.c conf.c devopen.c diskprobe.c
 SRCS+=		loadfile_zboot.c
 SRCS+=		getsecs.c termios.c unixcons.c unixdev.c unixsys.S
 NOMAN=		# defined
 .include <bsd.own.mk>
 CFLAGS+=	-Wall -Wno-main
 CFLAGS+=	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CFLAGS+=	-fno-stack-protector -fno-builtin -ffreestanding
 CPPFLAGS+=	-nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S}
 CPPFLAGS+=	-D_STANDALONE -DHEAP_VARIABLE
 CPPFLAGS+=	-DLIBSA_ENABLE_LS_OP
 AFLAGS+=	-D_LOCORE
 LDFLAGS+=	-nostdlib -Bstatic
 CLEANFILES+=	vers.c vers.o
 LIBCRT0=	crt0.o
 LIBC=		# nothing
 LIBCRTBEGIN=	# nothing
 LIBCRTEND=	# nothing
 NEWVERSWHAT?=   "Boot"
 VERSIONFILE?=	${.CURDIR}/version
 ### find out what to use for libkern
 KERN_AS=		library
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN=	${KERNLIB}
 ### find out what to use for libz
 Z_AS=		library
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ=		${ZLIB}
 ### find out what to use for libsa
 SA_AS=		library
-SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
+SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes SA_ENABLE_LS_OP=yes
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=		${SALIB}
 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
 	    ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
 	${CC} -c vers.c
 	${LD} ${LDFLAGS} -o ${PROG} ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
 .include <bsd.klinks.mk>
 .include <bsd.prog.mk>
 cleandir distclean: .WAIT cleanlibdir

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: boot.c,v 1.3 2011/06/20 12:39:21 nonaka Exp $ */	1	/* $NetBSD: boot.c,v 1.4 2011/12/25 06:09:10 tsutsui Exp $ */
2		2
3	/*	3	/*
4	* Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org>	4	* Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
5	* All rights reserved.	5	* All rights reserved.
6	*	6	*
7	* Redistribution and use in source and binary forms, with or without	7	* Redistribution and use in source and binary forms, with or without
8	* modification, are permitted provided that the following conditions	8	* modification, are permitted provided that the following conditions
9	* are met:	9	* are met:
10	* 1. Redistributions of source code must retain the above copyright	10	* 1. Redistributions of source code must retain the above copyright
11	* notice, this list of conditions and the following disclaimer.	11	* notice, this list of conditions and the following disclaimer.
12	* 2. Redistributions in binary form must reproduce the above copyright	12	* 2. Redistributions in binary form must reproduce the above copyright
13	* notice, this list of conditions and the following disclaimer in the	13	* notice, this list of conditions and the following disclaimer in the
14	* documentation and/or other materials provided with the distribution.	14	* documentation and/or other materials provided with the distribution.
	@@ -313,27 +313,27 @@ bootcmd_quit(char *arg)		@@ -313,27 +313,27 @@ bootcmd_quit(char *arg)
313	{	313	{
314		314
315	printf("Exiting...\n");	315	printf("Exiting...\n");
316	exit(0);	316	exit(0);
317	/NOTREACHED/	317	/NOTREACHED/
318	}	318	}
319		319
320	static void	320	static void
321	bootcmd_ls(char *arg)	321	bootcmd_ls(char *arg)
322	{	322	{
323	const char *save = default_filename;	323	const char *save = default_filename;
324		324
325	default_filename = "/";	325	default_filename = "/";
326	ufs_ls(arg);	326	ls(arg);
327	default_filename = save;	327	default_filename = save;
328	}	328	}
329		329
330	static void	330	static void
331	bootcmd_boot(char *arg)	331	bootcmd_boot(char *arg)
332	{	332	{
333	char *filename;	333	char *filename;
334	int howto;	334	int howto;
335		335
336	if (parseboot(arg, &filename, &howto)) {	336	if (parseboot(arg, &filename, &howto)) {
337	bootit(filename, howto, 1);	337	bootit(filename, howto, 1);
338	}	338	}
339	}	339	}

 @@ -1,22 +1,23 @@
-#	$NetBSD: Makefile,v 1.75 2011/07/03 15:29:35 mrg Exp $
+#	$NetBSD: Makefile,v 1.76 2011/12/25 06:09:08 tsutsui Exp $
 LIB=	sa
 NOPIC=	# defined
 NOPROFILE=# defined
 SA_USE_CREAD?= no		# Read compressed kernels
 SA_INCLUDE_NET?= yes		# Netboot via TFTP, NFS
 SA_USE_LOADFILE?= no		# Generic executable loading support
 SA_ENABLE_LS_OP?= no		# Filesystems ls operation
 #DEBUGCPPFLAGS= -DBOOTP_DEBUG -DNETIF_DEBUG -DETHER_DEBUG -DNFS_DEBUG -DRPC_DEBUG -DRARP_DEBUG -DARP_DEBUG -DNET_DEBUG -DDEBUG -DPARANOID
 CPPFLAGS=	-I${SADIR} ${SACPPFLAGS} ${SAMISCCPPFLAGS} \
 		-DCOMPAT_UFS ${DEBUGCPPFLAGS}
 #COPTS+= -ansi -pedantic -Wall
 .if defined(SA_EXTRADIR)
 .-include "${SA_EXTRADIR}/Makefile.inc"
 .endif
 .include <bsd.own.mk>
 @@ -35,47 +36,50 @@ SRCS+=	exec.c
 # string routines
 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
 SRCS+=	memcmp.c memcpy.c memmove.c memset.c strchr.c
 .endif
 SRCS+=	bcopy.c bzero.c	# Remove me eventually.
 # io routines
 SRCS+=	closeall.c dev.c disklabel.c dkcksum.c ioctl.c nullfs.c stat.c fstat.c
 SRCS+=	close.c lseek.c open.c read.c write.c
 .if (${SA_USE_CREAD} == "yes")
 CPPFLAGS+= -D__INTERNAL_LIBSA_CREAD
 SRCS+=	cread.c
 .endif
 .if (${SA_ENABLE_LS_OP} == "yes")
 SRCS+= ls.c
 .endif
 .if (${SA_USE_LOADFILE} == "yes")
 SRCS+=	loadfile.c loadfile_ecoff.c loadfile_elf32.c lookup_elf32.c \
 	loadfile_elf64.c lookup_elf64.c
 .if (${MACHINE_CPU} != "mips")
 SRCS+=	loadfile_aout.c
 .endif
 .endif
 .if (${SA_INCLUDE_NET} == "yes")
 # network routines
 SRCS+=	arp.c ether.c ether_sprintf.c ip_cksum.c net.c netif.c rpc.c udp.c ip.c
 # network info services:
 SRCS+=	bootp.c rarp.c bootparam.c
 # boot filesystems
 SRCS+=	nfs.c tftp.c
 .endif
-SRCS+=	ffsv1.c ffsv2.c ufs_ls.c
+SRCS+=	ffsv1.c ffsv2.c
 SRCS+=	lfsv1.c lfsv2.c
 SRCS+=	cd9660.c
 SRCS+=	ustarfs.c
 SRCS+=	dosfs.c
 SRCS+=	ext2fs.c
 # for historic compatibility ufs == ffsv1
 SRCS+=	ufs.c
 # only needed during build
 libinstall::
 .undef DESTDIR
 .include <bsd.lib.mk>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660.c,v 1.27 2011/06/16 13:27:58 joerg Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.28 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
  * Copyright (C) 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -386,13 +386,22 @@ cd9660_seek(struct open_file *f, off_t o
 #endif /* !defined(LIBSA_NO_FS_SEEK) */
 __compactcall int
 cd9660_stat(struct open_file *f, struct stat *sb)
+{
 	struct file *fp = (struct file *)f->f_fsdata;
 	/* only importatn stuff */
 	sb->st_mode = S_IFREG | S_IRUSR | S_IRGRP | S_IROTH;
 	sb->st_uid = sb->st_gid = 0;
 	sb->st_size = fp->size;
 	return 0;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 cd9660_ls(struct open_file *f, const char *pattern)
+{
 	printf("Currently ls command is unsupported by cd9660\n");
 	return;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dosfs.c,v 1.17 2011/06/16 13:27:58 joerg Exp $	*/
+/*	$NetBSD: dosfs.c,v 1.18 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*
  * Copyright (c) 1996, 1998 Robert Nordier
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
 @@ -395,26 +395,35 @@ dosfs_stat(struct open_file *fd, struct
 	DOS_FILE *f = (DOS_FILE *)fd->f_fsdata;
 	/* only important stuff */
 	sb->st_mode = (f->de.deAttributes & ATTR_DIRECTORY) ?
 	    (S_IFDIR | 0555) : (S_IFREG | 0444);
 	sb->st_nlink = 1;
 	sb->st_uid = 0;
 	sb->st_gid = 0;
 	if ((sb->st_size = fsize(f->fs, &f->de)) == -1)
 		return EINVAL;
 	return 0;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 dosfs_ls(struct open_file *f, const char *pattern)
+{
 	printf("Currently ls command is unsupported by dosfs\n");
 	return;
+}
 #endif
 /*
  * Parse DOS boot sector
  */
 static int
 parsebs(DOS_FS *fs, DOS_BS *bs)
+{
 	u_int   sc;
 	if ((bs->jmp[0] != 0x69 &&
 		bs->jmp[0] != 0xe9 &&
 		(bs->jmp[0] != 0xeb || bs->jmp[2] != 0x90)) ||
 	    bs->bpb.bpbMedia < 0xf0)
 		return EINVAL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ext2fs.c,v 1.10 2011/06/16 13:27:58 joerg Exp $	*/
+/*	$NetBSD: ext2fs.c,v 1.11 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*
  * Copyright (c) 1997 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -136,26 +136,79 @@ typedef uint32_t	ino32_t;
 struct file {
 	off_t		f_seekp;	/* seek pointer */
 	struct m_ext2fs	*f_fs;		/* pointer to super-block */
 	struct ext2fs_dinode	f_di;		/* copy of on-disk inode */
 	uint		f_nishift;	/* for blocks in indirect block */
 	indp_t		f_ind_cache_block;
 	indp_t		f_ind_cache[IND_CACHE_SZ];
 	char		*f_buf;		/* buffer for data block */
 	size_t		f_buf_size;	/* size of data block */
 	daddr_t		f_buf_blkno;	/* block number of data block */
 };
 #if defined(LIBSA_ENABLE_LS_OP)
 #define NELEM(x) (sizeof (x) / sizeof(*x))
 typedef struct entry_t entry_t;
 struct entry_t {
 	entry_t	*e_next;
 	ino32_t	e_ino;
 	uint8_t	e_type;
 	char	e_name[1];
 };
 static const char    *const typestr[] = {
 	"unknown",
 	"REG",
 	"DIR",
 	"CHR",
 	"BLK",
 	"FIFO",
 	"SOCK",
 	"LNK"
 };
 static int
 fn_match(const char *fname, const char *pattern)
+{
 	char fc, pc;
 	do {
 		fc = *fname++;
 		pc = *pattern++;
 		if (!fc && !pc)
 			return 1;
 		if (pc == '?' && fc)
 			pc = fc;
 	} while (fc == pc);
 	if (pc != '*')
 		return 0;
 	/*
 	 * Too hard (and unnecessary really) too check for "*?name" etc....
 	 * "**" will look for a '*' and "*?" a '?'
 	 */
 	pc = *pattern++;
 	if (!pc)
 		return 1;
 	while ((fname = strchr(fname, pc)))
 		if (fn_match(++fname, pattern))
 			return 1;
 	return 0;
+}
 #endif /* LIBSA_ENABLE_LS_OP */
 static int read_inode(ino32_t, struct open_file *);
 static int block_map(struct open_file *, indp_t, indp_t *);
 static int buf_read_file(struct open_file *, char **, size_t *);
 static int search_directory(const char *, int, struct open_file *, ino32_t *);
 static int read_sblock(struct open_file *, struct m_ext2fs *);
 static int read_gdblock(struct open_file *, struct m_ext2fs *);
 #ifdef EXT2FS_DEBUG
 static void dump_sblock(struct m_ext2fs *);
 #endif
 /*
  * Read a new inode into a file structure.
  */
 @@ -793,26 +846,117 @@ ext2fs_stat(struct open_file *f, struct
+{
 	struct file *fp = (struct file *)f->f_fsdata;
 	/* only important stuff */
 	memset(sb, 0, sizeof *sb);
 	sb->st_mode = fp->f_di.e2di_mode;
 	sb->st_uid = fp->f_di.e2di_uid;
 	sb->st_gid = fp->f_di.e2di_gid;
 	/* XXX should handle LARGEFILE */
 	sb->st_size = fp->f_di.e2di_size;
 	return 0;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 ext2fs_ls(struct open_file *f, const char *pattern)
+{
 	struct file *fp = (struct file *)f->f_fsdata;
 	size_t block_size = fp->f_fs->e2fs_bsize;
 	char *buf;
 	size_t buf_size;
 	entry_t	*names = 0, *n, **np;
 	fp->f_seekp = 0;
 	while (fp->f_seekp < (off_t)fp->f_di.e2di_size) {
 		struct ext2fs_direct  *dp, *edp;
 		int rc = buf_read_file(f, &buf, &buf_size);
 		if (rc)
 			goto out;
 		if (buf_size != block_size || buf_size == 0)
 			goto out;
 		dp = (struct ext2fs_direct *)buf;
 		edp = (struct ext2fs_direct *)(buf + buf_size);
 		for (; dp < edp;
 		     dp = (void *)((char *)dp + fs2h16(dp->e2d_reclen))) {
 			const char *t;
 			if (fs2h16(dp->e2d_reclen) <= 0)
 				goto out;
 			if (fs2h32(dp->e2d_ino) == 0)
 				continue;
 			if (dp->e2d_type >= NELEM(typestr) ||
 			    !(t = typestr[dp->e2d_type])) {
 				/*
 				 * This does not handle "old"
 				 * filesystems properly. On little
 				 * endian machines, we get a bogus
 				 * type name if the namlen matches a
 				 * valid type identifier. We could
 				 * check if we read namlen "0" and
 				 * handle this case specially, if
 				 * there were a pressing need...
 				 */
 				printf("bad dir entry\n");
 				goto out;
+			}
 			if (pattern && !fn_match(dp->e2d_name, pattern))
 				continue;
 			n = alloc(sizeof *n + strlen(dp->e2d_name));
 			if (!n) {
 				printf("%d: %s (%s)\n",
 					fs2h32(dp->e2d_ino), dp->e2d_name, t);
 				continue;
+			}
 			n->e_ino = fs2h32(dp->e2d_ino);
 			n->e_type = dp->e2d_type;
 			strcpy(n->e_name, dp->e2d_name);
 			for (np = &names; *np; np = &(*np)->e_next) {
 				if (strcmp(n->e_name, (*np)->e_name) < 0)
 					break;
+			}
 			n->e_next = *np;
 			*np = n;
+		}
 		fp->f_seekp += buf_size;
+	}
 	if (names) {
 		entry_t *p_names = names;
 		do {
 			n = p_names;
 			printf("%d: %s (%s)\n",
 				n->e_ino, n->e_name, typestr[n->e_type]);
 			p_names = n->e_next;
 		} while (p_names);
 	} else {
 		printf("not found\n");
+	}
 out:
 	if (names) {
 		do {
 			n = names;
 			names = n->e_next;
 			dealloc(n, 0);
 		} while (names);
+	}
 	return;
+}
 #endif
 /*
  * byte swap functions for big endian machines
  * (ext2fs is always little endian)
+ *
  * XXX: We should use src/sys/ufs/ext2fs/ext2fs_bswap.c
  */
 /* These functions are only needed if native byte order is not big endian */
 #if BYTE_ORDER == BIG_ENDIAN
 void
 e2fs_sb_bswap(struct ext2fs *old, struct ext2fs *new)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nullfs.c,v 1.10 2011/06/16 13:27:58 joerg Exp $	*/
+/*	$NetBSD: nullfs.c,v 1.11 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -103,13 +103,22 @@ __compactcall off_t
 null_seek(struct open_file *f, off_t offset, int where)
+{
 	return (off_t)-1;
+}
 #endif
 __compactcall int
 null_stat(struct open_file *f, struct stat *sb)
+{
 	return EIO;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 null_ls(struct open_file *f, const char *pattern)
+{
 	printf("Currently ls command is unsupported by nullfs\n");
 	return;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs.c,v 1.46 2011/06/16 13:27:58 joerg Exp $	*/
+/*	$NetBSD: nfs.c,v 1.47 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*-
  *  Copyright (c) 1993 John Brezak
  *  All rights reserved.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
 @@ -645,13 +645,22 @@ nfs_stat(struct open_file *f, struct sta
 	ftype = ntohl(fp->fa.fa_type);
 	mode  = ntohl(fp->fa.fa_mode);
 	mode |= nfs_stat_types[ftype & 7];
 	sb->st_mode  = mode;
 	sb->st_nlink = ntohl(fp->fa.fa_nlink);
 	sb->st_uid   = ntohl(fp->fa.fa_uid);
 	sb->st_gid   = ntohl(fp->fa.fa_gid);
 	sb->st_size  = ntohl(fp->fa.fa_size);
 	return 0;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 nfs_ls(struct open_file *f, const char *pattern)
+{
 	printf("Currently ls command is unsupported by nfs\n");
 	return;
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: stand.h,v 1.73 2011/07/17 20:54:52 joerg Exp $	*/
+/*	$NetBSD: stand.h,v 1.74 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -77,79 +77,108 @@
 #ifdef LIBSA_RENAME_PRINTF
 #define getchar		libsa_getchar
 #define gets		libsa_gets
 #define printf		libsa_printf
 #define putchar		libsa_putchar
 #define sprintf		libsa_sprintf
 #define vprintf		libsa_vprintf
 #define vsprintf	libsa_vsprintf
 #endif
 struct open_file;
-#define FS_DEF(fs) \
+#define FS_DEF_BASE(fs) \
 	extern __compactcall int	__CONCAT(fs,_open)(const char *, struct open_file *); \
 	extern __compactcall int	__CONCAT(fs,_close)(struct open_file *); \
 	extern __compactcall int	__CONCAT(fs,_read)(struct open_file *, void *, \
 						size_t, size_t *); \
 	extern __compactcall int	__CONCAT(fs,_write)(struct open_file *, void *, \
 						size_t, size_t *); \
 	extern __compactcall off_t	__CONCAT(fs,_seek)(struct open_file *, off_t, int); \
 	extern __compactcall int	__CONCAT(fs,_stat)(struct open_file *, struct stat *)
 #if defined(LIBSA_ENABLE_LS_OP)
 #define FS_DEF(fs) \
 	FS_DEF_BASE(fs);\
 	extern __compactcall void	__CONCAT(fs,_ls)(struct open_file *, const char *)
 #else
 #define FS_DEF(fs) FS_DEF_BASE(fs)
 #endif
 /*
  * This structure is used to define file system operations in a file system
  * independent way.
  */
 extern char *fsmod;
 extern char *fsmod2;
 #if !defined(LIBSA_SINGLE_FILESYSTEM)
 struct fs_ops {
 	__compactcall int	(*open)(const char *, struct open_file *);
 	__compactcall int	(*close)(struct open_file *);
 	__compactcall int	(*read)(struct open_file *, void *, size_t, size_t *);
 	__compactcall int	(*write)(struct open_file *, void *, size_t size, size_t *);
 	__compactcall off_t	(*seek)(struct open_file *, off_t, int);
 	__compactcall int	(*stat)(struct open_file *, struct stat *);
 #if defined(LIBSA_ENABLE_LS_OP)
 	__compactcall void	(*ls)(struct open_file *, const char *);
 #endif
 };
 extern struct fs_ops file_system[];
 extern int nfsys;
 #if defined(LIBSA_ENABLE_LS_OP)
 #define FS_OPS(fs) { \
 	__CONCAT(fs,_open), \
 	__CONCAT(fs,_close), \
 	__CONCAT(fs,_read), \
 	__CONCAT(fs,_write), \
 	__CONCAT(fs,_seek), \
 	__CONCAT(fs,_stat), \
 	__CONCAT(fs,_ls) }
 #else
 #define FS_OPS(fs) { \
 	__CONCAT(fs,_open), \
 	__CONCAT(fs,_close), \
 	__CONCAT(fs,_read), \
 	__CONCAT(fs,_write), \
 	__CONCAT(fs,_seek), \
 	__CONCAT(fs,_stat) }
 #endif
 #define	FS_OPEN(fs)		((fs)->open)
 #define	FS_CLOSE(fs)		((fs)->close)
 #define	FS_READ(fs)		((fs)->read)
 #define	FS_WRITE(fs)		((fs)->write)
 #define	FS_SEEK(fs)		((fs)->seek)
 #define	FS_STAT(fs)		((fs)->stat)
 #if defined(LIBSA_ENABLE_LS_OP)
 #define	FS_LS(fs)		((fs)->ls)
 #endif
 #else
 #define	FS_OPEN(fs)		___CONCAT(LIBSA_SINGLE_FILESYSTEM,_open)
 #define	FS_CLOSE(fs)		___CONCAT(LIBSA_SINGLE_FILESYSTEM,_close)
 #define	FS_READ(fs)		___CONCAT(LIBSA_SINGLE_FILESYSTEM,_read)
 #define	FS_WRITE(fs)		___CONCAT(LIBSA_SINGLE_FILESYSTEM,_write)
 #define	FS_SEEK(fs)		___CONCAT(LIBSA_SINGLE_FILESYSTEM,_seek)
 #define	FS_STAT(fs)		___CONCAT(LIBSA_SINGLE_FILESYSTEM,_stat)
 #if defined(LIBSA_ENABLE_LS_OP)
 #define	FS_LS(fs)		___CONCAT(LIBSA_SINGLE_FILESYSTEM,_ls)
 #endif
 FS_DEF(LIBSA_SINGLE_FILESYSTEM);
 #endif
 /* where values for lseek(2) */
 #define	SEEK_SET	0	/* set file offset to offset */
 #define	SEEK_CUR	1	/* set file offset to current plus offset */
 #define	SEEK_END	2	/* set file offset to EOF plus offset */
 /* Device switch */
 #if !defined(LIBSA_SINGLE_DEVICE)
 @@ -246,26 +275,29 @@ void	*memcpy(void *, const void *, size_
 void	*memmove(void *, const void *, size_t);
 int	memcmp(const void *, const void *, size_t);
 void	*memset(void *, int, size_t);
 void	exec(char *, char *, int);
 int	open(const char *, int);
 int	close(int);
 void	closeall(void);
 ssize_t	read(int, void *, size_t);
 ssize_t	write(int, const void *, size_t);
 off_t	lseek(int, off_t, int);
 int	ioctl(int, u_long, char *);
 int	stat(const char *, struct stat *);
 int	fstat(int, struct stat *);
 #if defined(LIBSA_ENABLE_LS_OP)
 void	ls(const char *);
 #endif
 typedef int cmp_t(const void *, const void *);
 void	qsort(void *, size_t, size_t, cmp_t *);
 extern int opterr, optind, optopt, optreset;
 extern char *optarg;
 int	getopt(int, char * const *, const char *);
 char	*getpass(const char *);
 int	checkpasswd(void);
 int	check_password(const char *);
 int	nodev(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tftp.c,v 1.33 2011/07/30 03:43:20 jakllsch Exp $	 */
+/*	$NetBSD: tftp.c,v 1.34 2011/12/25 06:09:08 tsutsui Exp $	 */
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -419,26 +419,35 @@ __compactcall int
 tftp_stat(struct open_file *f, struct stat *sb)
+{
 	struct tftp_handle *tftpfile;
 	tftpfile = (struct tftp_handle *)f->f_fsdata;
 	sb->st_mode = 0444;
 	sb->st_nlink = 1;
 	sb->st_uid = 0;
 	sb->st_gid = 0;
 	sb->st_size = tftp_size_of_file(tftpfile);
 	return 0;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 tftp_ls(struct open_file *f, const char *pattern)
+{
 	printf("Currently ls command is unsupported by tftp\n");
 	return;
+}
 #endif
 __compactcall off_t
 tftp_seek(struct open_file *f, off_t offset, int where)
+{
 	struct tftp_handle *tftpfile;
 	tftpfile = (struct tftp_handle *)f->f_fsdata;
 	switch (where) {
 	case SEEK_SET:
 		tftpfile->off = offset;
 		break;
 	case SEEK_CUR:
 		tftpfile->off += offset;
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ustarfs.c,v 1.33 2011/06/16 13:27:58 joerg Exp $	*/
+/*	$NetBSD: ustarfs.c,v 1.34 2011/12/25 06:09:08 tsutsui Exp $	*/
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
  * All rights reserved.
+ *
  * Author: Ross Harvey
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright and
  *    author notice, this list of conditions, and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -527,24 +527,34 @@ ustarfs_stat(struct open_file *f, struct
 		return EINVAL;
 	ustf = f->f_fsdata;
 	memset(sb, 0, sizeof *sb);
 	ustarfs_sscanf(ustf->uas_active.ust_mode, "%8o", &mode);
 	ustarfs_sscanf(ustf->uas_active.ust_uid, "%8o", &uid);
 	ustarfs_sscanf(ustf->uas_active.ust_gid, "%8o", &gid);
 	sb->st_mode = mode;
 	sb->st_uid  = uid;
 	sb->st_gid  = gid;
 	sb->st_size = ustf->uas_filesize;
 	return 0;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 ustarfs_ls(struct open_file *f, const char *pattern)
+{
 	printf("Currently ls command is unsupported by ustarfs\n");
 	return;
+}
 #endif
 #ifndef LIBSA_NO_FS_CLOSE
 __compactcall int
 ustarfs_close(struct open_file *f)
+{
 	if (f == NULL || f->f_fsdata == NULL)
 		return EINVAL;
 	dealloc(f->f_fsdata, sizeof(ust_active_t));
 	f->f_fsdata = 0;
 	return 0;
+}
 #endif /* !LIBSA_NO_FS_CLOSE */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs.c,v 1.55 2011/06/16 13:27:58 joerg Exp $	*/
+/*	$NetBSD: ufs.c,v 1.56 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -169,26 +169,86 @@ struct file {
 };
 static int read_inode(ino32_t, struct open_file *);
 static int block_map(struct open_file *, indp_t, indp_t *);
 static int buf_read_file(struct open_file *, char **, size_t *);
 static int search_directory(const char *, int, struct open_file *, ino32_t *);
 #ifdef LIBSA_FFSv1
 static void ffs_oldfscompat(struct fs *);
 #endif
 #ifdef LIBSA_FFSv2
 static int ffs_find_superblock(struct open_file *, struct fs *);
 #endif
 #if defined(LIBSA_ENABLE_LS_OP)
 #define NELEM(x) (sizeof (x) / sizeof(*x))
 typedef struct entry_t entry_t;
 struct entry_t {
 	entry_t	*e_next;
 	ino32_t	e_ino;
 	uint8_t	e_type;
 	char	e_name[1];
 };
 static const char    *const typestr[] = {
 	"unknown",
 	"FIFO",
 	"CHR",
 ,
 	"DIR",
 ,
 	"BLK",
 ,
 	"REG",
 ,
 	"LNK",
 ,
 	"SOCK",
 ,
 	"WHT"
 };
 static int
 fn_match(const char *fname, const char *pattern)
+{
 	char fc, pc;
 	do {
 		fc = *fname++;
 		pc = *pattern++;
 		if (!fc && !pc)
 			return 1;
 		if (pc == '?' && fc)
 			pc = fc;
 	} while (fc == pc);
 	if (pc != '*')
 		return 0;
 	/*
 	 * Too hard (and unnecessary really) too check for "*?name" etc....
 	 * "**" will look for a '*' and "*?" a '?'
 	 */
 	pc = *pattern++;
 	if (!pc)
 		return 1;
 	while ((fname = strchr(fname, pc)))
 		if (fn_match(++fname, pattern))
 			return 1;
 	return 0;
+}
 #endif /* LIBSA_ENABLE_LS_OP */
 #ifdef LIBSA_LFS
 /*
  * Find an inode's block.  Look it up in the ifile.  Whee!
  */
 static int
 find_inode_sector(ino32_t inumber, struct open_file *f, daddr_t *isp)
+{
 	struct file *fp = (struct file *)f->f_fsdata;
 	struct fs *fs = fp->f_fs;
 	daddr_t ifileent_blkno;
 	char *ent_in_buf;
 	size_t buf_after_ent;
 	int rc;
 @@ -842,26 +902,111 @@ __compactcall int
 ufs_stat(struct open_file *f, struct stat *sb)
+{
 	struct file *fp = (struct file *)f->f_fsdata;
 	/* only important stuff */
 	memset(sb, 0, sizeof *sb);
 	sb->st_mode = fp->f_di.di_mode;
 	sb->st_uid = fp->f_di.di_uid;
 	sb->st_gid = fp->f_di.di_gid;
 	sb->st_size = fp->f_di.di_size;
 	return 0;
+}
 #if defined(LIBSA_ENABLE_LS_OP)
 __compactcall void
 ufs_ls(struct open_file *f, const char *pattern)
+{
 	struct file *fp = (struct file *)f->f_fsdata;
 	char *buf;
 	size_t buf_size;
 	entry_t	*names = 0, *n, **np;
 	fp->f_seekp = 0;
 	while (fp->f_seekp < (off_t)fp->f_di.di_size) {
 		struct direct  *dp, *edp;
 		int rc = buf_read_file(f, &buf, &buf_size);
 		if (rc)
 			goto out;
 		/* some firmware might use block size larger than DEV_BSIZE */
 		if (buf_size < DIRBLKSIZ)
 			goto out;
 		dp = (struct direct *)buf;
 		edp = (struct direct *)(buf + buf_size);
 		for (; dp < edp; dp = (void *)((char *)dp + dp->d_reclen)) {
 			const char *t;
 			if (dp->d_ino ==  0)
 				continue;
 			if (dp->d_type >= NELEM(typestr) ||
 			    !(t = typestr[dp->d_type])) {
 				/*
 				 * This does not handle "old"
 				 * filesystems properly. On little
 				 * endian machines, we get a bogus
 				 * type name if the namlen matches a
 				 * valid type identifier. We could
 				 * check if we read namlen "0" and
 				 * handle this case specially, if
 				 * there were a pressing need...
 				 */
 				printf("bad dir entry\n");
 				goto out;
+			}
 			if (pattern && !fn_match(dp->d_name, pattern))
 				continue;
 			n = alloc(sizeof *n + strlen(dp->d_name));
 			if (!n) {
 				printf("%d: %s (%s)\n",
 					dp->d_ino, dp->d_name, t);
 				continue;
+			}
 			n->e_ino = dp->d_ino;
 			n->e_type = dp->d_type;
 			strcpy(n->e_name, dp->d_name);
 			for (np = &names; *np; np = &(*np)->e_next) {
 				if (strcmp(n->e_name, (*np)->e_name) < 0)
 					break;
+			}
 			n->e_next = *np;
 			*np = n;
+		}
 		fp->f_seekp += buf_size;
+	}
 	if (names) {
 		entry_t *p_names = names;
 		do {
 			n = p_names;
 			printf("%d: %s (%s)\n",
 				n->e_ino, n->e_name, typestr[n->e_type]);
 			p_names = n->e_next;
 		} while (p_names);
 	} else {
 		printf("not found\n");
+	}
 out:
 	if (names) {
 		do {
 			n = names;
 			names = n->e_next;
 			dealloc(n, 0);
 		} while (names);
+	}
+}
 #endif /* LIBSA_ENABLE_LS_OP */
 #ifdef LIBSA_FFSv1
 /*
  * Sanity checks for old file systems.
+ *
  * XXX - goes away some day.
  * Stripped of stuff libsa doesn't need.....
  */
 static void
 ffs_oldfscompat(struct fs *fs)
+{
 #ifdef COMPAT_UFS
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs.h,v 1.9 2005/12/11 12:24:46 christos Exp $	*/
+/*	$NetBSD: ufs.h,v 1.10 2011/12/25 06:09:08 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,15 +24,13 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ufs.h	8.1 (Berkeley) 6/11/93
  */
 FS_DEF(ufs);
 FS_DEF(ffsv1);
 FS_DEF(ffsv2);
 void ufs_ls(const char *);

 @@ -1,17 +1,20 @@
-/* $NetBSD: ffsv1.c,v 1.4 2008/11/19 12:36:41 ad Exp $ */
+/* $NetBSD: ffsv1.c,v 1.5 2011/12/25 06:09:08 tsutsui Exp $ */
 #define LIBSA_FFSv1
 #define ufs_open	ffsv1_open
 #define ufs_close	ffsv1_close
 #define ufs_read	ffsv1_read
 #define ufs_write	ffsv1_write
 #define ufs_seek	ffsv1_seek
 #define ufs_stat	ffsv1_stat
 #if defined(LIBSA_ENABLE_LS_OP)
 #define ufs_ls		ffsv1_ls
 #endif
 #define ufs_dinode	ufs1_dinode
 #define indp_t		int32_t
 #define	FSMOD		"ffs"
 #include "ufs.c"

 @@ -1,17 +1,20 @@
-/* $NetBSD: ffsv2.c,v 1.4 2008/11/19 12:36:41 ad Exp $ */
+/* $NetBSD: ffsv2.c,v 1.5 2011/12/25 06:09:08 tsutsui Exp $ */
 #define LIBSA_FFSv2
 #define ufs_open	ffsv2_open
 #define ufs_close	ffsv2_close
 #define ufs_read	ffsv2_read
 #define ufs_write	ffsv2_write
 #define ufs_seek	ffsv2_seek
 #define ufs_stat	ffsv2_stat
 #if defined(LIBSA_ENABLE_LS_OP)
 #define ufs_ls		ffsv2_ls
 #endif
 #define ufs_dinode	ufs2_dinode
 #define indp_t		int64_t
 #define	FSMOD		"ffs"
 #include "ufs.c"

 @@ -1,22 +1,25 @@
-/* $NetBSD: lfsv1.c,v 1.3 2008/11/19 12:36:41 ad Exp $ */
+/* $NetBSD: lfsv1.c,v 1.4 2011/12/25 06:09:08 tsutsui Exp $ */
 #define	LIBSA_LFS
 #define	REQUIRED_LFS_VERSION	1
 #define	ufs_open		lfsv1_open
 #define	ufs_close		lfsv1_close
 #define	ufs_read		lfsv1_read
 #define	ufs_write		lfsv1_write
 #define	ufs_seek		lfsv1_seek
 #define	ufs_stat		lfsv1_stat
 #if defined(LIBSA_ENABLE_LS_OP)
 #define	ufs_ls			lfsv1_ls
 #endif
 #define	fs_bsize		lfs_ibsize
 #define	IFILE_Vx		IFILE_V1
 #define	FSBTODB(fs, daddr)	(daddr)		/* LFSv1 uses sectors for addresses */
 #define	INOPBx(fs) INOPB(fs)
 #define	FSMOD			"lfs"
 #define	FSMOD2			"ffs"
 #include "lib/libsa/ufs.c"

 @@ -1,24 +1,27 @@
-/* $NetBSD: lfsv2.c,v 1.3 2008/11/19 12:36:41 ad Exp $ */
+/* $NetBSD: lfsv2.c,v 1.4 2011/12/25 06:09:08 tsutsui Exp $ */
 #define	LIBSA_LFS
 #define	REQUIRED_LFS_VERSION	2
 #define	ufs_open		lfsv2_open
 #define	ufs_close		lfsv2_close
 #define	ufs_read		lfsv2_read
 #define	ufs_write		lfsv2_write
 #define	ufs_seek		lfsv2_seek
 #define	ufs_stat		lfsv2_stat
 #if defined(LIBSA_ENABLE_LS_OP)
 #define	ufs_ls			lfsv2_ls
 #endif
 #define	fs_bsize		lfs_bsize
 #define	IFILE_Vx		IFILE
 #ifdef LFS_IFILE_FRAG_ADDRESSING	/* XXX see sys/ufs/lfs/ -- not tested */
 #define	INOPBx(fs) INOPF(fs)
 #else
 #define	INOPBx(fs) INOPB(fs)
 #endif
 #define	FSMOD			"lfs"
 #define	FSMOD2			"ffs"