commit 86122474029f9aa85a6d036d23e8a4fa60d5ed4b from: rsc date: Fri Jan 27 04:08:41 2006 UTC more commit - 56e3c29015da2147dbb308b4957fffceebcda657 commit + 86122474029f9aa85a6d036d23e8a4fa60d5ed4b blob - 98c6cfb2a4244dc9658606ed5e9616f1ecd94de1 blob + 9303b17dd209afd77ed044c3e2f088c9d46d40f8 --- src/lib9pclient/close.c +++ src/lib9pclient/close.c @@ -27,3 +27,16 @@ fsclose(CFid *fid) /* maybe someday there will be a ref count */ fidclunk(fid); } + +int +fsfremove(CFid *fid) +{ + int n; + Fcall tx, rx; + + tx.type = Tremove; + tx.fid = fid->fid; + n = _fsrpc(fid->fs, &tx, &rx, 0); + _fsputfid(fid); + return n; +} blob - cbb4a3acc340864b134984c361d31090ad6d7667 blob + 934655ab68978f5159e6c4d4572ec5369134048f --- src/lib9pclient/create.c +++ src/lib9pclient/create.c @@ -9,17 +9,37 @@ fscreate(CFsys *fs, char *name, int mode, ulong perm) { CFid *fid; Fcall tx, rx; + char *p, *dir, *elem; + + p = strrchr(name, '/'); + if(p == nil){ + dir = ""; + elem = name; + }else{ + dir = name; + *p = 0; + elem = p+1; + } - if((fid = _fswalk(fs->root, name)) == nil) +fprint(2, "create %s %s\n", dir, elem); + if((fid = _fswalk(fs->root, dir)) == nil){ + if(p) + *p = '/'; return nil; + } tx.type = Tcreate; + tx.name = elem; tx.fid = fid->fid; tx.mode = mode; tx.perm = perm; if(_fsrpc(fs, &tx, &rx, 0) < 0){ + if(p) + *p = '/'; fsclose(fid); return nil; } + if(p) + *p = '/'; fid->mode = mode; return fid; } blob - cbba95348803f6471afb48569ce59db16c8369d5 blob + 5f1eb78c67cc61173530790904177f779fa7cfa5 --- src/lib9pclient/mkfile +++ src/lib9pclient/mkfile @@ -12,6 +12,7 @@ OFILES=\ open.$O\ openfd.$O\ read.$O\ + remove.$O\ seek.$O\ stat.$O\ walk.$O\ blob - /dev/null blob + 1eb77cdccf306159a45af8538b159bae8fd43a74 (mode 644) --- /dev/null +++ src/lib9pclient/remove.c @@ -0,0 +1,19 @@ +/* Copyright (C) 2003 Russ Cox, Massachusetts Institute of Technology */ +/* See COPYRIGHT */ + +#include +#include +#include +#include <9pclient.h> +#include "fsimpl.h" + +int +fsremove(CFsys *fs, char *name) +{ + CFid *fid; + + if((fid = _fswalk(fs->root, name)) == nil) + return -1; + return fsfremove(fid); +} +