Unified · Split
| @@ -105,7 +105,7 @@ err: · 104 unmodified lines | |||
| 105 | r->type = Rerror; | 105 | r->type = Rerror; |
| 106 | return -1; | 106 | return -1; |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | int | 109 | int |
| 110 | _9pversion(u32int m) | 110 | _9pversion(u32int m) |
| 111 | { | 111 | { |
| @@ -165,7 +165,7 @@ _9pattach(u32int fid, u32int afid, char* uname, char *aname) · 53 unmodified lines | |||
| 165 | f->fid = fid; | 165 | f->fid = fid; |
| 166 | f->qid = rattach.qid; | 166 | f->qid = rattach.qid; |
| 167 | return f; | 167 | return f; |
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | FFid* | 170 | FFid* |
| 171 | _9pwalkr(FFid *r, char *path) | 171 | _9pwalkr(FFid *r, char *path) |
| @@ -262,7 +262,7 @@ int · 90 unmodified lines | |||
| 262 | _9popen(FFid *f) | 262 | _9popen(FFid *f) |
| 263 | { | 263 | { |
| 264 | Fcall topen, ropen; | 264 | Fcall topen, ropen; |
| 265 | 265 | ||
| 266 | topen.type = Topen; | 266 | topen.type = Topen; |
| 267 | topen.fid = f->fid; | 267 | topen.fid = f->fid; |
| 268 | topen.mode = f->mode; | 268 | topen.mode = f->mode; |
| @@ -489,7 +489,7 @@ uniqfid(void) · 220 unmodified lines | |||
| 489 | while((f = lookupfid(fid, PUT)) == NULL); | 489 | while((f = lookupfid(fid, PUT)) == NULL); |
| 490 | return f; | 490 | return f; |
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | 493 | ||
| 494 | FFid* | 494 | FFid* |
| 495 | lookupfid(u32int fid, int act) | 495 | lookupfid(u32int fid, int act) |
| @@ -522,7 +522,7 @@ lookupfid(u32int fid, int act) · 26 unmodified lines | |||
| 522 | f = FDEL; | 522 | f = FDEL; |
| 523 | break; | 523 | break; |
| 524 | } | 524 | } |
| 525 | return f; | 525 | return f; |
| 526 | } | 526 | } |
| 527 | 527 | ||
| 528 | FFid* | 528 | FFid* |
| @@ -178,8 +178,8 @@ fsrename(const char *opath, const char *npath) · 177 unmodified lines | |||
| 178 | free(d); | 178 | free(d); |
| 179 | clearcache(opath); | 179 | clearcache(opath); |
| 180 | return 0; | 180 | return 0; |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | int | 183 | int |
| 184 | fsopen(const char *path, struct fuse_file_info *ffi) | 184 | fsopen(const char *path, struct fuse_file_info *ffi) |
| 185 | { | 185 | { |
| @@ -559,7 +559,7 @@ main(int argc, char *argv[]) · 373 unmodified lines | |||
| 559 | DPRINT("About to fuse_main\n"); | 559 | DPRINT("About to fuse_main\n"); |
| 560 | fuse_main(fargp - fusearg, fusearg, &fsops, NULL); | 560 | fuse_main(fargp - fusearg, fusearg, &fsops, NULL); |
| 561 | exit(0); | 561 | exit(0); |
| 562 | } | 562 | } |
| 563 | 563 | ||
| 564 | void | 564 | void |
| 565 | dir2stat(struct stat *s, Dir *d) | 565 | dir2stat(struct stat *s, Dir *d) |
| @@ -583,7 +583,7 @@ dir2stat(struct stat *s, Dir *d) · 17 unmodified lines | |||
| 583 | s->st_atime = d->atime; | 583 | s->st_atime = d->atime; |
| 584 | s->st_mtime = s->st_ctime = d->mtime; | 584 | s->st_mtime = s->st_ctime = d->mtime; |
| 585 | s->st_rdev = 0; | 585 | s->st_rdev = 0; |
| 586 | } | 586 | } |
| 587 | 587 | ||
| 588 | void | 588 | void |
| 589 | clearcache(const char *path) | 589 | clearcache(const char *path) |
| @@ -648,7 +648,7 @@ addtocache(const char *path) · 58 unmodified lines | |||
| 648 | free(dname); | 648 | free(dname); |
| 649 | return iscached(path); | 649 | return iscached(path); |
| 650 | } | 650 | } |
| 651 | 651 | ||
| 652 | int | 652 | int |
| 653 | iscachectl(const char *path) | 653 | iscachectl(const char *path) |
| 654 | { | 654 | { |
| @@ -17,7 +17,7 @@ struct Fcall · 16 unmodified lines | |||
| 17 | u32int afid; /* Tauth, Tattach */ | 17 | u32int afid; /* Tauth, Tattach */ |
| 18 | char *uname; /* Tauth, Tattach */ | 18 | char *uname; /* Tauth, Tattach */ |
| 19 | char *aname; /* Tauth, Tattach */ | 19 | char *aname; /* Tauth, Tattach */ |
| 20 | u32int perm; /* Tcreate */ | 20 | u32int perm; /* Tcreate */ |
| 21 | char *name; /* Tcreate */ | 21 | char *name; /* Tcreate */ |
| 22 | uchar mode; /* Tcreate, Topen */ | 22 | uchar mode; /* Tcreate, Topen */ |
| 23 | u32int newfid; /* Twalk */ | 23 | u32int newfid; /* Twalk */ |
| @@ -31,7 +31,7 @@ struct Fcall · 7 unmodified lines | |||
| 31 | ushort nstat; /* Twstat, Rstat */ | 31 | ushort nstat; /* Twstat, Rstat */ |
| 32 | uchar *stat; /* Twstat, Rstat */ | 32 | uchar *stat; /* Twstat, Rstat */ |
| 33 | int unixfd; /* Ropenfd */ | 33 | int unixfd; /* Ropenfd */ |
| 34 | 34 | ||
| 35 | /* 9P2000.u extensions */ | 35 | /* 9P2000.u extensions */ |
| 36 | int errornum; /* Rerror */ | 36 | int errornum; /* Rerror */ |
| 37 | int uidnum; /* Tattach, Tauth */ | 37 | int uidnum; /* Tattach, Tauth */ |
| @@ -41,7 +41,7 @@ convM2D(uchar *buf, uint nbuf, Dir *d, char *strs) · 40 unmodified lines | |||
| 41 | int i, ns, nstr; | 41 | int i, ns, nstr; |
| 42 | 42 | ||
| 43 | if(nbuf < STATFIXLEN) | 43 | if(nbuf < STATFIXLEN) |
| 44 | return 0; | 44 | return 0; |
| 45 | 45 | ||
| 46 | p = buf; | 46 | p = buf; |
| 47 | ebuf = buf + nbuf; | 47 | ebuf = buf + nbuf; |
| @@ -82,7 +82,7 @@ convM2D(uchar *buf, uint nbuf, Dir *d, char *strs) · 34 unmodified lines | |||
| 82 | } | 82 | } |
| 83 | p += ns; | 83 | p += ns; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | if(strs){ | 86 | if(strs){ |
| 87 | d->name = sv[0]; | 87 | d->name = sv[0]; |
| 88 | d->uid = sv[1]; | 88 | d->uid = sv[1]; |
| @@ -94,6 +94,6 @@ convM2D(uchar *buf, uint nbuf, Dir *d, char *strs) · 5 unmodified lines | |||
| 94 | d->gid = nullstring; | 94 | d->gid = nullstring; |
| 95 | d->muid = nullstring; | 95 | d->muid = nullstring; |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | return p - buf; | 98 | return p - buf; |
| 99 | } | 99 | } |