diff options
author | Omar Polo <op@omarpolo.com> | 2023-08-08 15:56:27 +0000 |
---|---|---|
committer | Omar Polo <op@omarpolo.com> | 2023-08-08 15:56:27 +0000 |
commit | d98ef734940a49d192d87024e60559b38eb190c9 (patch) | |
tree | 9fd986bdf4000c35d8c51d0d5ce557162222acf9 | |
parent | 877b479bcc183e71a6d78cb938548c21ed4303fc (diff) |
move strip_path to utils.c
-rw-r--r-- | gmid.h | 1 | ||||
-rw-r--r-- | server.c | 18 | ||||
-rw-r--r-- | utils.c | 17 |
3 files changed, 18 insertions, 18 deletions
@@ -453,6 +453,7 @@ int puny_decode(const char*, char*, size_t, const char**); /* utils.c */ void block_signals(void); void unblock_signals(void); +const char *strip_path(const char *, int); int starts_with(const char*, const char*); int ends_with(const char*, const char*); ssize_t filesize(int); @@ -53,7 +53,6 @@ void tls_config_use_fake_private_key(struct tls_config *); static inline int matches(const char*, const char*); static void handle_handshake(int, short, void*); -static const char *strip_path(const char*, int); static void fmtbuf(char *, size_t, const char *, struct client *, const char *); static int apply_block_return(struct client*); @@ -432,23 +431,6 @@ err: start_reply(c, BAD_REQUEST, "Wrong/malformed host or missing SNI"); } -static const char * -strip_path(const char *path, int strip) -{ - char *t; - - while (strip > 0) { - if ((t = strchr(path, '/')) == NULL) { - path = strchr(path, '\0'); - break; - } - path = t; - strip--; - } - - return path; -} - static void fmtbuf(char *buf, size_t buflen, const char *fmt, struct client *c, const char *path) @@ -29,6 +29,23 @@ #include "log.h" +const char * +strip_path(const char *path, int strip) +{ + char *t; + + while (strip > 0) { + if ((t = strchr(path, '/')) == NULL) { + path = strchr(path, '\0'); + break; + } + path = t; + strip--; + } + + return path; +} + int starts_with(const char *str, const char *prefix) { |