X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fdirplex.c;h=063fbb4135812c8a95e8ca1474fd0682d397e73f;hb=cceb36110d6caa3a44827652d836ac6862d17ff9;hp=ef001cfbd822508dd5e0f5c5f62403ffbf15fd9e;hpb=d422fdfd62d851b345562ad4d093465d2bec604b;p=ashd.git diff --git a/src/dirplex.c b/src/dirplex.c index ef001cf..063fbb4 100644 --- a/src/dirplex.c +++ b/src/dirplex.c @@ -150,7 +150,7 @@ static struct rule *newrule(struct pattern *pat) for(i = 0; pat->rules[i]; i++); pat->rules = srealloc(pat->rules, sizeof(*pat->rules) * (i + 2)); - rule = pat->rules[i] = smalloc(sizeof(*rule)); + rule = pat->rules[i] = szmalloc(sizeof(*rule)); pat->rules[i + 1] = NULL; return(rule); } @@ -181,9 +181,10 @@ static struct config *readconfig(char *path) struct rule *rule; struct stat sb; - if(stat(path, &sb)) + p = sprintf3("%s/.htrc", path); + if(stat(p, &sb)) return(NULL); - if((s = fopen(sprintf3("%s/.htrc", path), "r")) == NULL) + if((s = fopen(p, "r")) == NULL) return(NULL); omalloc(cf); cf->mtime = sb.st_mtime; @@ -332,7 +333,7 @@ static struct config *getconfig(char *path) for(cf = cflist; cf != NULL; cf = cf->next) { if(!strcmp(cf->path, path)) { - if(stat(path, &sb)) + if(stat(sprintf3("%s/.htrc", path), &sb)) return(NULL); if(sb.st_mtime != cf->mtime) { freeconfig(cf);