merge

[plan9front.git] / sys / src / cmd / test.c

diff --git a/sys/src/cmd/test.c b/sys/src/cmd/test.c
old mode 100755 (executable)
new mode 100644 (file)
index 4231807..5c7c176
--- a/sys/src/cmd/test.c
+++ b/sys/src/cmd/test.c
@@ -143,16 +143,16 @@ e3(void)
                return(isdir(nxtarg(0)));
 
        if(EQ(a, "-r"))
-               return(tio(nxtarg(0), 4));
+               return(tio(nxtarg(0), AREAD));
 
        if(EQ(a, "-w"))
-               return(tio(nxtarg(0), 2));
+               return(tio(nxtarg(0), AWRITE));
 
        if(EQ(a, "-x"))
-               return(tio(nxtarg(0), 1));
+               return(tio(nxtarg(0), AEXEC));
 
        if(EQ(a, "-e"))
-               return(tio(nxtarg(0), 0));
+               return(tio(nxtarg(0), AEXIST));
 
        if(EQ(a, "-c"))
                return(0);
@@ -338,11 +338,13 @@ isolder(char *pin, char *f)
 
        /* parse time */
        n = 0;
+       r = 1;
        while(*p){
                m = strtoul(p, &p, 0);
                switch(*p){
                case 0:
                        n = m;
+                       r = 0;
                        break;
                case 'y':
                        m *= 12;
@@ -368,7 +370,9 @@ isolder(char *pin, char *f)
                }
        }
 
-       r = dir->mtime + n < time(0);
+       if (r != 0)
+               n = time(0) - n;
+       r = dir->mtime < n;
        free(dir);
        return r;
 }