commit - 233feb69cf7434f907fbcb9cf5b47f2e76b67fee
commit + c52cda306150e366fe27b9297baeff6a7449a47d
blob - 5e51c84ab7a3581fa1b2fe44e3ae1ccfd06ffdbc
blob + b7384b7fb65962f118904e9d7b0c4aba6a68f10b
--- src/cmd/vac/file.c
+++ src/cmd/vac/file.c
elem[n] = 0;
ff = _filewalk(f, elem, partial && *p=='\0');
if(ff == nil){
- werrstr("%.*s: %R", utfnlen(opath, p-opath), opath);
+ werrstr("%.*s: %r", utfnlen(opath, p-opath), opath);
goto Err;
}
vacfiledecref(f);
blob - a2ac21550cee76c1ea7cb2db28fc0b8b8e1ba8f9
blob + 24165ae1d7b525be4c9fa2e166002d2a48e89b06
--- src/cmd/vac/unvac.c
+++ src/cmd/vac/unvac.c
#include "stdinc.h"
-#include <auth.h>
-#include <fcall.h>
-#include <thread.h>
+#include <fcall.h> /* dirmodefmt */
#include "vac.h"
VacFs *fs;
fmtinstall('H', encodefmt);
fmtinstall('V', vtscorefmt);
fmtinstall('F', vtfcallfmt);
- fmtinstall('T', mtimefmt);
+ fmtinstall('t', mtimefmt);
fmtinstall('M', dirmodefmt);
host = nil;
unvac(VacFile *f, char *name, VacDir *vdir)
{
static char buf[65536];
- int fd, mode, n, mode9;
+ int fd, n;
+ ulong mode, mode9;
char *newname;
char *what;
vlong off;
mode9 |= DMSETGID;
if(mode&ModeDevice)
mode9 |= DMDEVICE;
- print("%M %-10s %-10s %11lld %T %s\n",
+ print("%M %-10s %-10s %11lld %t %s\n",
mode9, vdir->uid, vdir->gid, vdir->size,
vdir->mtime, name);
}else
blob - 1ce3e2df57f6fc902478335128b230acd45bfe85
blob + 92349ed266e21e235e1d79a9e98eebe0683f85a6
--- src/cmd/vac/vacfs.c
+++ src/cmd/vac/vacfs.c
#include "stdinc.h"
-#include <auth.h>
#include <fcall.h>
-#include <thread.h>
#include "vac.h"
typedef struct Fid Fid;
char*
rwrite(Fid *f)
{
- char *buf;
- vlong off;
- int cnt;
- VacFile *vf;
-
- if(!f->busy)
- return vtstrdup(Enotexist);
- vf = f->file;
- thdr.count = 0;
- off = rhdr.offset;
- buf = rhdr.data;
- cnt = rhdr.count;
- if(f->qid.type & QTDIR)
- return "file is a directory";
- thdr.count = vacfilewrite(vf, buf, cnt, off, "none");
- if(thdr.count < 0) {
- char err[80];
-
- rerrstr(err, sizeof err);
-fprint(2, "write failed: %s\n", err);
- return vtstrdup(err);
- }
- return 0;
+ return vtstrdup(Erdonly);
}
char *