changeset: 6854:0ef0f4d15f75 user: Kevin McCarthy <ke...@8t8.us> date: Tue Nov 15 12:03:58 2016 -0800 link: http://dev.mutt.org/hg/mutt/rev/0ef0f4d15f75
Fix loop terminator in in mutt_find_cfg(). Keep searching even if home is NULL. changeset: 6855:5382e1e4cee1 user: Kevin McCarthy <ke...@8t8.us> date: Tue Nov 15 12:04:16 2016 -0800 link: http://dev.mutt.org/hg/mutt/rev/5382e1e4cee1 Fix muttbug to check $XDG_CONFIG_HOME. Fall back to $HOME/.config if $XDG_CONFIG_HOME is not set. diffs (40 lines): diff -r c78753f98e34 -r 5382e1e4cee1 init.c --- a/init.c Mon Nov 14 11:02:17 2016 -0800 +++ b/init.c Tue Nov 15 12:04:16 2016 -0800 @@ -2918,7 +2918,7 @@ int i; - for (i = 0; locations[i][0] && locations[i][1]; i++) + for (i = 0; locations[i][0] || locations[i][1]; i++) { int j; diff -r c78753f98e34 -r 5382e1e4cee1 muttbug.sh.in --- a/muttbug.sh.in Mon Nov 14 11:02:17 2016 -0800 +++ b/muttbug.sh.in Tue Nov 15 12:04:16 2016 -0800 @@ -268,13 +268,18 @@ fi if test "$personal" = "yes" ; then - CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc .config/mutt/muttrc-${MUTTVERSION} .config/mutt/muttrc" + xdg_cfg_home=${XDG_CONFIG_HOME:-${HOME}/.config} + CANDIDATES="muttrc-${MUTTVERSION} muttrc" + DIRECTORIES="${HOME}/. ${HOME}/.mutt/ $xdg_cfg_home/mutt/" MATCHED="none" - for f in $CANDIDATES; do - if test -f "${HOME}/$f" ; then - MATCHED="${HOME}/$f" - break - fi + for d in $DIRECTORIES ; do + for f in $CANDIDATES; do + if test -f ${d}${f} ; then + MATCHED="${d}${f}" + break + fi + done + test "$MATCHED" = "none" || break done if test "$MATCHED" = "none" ; then
