merge

[plan9front.git] / sys / src / cmd / ip / cifsd / dir.c

diff --git a/sys/src/cmd/ip/cifsd/dir.c b/sys/src/cmd/ip/cifsd/dir.c
index 91db8506a202c793437a6214460d7b21ca47dd8a..65707bcb8e356b5d1b7ffc7f56bd80de3c90cf34 100644 (file)
--- a/sys/src/cmd/ip/cifsd/dir.c
+++ b/sys/src/cmd/ip/cifsd/dir.c
@@ -31,7 +31,7 @@ xdirdup(Dir *d, int n)
                if(d[i].gid) p += strlen(d[i].gid)+1;
                if(d[i].muid) p += strlen(d[i].muid)+1;
        }
-       o = malloc(n*sizeof(*d) + (int)p);
+       o = malloc(n*sizeof(*d) + (uintptr)p);
        memmove(o, d, n*sizeof(*d));
        p = (char*)&o[n];
        for(i=0; i<n; i++){
@@ -160,7 +160,7 @@ xdirread0(char **path, int (*namecmp)(char *, char *), Dir **d)
        n = -1;
        if(fd < 0 || t == nil)
                goto out;
-       if(t->qid.type != QTDIR){
+       if((t->qid.type & QTDIR) == 0){
                werrstr("not a directory");
                goto out;
        }