CVS commit: src/share/examples/rump/sdread
Module Name:src
Committed By: pooka
Date: Mon Oct 5 13:05:31 UTC 2009
Added Files:
src/share/examples/rump/sdread: Makefile sdread.c
Log Message:
Add an example program which shows how to mount and read files from
an msdos file system which is located on a usb stick. What makes
this special is that the USB driver stack (and the file system
driver, of course) is run in rump instead of in the host kernel.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/share/examples/rump/sdread/Makefile \
src/share/examples/rump/sdread/sdread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/share/examples/rump/sdread/Makefile
diff -u /dev/null src/share/examples/rump/sdread/Makefile:1.1
--- /dev/null Mon Oct 5 13:05:31 2009
+++ src/share/examples/rump/sdread/Makefile Mon Oct 5 13:05:31 2009
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2009/10/05 13:05:31 pooka Exp $
+#
+
+PROG= sdread
+
+LDADD+= -lrumpfs_msdos -lrumpvfs
+LDADD+= -lrumpdev_disk -lrumpdev_usb -lrumpdev_usbhc -lrumpdev_umass -lrumpdev
+LDADD+= -lrump
+LDADD+= -lrumpuser -lpthread
+
+DBG= -g
+NOMAN=
+
+.include
Index: src/share/examples/rump/sdread/sdread.c
diff -u /dev/null src/share/examples/rump/sdread/sdread.c:1.1
--- /dev/null Mon Oct 5 13:05:31 2009
+++ src/share/examples/rump/sdread/sdread.c Mon Oct 5 13:05:31 2009
@@ -0,0 +1,138 @@
+/* $NetBSD: sdread.c,v 1.1 2009/10/05 13:05:31 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * 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.
+ */
+
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+/*
+ * Proof-of-concept program:
+ *
+ * Mount rump file system from device driver stack included in the
+ * rump kernel. Optionally copy a file out of the mounted file system.
+ */
+
+int
+main(int argc, char *argv[])
+{
+ char buf[2048];
+ struct msdosfs_args args;
+ struct dirent *dp;
+ const char *msg = NULL;
+ int fd, n, fd_h, sverrno;
+
+ if (argc > 1 && argc != 3) {
+ fprintf(stderr, "usage: a.out [src hostdest]\n");
+ exit(1);
+ }
+
+ memset(&args, 0, sizeof(args));
+ args.fspec = strdup("/dev/sd0e");
+ args.version = MSDOSFSMNT_VERSION;
+
+ rump_init();
+
+ if (rump_sys_mkdir("/mp", 0777) == -1)
+ err(1, "mkdir");
+ if (rump_sys_mount(MOUNT_MSDOS, "/mp", MNT_RDONLY,
+ &args, sizeof(args)) == -1)
+ err(1, "mount");
+
+ fd = rump_sys_open("/mp", O_RDONLY, 0);
+ if (fd == -1) {
+ msg = "open dir";
+ goto out;
+ }
+
+ while ((n = rump_sys_getdents(fd, buf, sizeof(buf))) > 0) {
+ for (dp = (struct dirent *)buf;
+ (char *)dp - buf < n;
+ dp = _DIRENT_NEXT(dp)) {
+ printf("%" PRIu64 ": %s\n", dp->d_fileno, dp->d_name);
+ }
+ }
+ rump_sys_close(fd);
+ if (argc == 1)
+ goto out;
+
+ rump_sys_chdir("/mp");
+ fd = rump_sys_open(argv[1], O_RDONLY, 0);
+ if (fd == -1) {
+ msg = "open fs file";
+ goto out;
+ }
+
+ fd_h = open(argv[2], O_RDWR | O_CREAT, 0777);
+ if (fd_h == -1) {
+ msg = "open host file";
+ goto out;
+ }
+
+ while ((n = rump_sys_read(fd, buf, sizeof(buf))) == sizeof(buf)) {
+ if (write(fd_h, buf, sizeof(buf)) != sizeof(buf)) {
+ msg = "write host file";
+ goto out;
+ }
+ }
+ if (n == -1) {
+ msg = "read fs file";
+ goto out;
+ }
+
+ if (n > 0) {
+ if (write(fd_h, buf, n) == -1)
+ msg = "write tail";
+ }
+
+ out:
+ sverrno = errno;
+ rump_sys_chdir("/");
+ rump_sys_close(fd);
+ close(fd_h);
+ if (rump_sys_unmount("/mp", 0) == -1)
+ err(1, "unmount");
+
+ if (msg) {
+ errno = sverrno;
+ err(1, "%s", msg);
+ }
+
+ return 0;
+}
CVS commit: src/share/examples/rump/sdread
Module Name:src
Committed By: pooka
Date: Tue Oct 13 18:41:06 UTC 2009
Modified Files:
src/share/examples/rump/sdread: Makefile sdread.c
Log Message:
Try ffs is msdosfs mount fails -- I happened to have one USB stick
where the file system is ffs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/examples/rump/sdread/Makefile \
src/share/examples/rump/sdread/sdread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/rump/sdread/Makefile
diff -u src/share/examples/rump/sdread/Makefile:1.1 src/share/examples/rump/sdread/Makefile:1.2
--- src/share/examples/rump/sdread/Makefile:1.1 Mon Oct 5 13:05:31 2009
+++ src/share/examples/rump/sdread/Makefile Tue Oct 13 18:41:06 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/10/05 13:05:31 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/13 18:41:06 pooka Exp $
#
PROG= sdread
-LDADD+= -lrumpfs_msdos -lrumpvfs
+LDADD+= -lrumpfs_ffs -lrumpfs_msdos -lrumpvfs
LDADD+= -lrumpdev_disk -lrumpdev_usb -lrumpdev_usbhc -lrumpdev_umass -lrumpdev
LDADD+= -lrump
LDADD+= -lrumpuser -lpthread
Index: src/share/examples/rump/sdread/sdread.c
diff -u src/share/examples/rump/sdread/sdread.c:1.1 src/share/examples/rump/sdread/sdread.c:1.2
--- src/share/examples/rump/sdread/sdread.c:1.1 Mon Oct 5 13:05:31 2009
+++ src/share/examples/rump/sdread/sdread.c Tue Oct 13 18:41:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdread.c,v 1.1 2009/10/05 13:05:31 pooka Exp $ */
+/* $NetBSD: sdread.c,v 1.2 2009/10/13 18:41:06 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -29,6 +29,7 @@
#include
#include
+#include
#include
#include
@@ -54,6 +55,7 @@
{
char buf[2048];
struct msdosfs_args args;
+ struct ufs_args uargs;
struct dirent *dp;
const char *msg = NULL;
int fd, n, fd_h, sverrno;
@@ -67,13 +69,20 @@
args.fspec = strdup("/dev/sd0e");
args.version = MSDOSFSMNT_VERSION;
+ memset(&uargs, 0, sizeof(uargs));
+ uargs.fspec = strdup("/dev/sd0e");
+
rump_init();
if (rump_sys_mkdir("/mp", 0777) == -1)
err(1, "mkdir");
if (rump_sys_mount(MOUNT_MSDOS, "/mp", MNT_RDONLY,
- &args, sizeof(args)) == -1)
- err(1, "mount");
+ &args, sizeof(args)) == -1) {
+ if (rump_sys_mount(MOUNT_FFS, "/mp", MNT_RDONLY,
+ &uargs, sizeof(uargs)) == -1) {
+ err(1, "mount");
+ }
+ }
fd = rump_sys_open("/mp", O_RDONLY, 0);
if (fd == -1) {
CVS commit: src/share/examples/rump/sdread
Module Name:src Committed By: pooka Date: Wed Oct 14 23:51:52 UTC 2009 Modified Files: src/share/examples/rump/sdread: Makefile Log Message: WARNS To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/examples/rump/sdread/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/examples/rump/sdread/Makefile diff -u src/share/examples/rump/sdread/Makefile:1.2 src/share/examples/rump/sdread/Makefile:1.3 --- src/share/examples/rump/sdread/Makefile:1.2 Tue Oct 13 18:41:06 2009 +++ src/share/examples/rump/sdread/Makefile Wed Oct 14 23:51:52 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/10/13 18:41:06 pooka Exp $ +# $NetBSD: Makefile,v 1.3 2009/10/14 23:51:52 pooka Exp $ # PROG= sdread @@ -10,5 +10,6 @@ DBG= -g NOMAN= +WARNS= 4 .include
CVS commit: src/share/examples/rump/sdread
Module Name:src
Committed By: pooka
Date: Wed Feb 17 20:43:35 UTC 2010
Modified Files:
src/share/examples/rump/sdread: Makefile sdread.c
Log Message:
* support cd devices (@scsibus & @atapibus, per libumass)
* support cd9660
* add "probe" keyword, which just prints the dmesg in verbose form
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/examples/rump/sdread/Makefile
cvs rdiff -u -r1.2 -r1.3 src/share/examples/rump/sdread/sdread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/rump/sdread/Makefile
diff -u src/share/examples/rump/sdread/Makefile:1.4 src/share/examples/rump/sdread/Makefile:1.5
--- src/share/examples/rump/sdread/Makefile:1.4 Wed Feb 10 02:31:00 2010
+++ src/share/examples/rump/sdread/Makefile Wed Feb 17 20:43:35 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/02/10 02:31:00 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/17 20:43:35 pooka Exp $
#
PROG= sdread
-LDADD+= -lrumpfs_ffs -lrumpfs_msdos -lrumpvfs
+LDADD+= -lrumpfs_cd9660 -lrumpfs_ffs -lrumpfs_msdos -lrumpvfs
LDADD+= -lrumpdev_disk -lrumpdev_usb -lrumpdev_ugenhc -lrumpdev_umass -lrumpdev
LDADD+= -lrump
LDADD+= -lrumpuser -lpthread
Index: src/share/examples/rump/sdread/sdread.c
diff -u src/share/examples/rump/sdread/sdread.c:1.2 src/share/examples/rump/sdread/sdread.c:1.3
--- src/share/examples/rump/sdread/sdread.c:1.2 Tue Oct 13 18:41:06 2009
+++ src/share/examples/rump/sdread/sdread.c Wed Feb 17 20:43:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdread.c,v 1.2 2009/10/13 18:41:06 pooka Exp $ */
+/* $NetBSD: sdread.c,v 1.3 2010/02/17 20:43:35 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -31,6 +31,7 @@
#include
#include
+#include
#include
#include
@@ -56,13 +57,19 @@
char buf[2048];
struct msdosfs_args args;
struct ufs_args uargs;
+ struct iso_args iargs;
struct dirent *dp;
const char *msg = NULL;
int fd, n, fd_h, sverrno;
+ int probeonly = 0;
- if (argc > 1 && argc != 3) {
- fprintf(stderr, "usage: a.out [src hostdest]\n");
- exit(1);
+ if (argc > 1) {
+ if (argc == 2 && strcmp(argv[1], "probe") == 0) {
+ probeonly = 1;
+ } else if (argc != 3) {
+ fprintf(stderr, "usage: a.out [src hostdest]\n");
+ exit(1);
+ }
}
memset(&args, 0, sizeof(args));
@@ -72,7 +79,15 @@
memset(&uargs, 0, sizeof(uargs));
uargs.fspec = strdup("/dev/sd0e");
+ memset(&iargs, 0, sizeof(iargs));
+ iargs.fspec = strdup("/dev/cd0a");
+
+ if (probeonly)
+ rump_boot_sethowto(RUMP_AB_VERBOSE);
rump_init();
+ if (probeonly) {
+ exit(0);
+ }
if (rump_sys_mkdir("/mp", 0777) == -1)
err(1, "mkdir");
@@ -80,7 +95,17 @@
&args, sizeof(args)) == -1) {
if (rump_sys_mount(MOUNT_FFS, "/mp", MNT_RDONLY,
&uargs, sizeof(uargs)) == -1) {
- err(1, "mount");
+ printf("Trying CD. This might fail with "
+ "\"media not present\".\n");
+ printf("If that happens, wait a while without "
+ "unplugging the device and re-run.\n");
+ printf("Some devices apparently need a long time "
+ "to settle after they are initialized.\n\n");
+
+ if (rump_sys_mount(MOUNT_CD9660, "/mp", MNT_RDONLY,
+ &iargs, sizeof(iargs)) == -1) {
+err(1, "mount");
+ }
}
}
CVS commit: src/share/examples/rump/sdread
Module Name:src
Committed By: pooka
Date: Mon Mar 22 20:37:26 UTC 2010
Modified Files:
src/share/examples/rump/sdread: sdread.c
Log Message:
Use DIOCTUR to test if a newly configured CD drive is ready instead
of playing a random waiting game.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/examples/rump/sdread/sdread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/rump/sdread/sdread.c
diff -u src/share/examples/rump/sdread/sdread.c:1.4 src/share/examples/rump/sdread/sdread.c:1.5
--- src/share/examples/rump/sdread/sdread.c:1.4 Sun Mar 7 23:18:17 2010
+++ src/share/examples/rump/sdread/sdread.c Mon Mar 22 20:37:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdread.c,v 1.4 2010/03/07 23:18:17 pooka Exp $ */
+/* $NetBSD: sdread.c,v 1.5 2010/03/22 20:37:26 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
@@ -51,6 +52,38 @@
* rump kernel. Optionally copy a file out of the mounted file system.
*/
+/* recent -current, appease 5.0 etc. userland */
+#ifndef DIOCTUR
+#define DIOCTUR _IOR('d', 128, int)
+#endif
+
+static void
+waitcd(void)
+{
+ int fd, val = 0, rounds = 0;
+
+ fd = rump_sys_open("/dev/rcd0d", O_RDWR);
+ do {
+ if (rounds > 0) {
+ if (rounds == 1) {
+printf("Waiting for CD device to settle ");
+ } else {
+printf(".");
+ }
+ fflush(stdout);
+ sleep(1);
+ }
+ if (rump_sys_ioctl(fd, DIOCTUR, &val) == -1)
+ err(1, "DIOCTUR");
+ rounds++;
+ } while (val == 0 || rounds >= 30);
+
+ if (!val)
+ printf(" giving up\n");
+ else
+ printf(" done!\n");
+}
+
int
main(int argc, char *argv[])
{
@@ -96,13 +129,11 @@
&args, sizeof(args)) == -1) {
if (rump_sys_mount(MOUNT_FFS, "/mp", MNT_RDONLY,
&uargs, sizeof(uargs)) == -1) {
- printf("Trying CD. This might fail with "
- "\"media not present\".\n");
- printf("If that happens, wait a while without "
- "unplugging the device and re-run.\n");
- printf("Some devices apparently need a long time "
- "to settle after they are initialized.\n\n");
-
+ /*
+ * Wait for CD media to settle. In the end,
+ * just try to do it anyway and see if we fail.
+ */
+ waitcd();
if (rump_sys_mount(MOUNT_CD9660, "/mp", MNT_RDONLY,
&iargs, sizeof(iargs)) == -1) {
err(1, "mount");
CVS commit: src/share/examples/rump/sdread
Module Name:src
Committed By: pooka
Date: Thu Mar 25 15:00:20 UTC 2010
Modified Files:
src/share/examples/rump/sdread: sdread.c
Log Message:
Check open return value and close fd when we're done.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/examples/rump/sdread/sdread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/rump/sdread/sdread.c
diff -u src/share/examples/rump/sdread/sdread.c:1.5 src/share/examples/rump/sdread/sdread.c:1.6
--- src/share/examples/rump/sdread/sdread.c:1.5 Mon Mar 22 20:37:26 2010
+++ src/share/examples/rump/sdread/sdread.c Thu Mar 25 15:00:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdread.c,v 1.5 2010/03/22 20:37:26 pooka Exp $ */
+/* $NetBSD: sdread.c,v 1.6 2010/03/25 15:00:20 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -63,6 +63,9 @@
int fd, val = 0, rounds = 0;
fd = rump_sys_open("/dev/rcd0d", O_RDWR);
+ if (fd == -1)
+ return;
+
do {
if (rounds > 0) {
if (rounds == 1) {
@@ -82,6 +85,8 @@
printf(" giving up\n");
else
printf(" done!\n");
+
+ rump_sys_close(fd);
}
int
