Simplify command line option checking.

dearplain · Dec 23, 2012 · 848f3c0 · 848f3c0
1 parent 8aeeff7
commit 848f3c0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/cmd/shadowsocks-local/local.go b/cmd/shadowsocks-local/local.go
@@ -221,15 +221,17 @@ func main() {
 
 	config, err := ss.ParseConfig(configFile)
 	if err != nil {
-		enough := enoughOptions(&cmdConfig)
-		if !(enough && os.IsNotExist(err)) {
+		config = &cmdConfig
+		if os.IsNotExist(err) {
+			if !enoughOptions(config) {
+				log.Println("must specify server address, password and both server/local port")
+				os.Exit(1)
+			}
+			log.Println("using all options from command line")
+		} else {
 			log.Printf("error reading config file: %v\n", err)
+			os.Exit(1)
 		}
-		if !enough {
-			return
-		}
-		log.Println("using all options from command line")
-		config = &cmdConfig
 	} else {
 		ss.UpdateConfig(config, &cmdConfig)
 	}

diff --git a/cmd/shadowsocks-server/server.go b/cmd/shadowsocks-server/server.go
@@ -367,14 +367,12 @@ func main() {
 	var err error
 	config, err = ss.ParseConfig(configFile)
 	if err != nil {
-		enough := enoughOptions(&cmdConfig)
-		if !(enough && os.IsNotExist(err)) {
+		if os.IsNotExist(err) {
+			log.Println("using all options from command line")
+		} else {
 			log.Printf("error reading %s: %v\n", configFile, err)
+			os.Exit(1)
 		}
-		if !enough {
-			return
-		}
-		log.Println("using all options from command line")
 		config = &cmdConfig
 	} else {
 		ss.UpdateConfig(config, &cmdConfig)