65600ffe7a
The server-struct variable s was global, which made it readable and modifiable from any point in the code. Making it a local variable in main() instead and passing it as a pointer to constant memory to each function needing it makes much more sense and allows the compiler to warn us if we do try to modify it, which it wouldn't have before. Signed-off-by: Laslo Hunhold <dev@frign.de>
58 lines
1 KiB
C
58 lines
1 KiB
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 *chost;
|
|
char *regex;
|
|
char *dir;
|
|
char *prefix;
|
|
regex_t re;
|
|
};
|
|
|
|
struct map {
|
|
char *chost;
|
|
char *from;
|
|
char *to;
|
|
};
|
|
|
|
struct server {
|
|
char *host;
|
|
char *port;
|
|
char *docindex;
|
|
int listdirs;
|
|
struct vhost *vhost;
|
|
size_t vhost_len;
|
|
struct map *map;
|
|
size_t map_len;
|
|
};
|
|
|
|
#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 *, ...);
|
|
|
|
void epledge(const char *, const char *);
|
|
void eunveil(const char *, const char *);
|
|
|
|
int timestamp(char *, size_t, time_t);
|
|
int esnprintf(char *, size_t, const char *, ...);
|
|
|
|
void *reallocarray(void *, size_t, size_t);
|
|
long long strtonum(const char *, long long, long long, const char **);
|
|
|
|
#endif /* UTIL_H */
|