| 19b595df |
1 | diff -Nru abiword-2.0.1.orig/abi/src/af/xap/unix/xap_UnixApp.cpp abiword-2.0.1/abi/src/af/xap/unix/xap_UnixApp.cpp |
| 2 | --- abiword-2.0.1.orig/abi/src/af/xap/unix/xap_UnixApp.cpp 2003-06-07 18:28:14.000000000 +0200 |
| 3 | +++ abiword-2.0.1/abi/src/af/xap/unix/xap_UnixApp.cpp 2003-11-14 09:12:37.000000000 +0100 |
| 4 | @@ -176,7 +176,7 @@ |
| 5 | static char buf[PATH_MAX]; |
| 6 | memset(buf,0,sizeof(buf)); |
| 7 | |
| 8 | - char * szHome = getenv("HOME"); |
| 9 | + char * szHome = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME"); |
| 10 | if (!szHome || !*szHome) |
| 11 | szHome = "./"; |
| 12 | |
| 13 | diff -Nru abiword-2.0.1.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp abiword-2.0.1/abi/src/wp/ap/unix/ap_UnixApp.cpp |
| 14 | --- abiword-2.0.1.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp 2003-10-10 15:35:35.000000000 +0200 |
| 15 | +++ abiword-2.0.1/abi/src/wp/ap/unix/ap_UnixApp.cpp 2003-11-14 09:14:05.000000000 +0100 |
| 16 | @@ -1099,7 +1099,7 @@ |
| 17 | static char buf[PATH_MAX]; |
| 18 | memset(buf,0,sizeof(buf)); |
| 19 | |
| 20 | - char * szHome = getenv("HOME"); |
| 21 | + char * szHome = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv("HOME"); |
| 22 | if (!szHome || !*szHome) |
| 23 | szHome = "./"; |
| 24 | |
| 25 | --- abiword-2.0.1.orig/abi/src/other/pango/pango/mini-xft/minixftcfg.c 2002-05-12 21:12:49.000000000 +0200 |
| 26 | +++ abiword-2.0.1/abi/src/other/pango/pango/mini-xft/minixftcfg.c 2003-11-14 09:50:19.000000000 +0100 |
| 27 | @@ -50,7 +50,7 @@ |
| 28 | |
| 29 | if (*d == '~') |
| 30 | { |
| 31 | - h = getenv ("HOME"); |
| 32 | + h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME"); |
| 33 | if (!h) |
| 34 | return False; |
| 35 | dir = (char *) malloc (strlen (h) + strlen (d)); |
| 36 | @@ -93,7 +93,7 @@ |
| 37 | |
| 38 | if (*c == '~') |
| 39 | { |
| 40 | - h = getenv ("HOME"); |
| 41 | + h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME"); |
| 42 | if (!h) |
| 43 | return False; |
| 44 | new = (char *) malloc (strlen (h) + strlen (c)); |
| 45 | --- abiword-2.0.1.orig/abi/src/other/pango/pango/mini-xft/minixftlex.l 2002-05-12 21:12:55.000000000 +0200 |
| 46 | +++ abiword-2.0.1/abi/src/other/pango/pango/mini-xft/minixftlex.l 2003-11-14 09:51:17.000000000 +0100 |
| 47 | @@ -212,7 +212,7 @@ |
| 48 | t = s; |
| 49 | if (*s == '~') |
| 50 | { |
| 51 | - h = getenv ("HOME"); |
| 52 | + h = getenv("HOME_ETC") ? getenv("HOME_ETC") : getenv ("HOME"); |
| 53 | if (h) |
| 54 | { |
| 55 | t = (char *) malloc (strlen (h) + strlen (s)); |
| 56 | --- abiword-2.0.1.orig/popt/poptconfig.c 2002-11-11 03:00:51.000000000 +0100 |
| 57 | +++ abiword-2.0.1/popt/poptconfig.c 2003-11-14 09:55:31.000000000 +0100 |
| 58 | @@ -144,7 +144,9 @@ |
| 59 | } |
| 60 | #endif |
| 61 | |
| 62 | - if ((home = getenv("HOME"))) { |
| 63 | + home = getenv("HOME_ETC"); |
| 64 | + if (!home) home = getenv("HOME"); |
| 65 | + if (home) { |
| 66 | fn = alloca(strlen(home) + 20); |
| 67 | strcpy(fn, home); |
| 68 | strcat(fn, "/.popt"); |
projects / packages / abiword.git / blame