6b55e36036
The config.h-interface has proven to be very effective for a lot of suckless tools, but it just does not make too much sense for a web server like quark. $ quark If you run multiple instances of it, you want to see in the command line (or top) what it does, and given the amount of options it's logical to just express them as options given in the command line. It also is a problem if you can modify quark via the config.h, contradicting the manual. Just saying "Well, then don't touch config.h" is also not good, as the vhost and map options were only exposed via this interface. What is left in config.h are mime-types and two constants relating to the incoming HTTP-header-limits. In order to introduce these changes, some structs and safe utility functions were added and imported from OpenBSD respectively.
56 lines
948 B
C
56 lines
948 B
C
/* See LICENSE file for copyright and license details. */
|
|
#ifndef UTIL_H
|
|
#define UTIL_H
|
|
|
|
#include <regex.h>
|
|
#include <stddef.h>
|
|
#include <time.h>
|
|
|
|
#include "arg.h"
|
|
|
|
/* main server struct */
|
|
struct vhost {
|
|
char *name;
|
|
char *regex;
|
|
char *dir;
|
|
char *prefix;
|
|
regex_t re;
|
|
};
|
|
|
|
struct map {
|
|
char *chost;
|
|
char *from;
|
|
char *to;
|
|
};
|
|
|
|
extern struct server {
|
|
char *host;
|
|
char *port;
|
|
char *docindex;
|
|
int listdirs;
|
|
struct vhost *vhost;
|
|
size_t vhost_len;
|
|
struct map *map;
|
|
size_t map_len;
|
|
} s;
|
|
|
|
#undef MIN
|
|
#define MIN(x,y) ((x) < (y) ? (x) : (y))
|
|
#undef MAX
|
|
#define MAX(x,y) ((x) > (y) ? (x) : (y))
|
|
#undef LEN
|
|
#define LEN(x) (sizeof (x) / sizeof *(x))
|
|
|
|
extern char *argv0;
|
|
|
|
void warn(const char *, ...);
|
|
void die(const char *, ...);
|
|
|
|
#define TIMESTAMP_LEN 30
|
|
|
|
char *timestamp(time_t, char buf[TIMESTAMP_LEN]);
|
|
|
|
void *reallocarray(void *, size_t, size_t);
|
|
long long strtonum(const char *, long long, long long, const char **);
|
|
|
|
#endif /* UTIL_H */
|