mutt stable branch with some hacks
Revert changes made to mutt_find_cfg() in 3c6d322912e3
The usage of MUTT_VERSION in mutt_find_cfg() was fine before the
commit: it wasn't using MUTT_VERSION inlined into a string with format
string substitution.
Revert to the version of mutt_find_cfg() before that changeset.
+7
-7
+7
-7
init.c
+7
-7
init.c
···
2901
2901
2902
2902
static char* mutt_find_cfg (const char *home, const char *xdg_cfg_home)
2903
2903
{
2904
-
const char* names[][2] =
2904
+
const char* names[] =
2905
2905
{
2906
-
{ "muttrc", "-" MUTT_VERSION },
2907
-
{ "muttrc", "" },
2908
-
{ NULL, NULL },
2906
+
"muttrc-" MUTT_VERSION,
2907
+
"muttrc",
2908
+
NULL,
2909
2909
};
2910
2910
2911
2911
const char* locations[][2] =
···
2925
2925
if (!locations[i][0])
2926
2926
continue;
2927
2927
2928
-
for (j = 0; names[j][0]; j++)
2928
+
for (j = 0; names[j]; j++)
2929
2929
{
2930
2930
char buffer[STRING];
2931
2931
2932
-
snprintf (buffer, sizeof (buffer), "%s/%s%s%s",
2933
-
locations[i][0], locations[i][1], names[j][0], names[j][1]);
2932
+
snprintf (buffer, sizeof (buffer),
2933
+
"%s/%s%s", locations[i][0], locations[i][1], names[j]);
2934
2934
if (access (buffer, F_OK) == 0)
2935
2935
return safe_strdup(buffer);
2936
2936
}