clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-10-03 15:38:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

better configfile path management

Browse Source
This commit is contained in:
Roberto De Ioris
2012-10-29 19:48:43 +01:00
parent 2de5e8994f
commit f9d76f90eb
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/uwsgi.c
+13 -5
View File
@@ -664,14 +664,22 @@ void config_magic_table_fill(char *filename, char **magic_table) {
char *tmp = NULL;
magic_table['o'] = filename;
if (filename[0] == '/') {
magic_table['p'] = filename;
char *fullname = uwsgi_expand_path(filename, strlen(filename), NULL);
if (!fullname) {
fullname = filename;
}
// free unused memory
else {
magic_table['p'] = uwsgi_concat3(uwsgi.cwd, "/", filename);
char *minimal_name = uwsgi_malloc(strlen(fullname) + 1);
memcpy(minimal_name, fullname, strlen(fullname));
minimal_name[strlen(fullname)] = 0;
free(fullname);
fullname = minimal_name;
}
magic_table['s'] = uwsgi_get_last_char(magic_table['p'], '/') + 1;
magic_table['o'] = filename;
magic_table['p'] = fullname;
magic_table['s'] = uwsgi_get_last_char(fullname, '/') + 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);