From 296549d1bfc71fe619bffbd2e9e2cdefc7f55c90 Mon Sep 17 00:00:00 2001 From: "roberto@debian32" Date: Sat, 18 Jun 2011 11:59:37 +0200 Subject: [PATCH] export %c in config files --- uwsgi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/uwsgi.c b/uwsgi.c index 91bdf3a6..a4f7469d 100644 --- a/uwsgi.c +++ b/uwsgi.c @@ -318,6 +318,8 @@ void uwsgi_configure(void) { void config_magic_table_fill(char *filename, char **magic_table) { + char *tmp = NULL; + magic_table['o'] = filename; if (filename[0] == '/') { magic_table['p'] = filename; @@ -327,6 +329,16 @@ void config_magic_table_fill(char *filename, char **magic_table) { } magic_table['s'] = uwsgi_get_last_char(magic_table['p'], '/') + 1; magic_table['d'] = uwsgi_concat2n(magic_table['p'], magic_table['s'] - magic_table['p'], "", 0); + if (magic_table['d'][strlen(magic_table['d'])-1] == '/') { + tmp = magic_table['d'] + (strlen(magic_table['d']) -1) ; + uwsgi_log("tmp = %c\n", *tmp); + *tmp = 0; + } + if (uwsgi_get_last_char(magic_table['d'], '/')) + magic_table['c'] = uwsgi_get_last_char(magic_table['d'], '/') + 1; + + if (tmp) *tmp = '/'; + if (uwsgi_get_last_char(filename, '.')) magic_table['e'] = uwsgi_get_last_char(filename, '.') + 1; if (uwsgi_get_last_char(magic_table['s'], '.'))