libregexp: improve the transition to next available thread, instruction, and generation

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

diff --git a/sys/src/cmd/webcookies.c b/sys/src/cmd/webcookies.c
index 02945ad1926dc70527057f51b110476e5ada9458..c338fa11350c79e1c3d844a816a3372ddf7ff4c9 100644 (file)
--- a/sys/src/cmd/webcookies.c
+++ b/sys/src/cmd/webcookies.c
@@ -377,7 +377,7 @@ syncjar(Jar *jar)
 
        fd = -1;
        for(i=0; i<50; i++){
-               if((fd = create(jar->lockfile, OWRITE, DMEXCL|0666)) < 0){
+               if((fd = create(jar->lockfile, OWRITE, DMEXCL|0600)) < 0){
                        sleep(100);
                        continue;
                }
@@ -416,10 +416,12 @@ syncjar(Jar *jar)
        purgejar(jar);
 
        if(dowrite){
-               b = Bopen(jar->file, OTRUNC|OWRITE);
-               if(b == nil){
+               i = create(jar->file, OWRITE, 0600);
+               if(i < 0 || (b = Bfdopen(i, OWRITE)) == nil){
                        if(debug)
                                fprint(2, "Bopen write %s: %r", jar->file);
+                       if(i >= 0)
+                               close(i);
                        close(fd);
                        return -1;
                }
@@ -446,6 +448,27 @@ syncjar(Jar *jar)
        return 0;
 }
 
+void
+closejar(Jar *jar)
+{
+       int i;
+
+       if(jar == nil)
+               return;
+       expirejar(jar, 0);
+       if(jar->dirty)
+               if(syncjar(jar) < 0)
+                       fprint(2, "warning: cannot rewrite cookie jar: %r\n");
+
+       for(i=0; i<jar->nc; i++)
+               freecookie(&jar->c[i]);
+
+       free(jar->lockfile);
+       free(jar->file);
+       free(jar->c);
+       free(jar);      
+}
+
 Jar*
 readjar(char *file)
 {
@@ -453,6 +476,7 @@ readjar(char *file)
        Jar *jar;
 
        jar = newjar();
+       file = estrdup9p(file);
        lock = emalloc9p(strlen(file)+10);
        strcpy(lock, file);
        if((p = strrchr(lock, '/')) != nil)
@@ -467,33 +491,12 @@ readjar(char *file)
        jar->dirty = 0;
 
        if(syncjar(jar) < 0){
-               free(jar->file);
-               free(jar->lockfile);
-               free(jar);
+               closejar(jar);
                return nil;
        }
        return jar;
 }
 
-void
-closejar(Jar *jar)
-{
-       int i;
-
-       if(jar == nil)
-               return;
-       expirejar(jar, 0);
-       if(jar->dirty)
-               if(syncjar(jar) < 0)
-                       fprint(2, "warning: cannot rewrite cookie jar: %r\n");
-
-       for(i=0; i<jar->nc; i++)
-               freecookie(&jar->c[i]);
-
-       free(jar->file);
-       free(jar->c);
-       free(jar);      
-}
 
 /*
  * Domain name matching is per RFC2109, section 2:
@@ -522,7 +525,7 @@ isdomainmatch(char *name, char *pattern)
 {
        int lname, lpattern;
 
-       if(cistrcmp(name, pattern)==0)
+       if(cistrcmp(name, pattern + (pattern[0]=='.'))==0)
                return 1;
 
        if(strcmp(ipattr(name), "dom")==0 && pattern[0]=='.'){
@@ -589,13 +592,13 @@ isbadcookie(Cookie *c, char *dom, char *path)
        if(c->explicitdom && c->dom[0] != '.')
                return "cookie domain doesn't start with dot";
 
-       if(memchr(c->dom+1, '.', strlen(c->dom)-1-1) == nil)
+       if(strlen(c->dom)<=2 || memchr(c->dom+1, '.', strlen(c->dom)-2) == nil)
                return "cookie domain doesn't have embedded dots";
 
        if(!isdomainmatch(dom, c->dom))
                return "request host does not match cookie domain";
 
-       if(strcmp(ipattr(dom), "dom")==0
+       if(strcmp(ipattr(dom), "dom")==0 && strlen(dom)>strlen(c->dom)
        && memchr(dom, '.', strlen(dom)-strlen(c->dom)) != nil)
                return "request host contains dots before cookie domain";
 
@@ -720,9 +723,9 @@ strtotime(char *s)
                return -1;
        }
 
-       tm.hour = atoi(s);
-       tm.min = atoi(s+3);
-       tm.sec = atoi(s+6);
+       tm.hour = strtol(s, 0, 10);
+       tm.min = strtol(s+3, 0, 10);
+       tm.sec = strtol(s+6, 0, 10);
        if(tm.hour >= 24 || tm.min >= 60 || tm.sec >= 60){
                if(debug)
                        fprint(2, "invalid time (%s)\n", os);
@@ -973,28 +976,27 @@ parsecookie(Cookie *c, char *p, char **e, int isns, char *dom, char *path)
        if(c->dom){
                /* add leading dot for explicit domain */
                if(c->dom[0] != '.' && strcmp(ipattr(c->dom), "dom") == 0){
-                       static char *ddom = nil;
+                       static char ddom[1024];
 
-                       ddom = realloc(ddom, strlen(c->dom)+2);
-                       if(ddom != nil){
-                               ddom[0] = '.';
-                               strcpy(ddom+1, c->dom);
-                               c->dom = ddom;
-                       }
+                       ddom[0] = '.';
+                       ddom[sizeof(ddom)-1] = '\0';
+                       strncpy(ddom+1, c->dom, sizeof(ddom)-2);
+                       c->dom = ddom;
                }
                c->explicitdom = 1;
        }else
                c->dom = dom;
        if(c->path)
                c->explicitpath = 1;
-       else{
-               c->path = path;
-               if((t = strchr(c->path, '#')) != 0)
-                       *t = '\0';
-               if((t = strchr(c->path, '?')) != 0)
-                       *t = '\0';
-               if((t = strrchr(c->path, '/')) != 0)
-                       *t = '\0';
+       else {
+               static char dpath[1024];
+
+               /* implicit path is "directory" of request-uri's path component */
+               dpath[sizeof(dpath)-1] = '\0';
+               strncpy(dpath, path, sizeof(dpath)-1);
+               if((t = strrchr(dpath, '/')) != nil)
+                       t[1] = '\0';
+               c->path = dpath;
        }
        c->netscapestyle = isns;
 
@@ -1130,9 +1132,14 @@ fswrite(Req *r)
                        p = strchr(buf+hlen, '/');
                        if(p == nil)
                                a->path = estrdup9p("/");
-                       else{
+                       else {
                                a->path = estrdup9p(p);
                                *p = '\0';
+
+                               if((p = strchr(a->path, '#')) != nil)
+                                       *p = '\0';
+                               if((p = strchr(a->path, '?')) != nil)
+                                       *p = '\0';
                        }
                        a->dom = estrdup9p(buf+hlen);
                        a->state = HaveUrl;
@@ -1146,8 +1153,7 @@ fswrite(Req *r)
                                }
                        }
                        snprint(a->outhttp, AuxBuf, "%J", j);
-                       if(j)
-                               closejar(j);
+                       closejar(j);
                }else{
                        if(strlen(a->inhttp)+r->ifcall.count >= AuxBuf){
                                respond(r, "http headers too large");
@@ -1245,7 +1251,6 @@ void
 main(int argc, char **argv)
 {
        char *file, *mtpt, *home, *srv;
-       int fd;
 
        file = nil;
        srv = nil;
@@ -1285,12 +1290,7 @@ main(int argc, char **argv)
                strcpy(file, home);
                strcat(file, "/lib/webcookies");
        }
-       if(access(file, AEXIST) < 0){
-               if((fd = create(file, OWRITE, 0600)) < 0)
-                       sysfatal("create %s: %r", file);
-               close(fd);
-       }
-                       
+
        jar = readjar(file);
        if(jar == nil)
                sysfatal("readjar: %r");