 @@ -1,14 +1,14 @@
-/*	$NetBSD: fs.c,v 1.22 2010/04/01 02:34:09 pooka Exp $	*/
+/*	$NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $	*/
 /*
  * Copyright (c) 2006-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.
+ *
 @@ -17,48 +17,46 @@
  * 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.22 2010/04/01 02:34:09 pooka Exp $");
+__RCSID("$NetBSD: fs.c,v 1.23 2010/10/29 16:13:51 pooka Exp $");
 #endif /* !lint */
 #include <err.h>
 #include <errno.h>
 #include <puffs.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include "psshfs.h"
 #include "sftp_proto.h"
 #define DO_IO(fname, a1, a2, a3, a4, rv)				\
 do {									\
 	puffs_framebuf_seekset(a2, 0);					\
 	*(a4) = 0;							\
 	rv = fname(a1, a2, a3, a4);					\
 	if (rv || a4 == 0) {						\
 		fprintf(stderr, "psshfs_handshake failed %d (%s) %d\n",	\
 		    rv, strerror(rv), *a4);				\
 		return rv ? rv : EPROTO;				\
 	}								\
 } while (/*CONSTCOND*/0)
 #define reterr(str, rv)							\
 do {									\
 	fprintf str;							\
 	return rv;							\
 } while (/*CONSTCOND*/0)
 /* openssh extensions */
 static const struct extunit {
 	const char *ext;
 @@ -72,27 +70,27 @@ static const struct extunit {
 },{
 	"statvfs@openssh.com",
 	"2",
 	SFTP_EXT_STATVFS,
 },{
 	"fstatvfs@openssh.com",
 	"2",
 	SFTP_EXT_FSTATVFS,
 },{
 	NULL,
 	NULL,
 }};
 int
 psshfs_handshake(struct puffs_usermount *pu, int fd)
+{
 	struct psshfs_ctx *pctx = puffs_getspecific(pu);
 	struct puffs_framebuf *pb;
 	struct puffs_pathobj *po_root;
 	struct puffs_node *pn_root;
 	struct vattr va, *rva;
 	const struct extunit *extu;
 	char *rootpath;
 	char *ext, *val;
 	uint32_t count;
 	int rv, done;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: node.c,v 1.61 2010/04/01 02:34:09 pooka Exp $	*/
+/*	$NetBSD: node.c,v 1.62 2010/10/29 16:13:51 pooka Exp $	*/
 /*
  * Copyright (c) 2006-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.
+ *
 @@ -17,27 +17,27 @@
  * 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: node.c,v 1.61 2010/04/01 02:34:09 pooka Exp $");
+__RCSID("$NetBSD: node.c,v 1.62 2010/10/29 16:13:51 pooka Exp $");
 #endif /* !lint */
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "psshfs.h"
 #include "sftp_proto.h"
 int
 psshfs_node_lookup(struct puffs_usermount *pu, puffs_cookie_t opc,
 	struct puffs_newinfo *pni, const struct puffs_cn *pcn)
 @@ -352,28 +352,29 @@ psshfs_node_readdir(struct puffs_usermou
 		set_readdir = 0;
 		pw.pw_cc = pcc;
 		pw.pw_type = PWTYPE_READDIR;
 		TAILQ_INSERT_TAIL(&psn->pw, &pw, pw_entries);
 		puffs_cc_yield(pcc);
 		goto restart;
 	} else {
 		psn->stat |= PSN_READDIR;
 		set_readdir = 1;
+	}
 	*ncookies = 0;
 	rv = sftp_readdir(pu, pctx, pn);
-	if (rv)
+	if (rv) {
 		goto out;
+	}
 	/* find next dirent */
 	for (i = *readoff;;i++) {
 		if (i >= psn->dentnext)
 			goto out;
 		pd = &psn->dir[i];
 		if (pd->valid)
 			break;
+	}
 	for (;;) {
 		*readoff = i;
 		if (!puffs_nextdent(&dent, pd->entryname,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: psshfs.c,v 1.61 2010/02/17 15:54:10 pooka Exp $	*/
+/*	$NetBSD: psshfs.c,v 1.62 2010/10/29 16:13:51 pooka Exp $	*/
 /*
  * Copyright (c) 2006-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.
+ *
 @@ -31,27 +31,27 @@
  * psshfs implements sshfs functionality on top of puffs making it
  * possible to mount a filesystme through the sftp service.
+ *
  * psshfs can execute multiple operations in "parallel" by using the
  * puffs_cc framework for continuations.
+ *
  * Concurrency control is handled currently by vnode locking (this
  * will change in the future).  Context switch locations are easy to
  * find by grepping for puffs_framebuf_enqueue_cc().
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: psshfs.c,v 1.61 2010/02/17 15:54:10 pooka Exp $");
+__RCSID("$NetBSD: psshfs.c,v 1.62 2010/10/29 16:13:51 pooka Exp $");
 #endif /* !lint */
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <mntopts.h>
 #include <paths.h>
 #include <poll.h>
 #include <puffs.h>
 #include <signal.h>
 @@ -405,27 +405,27 @@ pssh_connect(struct puffs_usermount *pu,
 			dup2(dnfd, STDERR_FILENO);
 		execvp(sshargs[0], sshargs);
 		/*NOTREACHED*/
 		break;
 	default:
 		*sshpid = pid;
 		*sshfd = fds[1];
 		close(fds[0]);
 		break;
+	}
 	if (psshfs_handshake(pu, *sshfd) != 0)
-		errx(1, "psshfs_handshake %d", which);
+		errx(1, "handshake failed, server does not support sftp?");
 	x = 1;
 	if (ioctl(*sshfd, FIONBIO, &x) == -1)
 		err(1, "nonblocking descriptor %d", which);
 	return *sshfd;
+}
 static void *
 invalone(struct puffs_usermount *pu, struct puffs_node *pn, void *arg)
+{
 	struct psshfs_node *psn = pn->pn_data;
 	psn->attrread = 0;