From d1b585cfe24c6fd89865a1301ec933597c4de5e6 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 29 May 2007 12:23:05 +0000 Subject: [PATCH] fix name bug; try to use bigger offsets --- kern/devfs-posix.c | 7 +++---- kern/devfs-win32.c | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kern/devfs-posix.c b/kern/devfs-posix.c index 5068fdd..23a7dbc 100644 --- a/kern/devfs-posix.c +++ b/kern/devfs-posix.c @@ -1,3 +1,4 @@ +#include "u.h" #include #include #include @@ -9,7 +10,6 @@ #ifndef NAME_MAX # define NAME_MAX 256 #endif -#include "u.h" #include "lib.h" #include "dat.h" #include "fns.h" @@ -33,7 +33,7 @@ struct Ufsinfo int uid; int gid; DIR* dir; - ulong offset; + vlong offset; QLock oq; char nextname[NAME_MAX]; }; @@ -160,8 +160,7 @@ fswalk(Chan *c, Chan *nc, char **name, int nname) cname = addelem(cname, name[i]); wq->qid[i] = nc->qid; } - nc->name = nil; - cnameclose(cname); + nc->name = cname; if(i != nname){ cclose(nc); wq->clone = nil; diff --git a/kern/devfs-win32.c b/kern/devfs-win32.c index ee6750a..98f5400 100644 --- a/kern/devfs-win32.c +++ b/kern/devfs-win32.c @@ -172,8 +172,7 @@ fswalk(Chan *c, Chan *nc, char **name, int nname) cname = addelem(cname, name[i]); wq->qid[i] = nc->qid; } - nc->name = nil; - cnameclose(cname); + nc->name = cname; if(i != nname){ cclose(nc); wq->clone = nil;