ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #36 from pete4abw/master

Browse source 
fix order of lrzip.conf search
This commit is contained in:
Con Kolivas 2015-03-07 00:59:51 +11:00
parent 9380d40a57 6a5eda6353
commit f95bc63976
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
util.c
View file

@ -187,11 +187,6 @@ bool read_config(rzip_control *control)
fp = fopen("lrzip.conf", "r"); fp = fopen("lrzip.conf", "r");
if (fp) if (fp)
fprintf(control->msgout, "Using configuration file ./lrzip.conf\n"); fprintf(control->msgout, "Using configuration file ./lrzip.conf\n");
if (fp == NULL) {
fp = fopen("/etc/lrzip/lrzip.conf", "r");
if (fp)
fprintf(control->msgout, "Using configuration file /etc/lrzip/lrzip.conf\n");
}
if (fp == NULL) { if (fp == NULL) {
HOME=getenv("HOME"); HOME=getenv("HOME");
if (HOME) { if (HOME) {
@ -201,6 +196,11 @@ bool read_config(rzip_control *control)
fprintf(control->msgout, "Using configuration file %s\n", homeconf); fprintf(control->msgout, "Using configuration file %s\n", homeconf);
} }
} }
if (fp == NULL) {
fp = fopen("/etc/lrzip/lrzip.conf", "r");
if (fp)
fprintf(control->msgout, "Using configuration file /etc/lrzip/lrzip.conf\n");
}
if (fp == NULL) if (fp == NULL)
return true; return true;