You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
1.1 KiB
28 lines
1.1 KiB
7 years ago
|
diff -uNr popt-1.16/poptconfig.c popt-1.16.mod/poptconfig.c
|
||
|
|
--- popt-1.16/poptconfig.c 2009-05-20 16:18:07.000000000 +0300
|
||
|
|
+++ popt-1.16.mod/poptconfig.c 2017-09-12 12:08:55.442990190 +0300
|
||
|
|
@@ -499,7 +499,7 @@
|
||
|
|
int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
|
||
|
|
{
|
||
|
|
static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
|
||
|
|
- static const char _popt_etc[] = "/etc/popt";
|
||
|
|
+ static const char _popt_etc[] = "@TERMUX_PREFIX@/etc/popt";
|
||
|
|
char * home;
|
||
|
|
struct stat sb;
|
||
|
|
int rc = 0; /* assume success */
|
||
|
|
@@ -515,12 +515,12 @@
|
||
|
|
if (rc) goto exit;
|
||
|
|
|
||
|
|
#if defined(HAVE_GLOB_H)
|
||
|
|
- if (!stat("/etc/popt.d", &sb) && S_ISDIR(sb.st_mode)) {
|
||
|
|
+ if (!stat("@TERMUX_PREFIX@/etc/popt.d", &sb) && S_ISDIR(sb.st_mode)) {
|
||
|
|
const char ** av = NULL;
|
||
|
|
int ac = 0;
|
||
|
|
int i;
|
||
|
|
|
||
|
|
- if ((rc = poptGlob(con, "/etc/popt.d/*", &ac, &av)) == 0) {
|
||
|
|
+ if ((rc = poptGlob(con, "@TERMUX_PREFIX@/etc/popt.d/*", &ac, &av)) == 0) {
|
||
|
|
for (i = 0; rc == 0 && i < ac; i++) {
|
||
|
|
const char * fn = av[i];
|
||
|
|
if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn, ".rpmsave"))
|