#include <ctype.h>
#include <dirent.h>
#include <fnmatch.h>
+#include <time.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
struct config {
struct config *next, *prev;
char *path;
- time_t mtime;
+ time_t mtime, lastck;
struct child *children;
struct pattern *patterns;
};
struct pattern {
struct pattern *next;
char *childnm;
+ char **fchild;
struct rule **rules;
};
-struct config *cflist;
+static struct config *cflist;
+static struct config *gconfig, *lconfig;
+static time_t now;
static void freepattern(struct pattern *pat)
{
}
if(pat->childnm != NULL)
free(pat->childnm);
+ freeca(pat->fchild);
free(pat);
}
cf->next->prev = cf->prev;
if(cf == cflist)
cflist = cf->next;
- free(cf->path);
+ if(cf->path != NULL)
+ free(cf->path);
for(ch = cf->children; ch != NULL; ch = nch) {
nch = ch->next;
freechild(ch);
{
struct pattern *pat;
struct rule *rule;
- int sl;
+ int sl, i;
if(!strcmp(s->argv[0], "match")) {
s->expstart = 1;
if(pat->childnm != NULL)
free(pat->childnm);
pat->childnm = sstrdup(s->argv[1]);
+ } else if(!strcmp(s->argv[0], "fork")) {
+ pat->fchild = smalloc(sizeof(*pat->fchild) * s->argc);
+ for(i = 0; i < s->argc - 1; i++)
+ pat->fchild[i] = sstrdup(s->argv[i + 1]);
+ pat->fchild[i] = 0;
} else if(!strcmp(s->argv[0], "end") || !strcmp(s->argv[0], "eof")) {
break;
} else {
freepattern(pat);
return(NULL);
}
- if(pat->childnm == NULL) {
+ if((pat->childnm == NULL) && (pat->fchild == NULL)) {
flog(LOG_WARNING, "%s:%i: missing handler in match declaration", s->file, sl);
freepattern(pat);
return(NULL);
return(pat);
}
-static struct config *readconfig(char *path)
+static struct config *emptyconfig(void)
+{
+ struct config *cf;
+
+ omalloc(cf);
+ return(cf);
+}
+
+static struct config *readconfig(char *file)
{
struct cfstate *s;
FILE *in;
struct config *cf;
struct child *child;
struct pattern *pat;
- struct stat sb;
- char *p;
- p = sprintf3("%s/.htrc", path);
- if(stat(p, &sb))
- return(NULL);
- if((in = fopen(p, "r")) == NULL) {
- flog(LOG_WARNING, "%s: %s", p, strerror(errno));
+ if((in = fopen(file, "r")) == NULL) {
+ flog(LOG_WARNING, "%s: %s", file, strerror(errno));
return(NULL);
}
- s = mkcfparser(in, p);
- omalloc(cf);
- cf->mtime = sb.st_mtime;
- cf->path = sstrdup(path);
+ s = mkcfparser(in, file);
+ cf = emptyconfig();
while(1) {
getcfline(s);
{
struct config *cf;
struct stat sb;
+ char *fn;
+ time_t mtime;
+ fn = sprintf3("%s/.htrc", path);
for(cf = cflist; cf != NULL; cf = cf->next) {
if(!strcmp(cf->path, path)) {
- if(stat(sprintf3("%s/.htrc", path), &sb))
- return(NULL);
- if(sb.st_mtime != cf->mtime) {
- freeconfig(cf);
- break;
+ if(now - cf->lastck > 5) {
+ if(stat(fn, &sb) || (sb.st_mtime != cf->mtime)) {
+ freeconfig(cf);
+ break;
+ }
}
+ cf->lastck = now;
return(cf);
}
}
- if((cf = readconfig(path)) != NULL) {
- cf->next = cflist;
- cflist = cf;
+ if(access(fn, R_OK) || stat(fn, &sb)) {
+ cf = emptyconfig();
+ mtime = 0;
+ } else {
+ if((cf = readconfig(fn)) == NULL)
+ return(NULL);
+ mtime = sb.st_mtime;
}
+ cf->path = sstrdup(path);
+ cf->mtime = mtime;
+ cf->lastck = now;
+ cf->next = cflist;
+ cflist = cf;
return(cf);
}
free(tmp);
if((cf = getconfig(".")) != NULL)
bufadd(buf, cf);
+ if(lconfig != NULL)
+ bufadd(buf, lconfig);
+ if(gconfig != NULL)
+ bufadd(buf, gconfig);
bufadd(buf, NULL);
return(ret = buf.b);
}
simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
return;
}
- if((ch = findchild(path, pat->childnm)) == NULL) {
- flog(LOG_ERR, "child %s requested, but was not declared", pat->childnm);
- simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm);
- return;
+ if(pat->fchild) {
+ stdforkserve(pat->fchild, req, fd);
+ } else {
+ if((ch = findchild(path, pat->childnm)) == NULL) {
+ flog(LOG_ERR, "child %s requested, but was not declared", pat->childnm);
+ simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm);
+ return;
+ }
+ if(childhandle(ch, req, fd))
+ simpleerror(fd, 500, "Server Error", "The request handler crashed.");
}
-
- if(childhandle(ch, req, fd))
- simpleerror(fd, 500, "Server Error", "The request handler crashed.");
}
static void handledir(struct hthead *req, int fd, char *path)
DIR *dir;
struct dirent *dent;
+ now = time(NULL);
nm = req->rest;
path = sstrdup(".");
p = nm;
free(path);
}
+static void usage(FILE *out)
+{
+ fprintf(out, "usage: dirplex [-hN] [-c CONFIG] DIR\n");
+}
+
int main(int argc, char **argv)
{
+ int c;
+ int nodef;
+ char *gcf, *lcf;
struct hthead *req;
int fd;
- if(argc < 2) {
- flog(LOG_ERR, "usage: dirplex DIR");
+ nodef = 0;
+ lcf = NULL;
+ while((c = getopt(argc, argv, "hNc:")) >= 0) {
+ switch(c) {
+ case 'h':
+ usage(stdout);
+ exit(0);
+ case 'N':
+ nodef = 1;
+ break;
+ case 'c':
+ lcf = optarg;
+ break;
+ default:
+ usage(stderr);
+ exit(1);
+ }
+ }
+ if(argc - optind < 1) {
+ usage(stderr);
exit(1);
}
- if(chdir(argv[1])) {
- flog(LOG_ERR, "could not change directory to %s: %s", argv[1], strerror(errno));
+ if(!nodef) {
+ if((gcf = findstdconf("ashd/dirplex.rc")) != NULL) {
+ gconfig = readconfig(gcf);
+ free(gcf);
+ }
+ }
+ if(lcf != NULL) {
+ if((lconfig = readconfig(lcf)) == NULL)
+ exit(1);
+ }
+ if(chdir(argv[optind])) {
+ flog(LOG_ERR, "could not change directory to %s: %s", argv[optind], strerror(errno));
exit(1);
}
signal(SIGCHLD, SIG_IGN);
Dolda2000 GitWeb / ashd.git / blobdiff