Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* adapt to libpuffs path changes

Browse Source 
* fix bug in rename
This commit is contained in:
pooka 2007-01-15 00:42:21 +00:00
parent 9a25a94ef7
commit 5d293715c8
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/puffs/mount_psshfs/fs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fs.c,v 1.2 2007/01/06 18:25:19 pooka Exp $ */ /* $NetBSD: fs.c,v 1.3 2007/01/15 00:42:21 pooka Exp $ */
/* /*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved. * Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -30,7 +30,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: fs.c,v 1.2 2007/01/06 18:25:19 pooka Exp $"); __RCSID("$NetBSD: fs.c,v 1.3 2007/01/15 00:42:21 pooka Exp $");
#endif /* !lint */ #endif /* !lint */
#include <err.h> #include <err.h>
@ -49,6 +49,7 @@ psshfs_domount(struct puffs_usermount *pu)
struct statvfs sb; struct statvfs sb;
struct psshfs_ctx *pctx = pu->pu_privdata; struct psshfs_ctx *pctx = pu->pu_privdata;
struct psshfs_node *root = &pctx->psn_root; struct psshfs_node *root = &pctx->psn_root;
struct puffs_pathobj *po_root;
struct vattr va; struct vattr va;
struct vattr *rva; struct vattr *rva;
struct psbuf *pb; struct psbuf *pb;
@ -125,8 +126,12 @@ psshfs_domount(struct puffs_usermount *pu)
memset(root, 0, sizeof(struct psshfs_node)); memset(root, 0, sizeof(struct psshfs_node));
pu->pu_pn_root = puffs_pn_new(pu, root); pu->pu_pn_root = puffs_pn_new(pu, root);
puffs_setrootpath(pu, rootpath);
free(rootpath); po_root = puffs_getrootpathobj(pu);
if (po_root == NULL)
err(1, "getrootpathobj");
po_root->po_path = rootpath;
po_root->po_len = strlen(rootpath);
rva = &pu->pu_pn_root->pn_va; rva = &pu->pu_pn_root->pn_va;
puffs_setvattr(rva, &va); puffs_setvattr(rva, &va);

29
usr.sbin/puffs/mount_psshfs/node.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: node.c,v 1.4 2007/01/11 18:50:42 pooka Exp $ */ /* $NetBSD: node.c,v 1.5 2007/01/15 00:42:21 pooka Exp $ */
/* /*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved. * Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -30,7 +30,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: node.c,v 1.4 2007/01/11 18:50:42 pooka Exp $"); __RCSID("$NetBSD: node.c,v 1.5 2007/01/15 00:42:21 pooka Exp $");
#endif /* !lint */ #endif /* !lint */
#include <assert.h> #include <assert.h>
@ -95,7 +95,7 @@ psshfs_node_getattr(struct puffs_cc *pcc, void *opc, struct vattr *vap,
/* XXX: expire by time */ /* XXX: expire by time */
if (!psn->hasvattr) { if (!psn->hasvattr) {
psbuf_req_str(pb, SSH_FXP_LSTAT, reqid, pn->pn_path); psbuf_req_str(pb, SSH_FXP_LSTAT, reqid, PNPATH(pn));
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
puffs_cc_yield(pcc); puffs_cc_yield(pcc);
@ -121,7 +121,7 @@ psshfs_node_setattr(struct puffs_cc *pcc, void *opc,
struct vattr kludgeva; struct vattr kludgeva;
struct puffs_node *pn = opc; struct puffs_node *pn = opc;
psbuf_req_str(pb, SSH_FXP_SETSTAT, reqid, pn->pn_path); psbuf_req_str(pb, SSH_FXP_SETSTAT, reqid, PNPATH(pn));
memcpy(&kludgeva, va, sizeof(struct vattr)); memcpy(&kludgeva, va, sizeof(struct vattr));
@ -169,8 +169,7 @@ psshfs_node_create(struct puffs_cc *pcc, void *opc, void **newnode,
goto out; goto out;
} }
psbuf_req_data(pb, SSH_FXP_OPEN, reqid, pcn->pcn_fullpath, psbuf_req_str(pb, SSH_FXP_OPEN, reqid, PCNPATH(pcn));
strlen(pcn->pcn_fullpath));
psbuf_put_4(pb, SSH_FXF_WRITE | SSH_FXF_CREAT | SSH_FXF_TRUNC); psbuf_put_4(pb, SSH_FXF_WRITE | SSH_FXF_CREAT | SSH_FXF_TRUNC);
psbuf_put_vattr(pb, va); psbuf_put_vattr(pb, va);
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
@ -245,7 +244,7 @@ psshfs_node_read(struct puffs_cc *pcc, void *opc, uint8_t *buf,
} }
puffs_vattr_null(&va); puffs_vattr_null(&va);
psbuf_req_str(pb, SSH_FXP_OPEN, reqid, pn->pn_path); psbuf_req_str(pb, SSH_FXP_OPEN, reqid, PNPATH(pn));
psbuf_put_4(pb, SSH_FXF_READ); psbuf_put_4(pb, SSH_FXF_READ);
psbuf_put_vattr(pb, &va); psbuf_put_vattr(pb, &va);
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
@ -335,7 +334,7 @@ psshfs_node_write(struct puffs_cc *pcc, void *opc, uint8_t *buf,
offset = pn->pn_va.va_size; offset = pn->pn_va.va_size;
puffs_vattr_null(&va); puffs_vattr_null(&va);
psbuf_req_str(pb, SSH_FXP_OPEN, reqid, pn->pn_path); psbuf_req_str(pb, SSH_FXP_OPEN, reqid, PNPATH(pn));
psbuf_put_4(pb, oflags); psbuf_put_4(pb, oflags);
psbuf_put_vattr(pb, &va); psbuf_put_vattr(pb, &va);
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
@ -398,7 +397,7 @@ psshfs_node_readlink(struct puffs_cc *pcc, void *opc,
goto out; goto out;
} }
psbuf_req_str(pb, SSH_FXP_READLINK, reqid, pn->pn_path); psbuf_req_str(pb, SSH_FXP_READLINK, reqid, PNPATH(pn));
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
puffs_cc_yield(pcc); puffs_cc_yield(pcc);
@ -434,7 +433,7 @@ psshfs_node_remove(struct puffs_cc *pcc, void *opc, void *targ,
goto out; goto out;
} }
psbuf_req_str(pb, SSH_FXP_REMOVE, reqid, pn_targ->pn_path); psbuf_req_str(pb, SSH_FXP_REMOVE, reqid, PNPATH(pn_targ));
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
puffs_cc_yield(pcc); puffs_cc_yield(pcc);
@ -462,7 +461,7 @@ psshfs_node_mkdir(struct puffs_cc *pcc, void *opc, void **newnode,
goto out; goto out;
} }
psbuf_req_str(pb, SSH_FXP_MKDIR, reqid, pcn->pcn_fullpath); psbuf_req_str(pb, SSH_FXP_MKDIR, reqid, PCNPATH(pcn));
psbuf_put_vattr(pb, va); psbuf_put_vattr(pb, va);
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
@ -486,7 +485,7 @@ psshfs_node_rmdir(struct puffs_cc *pcc, void *opc, void *targ,
PSSHFSAUTOVAR(pcc); PSSHFSAUTOVAR(pcc);
struct puffs_node *pn_targ = targ; struct puffs_node *pn_targ = targ;
psbuf_req_str(pb, SSH_FXP_RMDIR, reqid, pn_targ->pn_path); psbuf_req_str(pb, SSH_FXP_RMDIR, reqid, PNPATH(pn_targ));
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
puffs_cc_yield(pcc); puffs_cc_yield(pcc);
@ -523,7 +522,7 @@ psshfs_node_symlink(struct puffs_cc *pcc, void *opc, void **newnode,
* Let's go with openssh and build quirk tables later if we care * Let's go with openssh and build quirk tables later if we care
*/ */
psbuf_req_str(pb, SSH_FXP_SYMLINK, reqid, link_target); psbuf_req_str(pb, SSH_FXP_SYMLINK, reqid, link_target);
psbuf_put_str(pb, pcn->pcn_fullpath); psbuf_put_str(pb, PCNPATH(pcn));
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
puffs_cc_yield(pcc); puffs_cc_yield(pcc);
@ -560,8 +559,8 @@ psshfs_node_rename(struct puffs_cc *pcc, void *opc, void *src,
goto out; goto out;
} }
psbuf_req_str(pb, SSH_FXP_RENAME, reqid, pcn_src->pcn_fullpath); psbuf_req_str(pb, SSH_FXP_RENAME, reqid, PCNPATH(pcn_src));
psbuf_put_str(pb, pcn_targ->pcn_fullpath); psbuf_put_str(pb, PCNPATH(pcn_targ));
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
puffs_cc_yield(pcc); puffs_cc_yield(pcc);

4
usr.sbin/puffs/mount_psshfs/psshfs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: psshfs.h,v 1.2 2007/01/06 18:25:19 pooka Exp $ */ /* $NetBSD: psshfs.h,v 1.3 2007/01/15 00:42:21 pooka Exp $ */
/* /*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved. * Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -190,6 +190,6 @@ struct puffs_node *makenode(struct puffs_usermount *, struct puffs_node *,
struct puffs_node *allocnode(struct puffs_usermount *, struct puffs_node *, struct puffs_node *allocnode(struct puffs_usermount *, struct puffs_node *,
const char *, const struct vattr *); const char *, const struct vattr *);
struct psshfs_dir *direnter(struct puffs_node *, const char *); struct psshfs_dir *direnter(struct puffs_node *, const char *);
void nukenode(struct puffs_node *, const char *); void nukenode(struct puffs_node *, const char *, int);
#endif /* PSSHFS_H_ */ #endif /* PSSHFS_H_ */

6
usr.sbin/puffs/mount_psshfs/subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr.c,v 1.6 2007/01/11 18:50:42 pooka Exp $ */ /* $NetBSD: subr.c,v 1.7 2007/01/15 00:42:21 pooka Exp $ */
/* /*
* Copyright (c) 2006 Antti Kantee. All Rights Reserved. * Copyright (c) 2006 Antti Kantee. All Rights Reserved.
@ -30,7 +30,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: subr.c,v 1.6 2007/01/11 18:50:42 pooka Exp $"); __RCSID("$NetBSD: subr.c,v 1.7 2007/01/15 00:42:21 pooka Exp $");
#endif /* !lint */ #endif /* !lint */
#include <assert.h> #include <assert.h>
@ -106,7 +106,7 @@ sftp_readdir(struct puffs_cc *pcc, struct psshfs_ctx *pctx,
puffs_inval_namecache_dir(puffs_cc_getusermount(pcc), pn); puffs_inval_namecache_dir(puffs_cc_getusermount(pcc), pn);
pb = psbuf_make(PSB_OUT); pb = psbuf_make(PSB_OUT);
psbuf_req_str(pb, SSH_FXP_OPENDIR, reqid, pn->pn_path); psbuf_req_str(pb, SSH_FXP_OPENDIR, reqid, PNPATH(pn));
pssh_outbuf_enqueue(pctx, pb, pcc, reqid); pssh_outbuf_enqueue(pctx, pb, pcc, reqid);
puffs_cc_yield(pcc); puffs_cc_yield(pcc);