From 496f59a99ffde6b83d70f212c7191ee5cfeb96bb Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Thu, 30 Nov 2006 05:38:54 +0000
Subject: [PATCH] adapt to flags parameter for puffs_mainloop()

---
 share/examples/puffs/dtfs/dtfs.c         | 15 +++++++++------
 share/examples/puffs/ssshfs/ssshfs.c     |  4 ++--
 share/examples/puffs/sysctlfs/sysctlfs.c |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/share/examples/puffs/dtfs/dtfs.c b/share/examples/puffs/dtfs/dtfs.c
index 799d69d54001..8f441c60adab 100644
--- a/share/examples/puffs/dtfs/dtfs.c
+++ b/share/examples/puffs/dtfs/dtfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtfs.c,v 1.7 2006/11/18 12:41:06 pooka Exp $	*/
+/*	$NetBSD: dtfs.c,v 1.8 2006/11/30 05:38:54 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -55,15 +55,18 @@ main(int argc, char *argv[])
 	struct puffs_usermount *pu;
 	struct puffs_vfsops pvfs;
 	struct puffs_vnops pvn;
-	uint32_t flags = 0;
+	int pflags, lflags;
 
 	setprogname(argv[0]);
 
 	if (argc < 2)
 		errx(1, "usage: %s mountpath\n", getprogname());
 
-	if (argc == 3 && *argv[2] == 'd') /* nice */
-		flags |= PUFFSFLAG_OPDUMP;
+	pflags = lflags = 0;
+	if (argc == 3 && *argv[2] == 'd') { /* nice */
+		pflags = PUFFSFLAG_OPDUMP;
+		lflags = PUFFSLOOP_NODAEMON;
+	}
 
 	memset(&pvfs, 0, sizeof(struct puffs_vfsops));
 	memset(&pvn, 0, sizeof(struct puffs_vnops));
@@ -91,11 +94,11 @@ main(int argc, char *argv[])
 	pvn.puffs_inactive = dtfs_inactive;
 	pvn.puffs_mknod = dtfs_mknod;
 
-	if ((pu = puffs_mount(&pvfs, &pvn, argv[1], 0, FSNAME, flags, 0))
+	if ((pu = puffs_mount(&pvfs, &pvn, argv[1], 0, FSNAME, pflags, 0))
 	    == NULL)
 		err(1, "mount");
 
-	if (puffs_mainloop(pu) == -1)
+	if (puffs_mainloop(pu, lflags) == -1)
 		err(1, "mainloop");
 
 	return 0;
diff --git a/share/examples/puffs/ssshfs/ssshfs.c b/share/examples/puffs/ssshfs/ssshfs.c
index 38e3d8ba3548..1f3320fa97d8 100644
--- a/share/examples/puffs/ssshfs/ssshfs.c
+++ b/share/examples/puffs/ssshfs/ssshfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssshfs.c,v 1.7 2006/11/23 01:51:15 hubertf Exp $	*/
+/*	$NetBSD: ssshfs.c,v 1.8 2006/11/30 05:38:54 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -131,7 +131,7 @@ main(int argc, char *argv[])
 	    PUFFSFLAG_NOCACHE, 0))==NULL)
 		err(1, "mount");
 
-	if (puffs_mainloop(pu) == -1)
+	if (puffs_mainloop(pu, 0) == -1)
 		err(1, "mainloop");
 
 	return 0;
diff --git a/share/examples/puffs/sysctlfs/sysctlfs.c b/share/examples/puffs/sysctlfs/sysctlfs.c
index 395549fe6c2f..39adb953794a 100644
--- a/share/examples/puffs/sysctlfs/sysctlfs.c
+++ b/share/examples/puffs/sysctlfs/sysctlfs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctlfs.c,v 1.5 2006/11/21 23:19:45 pooka Exp $	*/
+/*	$NetBSD: sysctlfs.c,v 1.6 2006/11/30 05:38:54 pooka Exp $	*/
 
 /*
  * Copyright (c) 2006  Antti Kantee.  All Rights Reserved.
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
 	    PUFFSFLAG_NOCACHE, 0)) == NULL)
 		err(1, "mount");
 
-	if (puffs_mainloop(pu) == -1)
+	if (puffs_mainloop(pu, 0) == -1)
 		err(1, "mainloop");
 
 	return 0;