From f513ab21fa7b28bb12dc350e49b2d9bc5c76879d Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 3 Feb 2018 10:46:47 +0100
Subject: [PATCH] Check if the config file exists from the current directory
 Try the executable directory if it fails

Then, go to that config file directory no matter what

Fixes #80
---
 dnscrypt-proxy/config.go | 20 +++++++++++++++++++-
 dnscrypt-proxy/main.go   | 19 -------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/dnscrypt-proxy/config.go b/dnscrypt-proxy/config.go
index 581ea9ce..56cc69c5 100644
--- a/dnscrypt-proxy/config.go
+++ b/dnscrypt-proxy/config.go
@@ -6,6 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -119,8 +120,11 @@ type ServerSummary struct {
 }
 
 func ConfigLoad(proxy *Proxy, svcFlag *string) error {
-	version := flag.Bool("version", false, "Prints current proxy version")
 	configFile := flag.String("config", DefaultConfigFileName, "Path to the configuration file")
+	if _, err := os.Stat(*configFile); os.IsNotExist(err) {
+		cdLocal()
+	}
+	version := flag.Bool("version", false, "Prints current proxy version")
 	resolve := flag.String("resolve", "", "resolve a name using system libraries")
 	list := flag.Bool("list", false, "print the list of available resolvers for the enabled filters")
 	listAll := flag.Bool("list-all", false, "print the complete list of available resolvers, ignoring filters")
@@ -141,6 +145,7 @@ func ConfigLoad(proxy *Proxy, svcFlag *string) error {
 	if _, err := toml.DecodeFile(*configFile, &config); err != nil {
 		return err
 	}
+	cdFileDir(*configFile)
 	if config.LogLevel >= 0 && config.LogLevel < int(dlog.SeverityLast) {
 		dlog.SetLogLevel(dlog.Severity(config.LogLevel))
 	}
@@ -384,3 +389,16 @@ func includesName(names []string, name string) bool {
 	}
 	return false
 }
+
+func cdFileDir(fileName string) {
+	os.Chdir(filepath.Dir(fileName))
+}
+
+func cdLocal() {
+	exeFileName, err := os.Executable()
+	if err != nil {
+		dlog.Warnf("Unable to determine the executable directory: [%s] -- You will need to specify absolute paths in the configuration file", err)
+		return
+	}
+	os.Chdir(filepath.Dir(exeFileName))
+}
diff --git a/dnscrypt-proxy/main.go b/dnscrypt-proxy/main.go
index 019e1fb0..7f114fe4 100644
--- a/dnscrypt-proxy/main.go
+++ b/dnscrypt-proxy/main.go
@@ -3,8 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
@@ -25,9 +23,6 @@ type App struct {
 
 func main() {
 	dlog.Init("dnscrypt-proxy", dlog.SeverityNotice, "DAEMON")
-
-	cdLocal()
-
 	svcConfig := &service.Config{
 		Name:        "dnscrypt-proxy",
 		DisplayName: "DNSCrypt client proxy",
@@ -43,7 +38,6 @@ func main() {
 	app.proxy = Proxy{}
 	app.proxy.xTransport = NewXTransport(30 * time.Second)
 
-	cdFileDir(DefaultConfigFileName)
 	if err := ConfigLoad(&app.proxy, svcFlag); err != nil {
 		dlog.Fatal(err)
 	}
@@ -106,16 +100,3 @@ func (app *App) Stop(service service.Service) error {
 	dlog.Notice("Stopped.")
 	return nil
 }
-
-func cdFileDir(fileName string) {
-	os.Chdir(filepath.Dir(fileName))
-}
-
-func cdLocal() {
-	exeFileName, err := os.Executable()
-	if err != nil {
-		dlog.Warnf("Unable to determine the executable directory: [%s] -- You will need to specify absolute paths in the configuration file", err)
-		return
-	}
-	os.Chdir(filepath.Dir(exeFileName))
-}