]>
Commit | Line | Data |
---|---|---|
248999d6 | 1 | diff -urN bogofilter-0.96.4.orig/src/configfile.c bogofilter-0.96.4/src/configfile.c |
2 | --- bogofilter-0.96.4.orig/src/configfile.c 2005-10-15 23:03:11.000000000 +0200 | |
3 | +++ bogofilter-0.96.4/src/configfile.c 2005-11-03 16:26:38.844514992 +0100 | |
4 | @@ -148,7 +148,13 @@ | |
7d2015b3 | 5 | bool ok = true; |
078d13c8 | 6 | int lineno = 0; |
89816bee | 7 | FILE *fp; |
248999d6 | 8 | - |
078d13c8 | 9 | + char *home_etc = getenv("HOME_ETC"); |
89816bee | 10 | + if (home_etc && fname[0] == '~') { |
248999d6 | 11 | + char buffer[1024]; |
12 | + snprintf(buffer, 1024, "%s%s", home_etc, fname+1); | |
13 | + config_file_name=xstrdup(buffer); | |
078d13c8 | 14 | + } else |
248999d6 | 15 | + |
7d2015b3 | 16 | if (config_file_name != NULL) |
17 | xfree(config_file_name); | |
248999d6 | 18 | |
19 | diff -urN bogofilter-0.96.4.orig/src/paths.c bogofilter-0.96.4/src/paths.c | |
20 | --- bogofilter-0.96.4.orig/src/paths.c 2005-08-15 01:03:42.000000000 +0200 | |
21 | +++ bogofilter-0.96.4/src/paths.c 2005-11-03 16:28:51.672322096 +0100 | |
89816bee | 22 | @@ -29,7 +29,7 @@ |
23 | #ifndef __riscos__ | |
24 | { PR_ENV_BOGO, "BOGOFILTER_DIR", NULL }, | |
25 | { PR_ENV_BOGO, "BOGODIR", NULL }, | |
26 | - { PR_ENV_HOME, "HOME", BOGODIR } | |
27 | + { PR_ENV_HOME, "HOME_ETC", BOGODIR } | |
28 | #else | |
29 | { PR_ENV_HOME, "Choices$Write", BOGODIR }, | |
30 | { PR_ENV_HOME, "Bogofilter$Dir", NULL }, | |
248999d6 | 31 | @@ -274,6 +274,7 @@ |
89816bee | 32 | size_t path_size, env_size; |
33 | ||
34 | env = getenv(var); | |
078d13c8 | 35 | + if (env == NULL && strcmp(var, "HOME_ETC") == 0) env = getenv("HOME"); |
3d816e52 | 36 | if (env == NULL || *env == '\0') return NULL; |
89816bee | 37 | |
38 | env_size = strlen(env); |