From 784188dc139b9294243505fef166ac6a75473492 Mon Sep 17 00:00:00 2001
From: Tom Hudson <mail@tomnomnom.com>
Date: Fri, 30 Mar 2018 09:31:06 +0000
Subject: [PATCH] Revert "Adds experimental nopath option"

This reverts commit 275c5ed6a2b2ced70a751afdf557c831be262f95.
---
 args.go |  7 -------
 main.go | 16 +++++-----------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/args.go b/args.go
index 2a1dec8..a236cce 100644
--- a/args.go
+++ b/args.go
@@ -23,7 +23,6 @@ type config struct {
 	delay          int
 	headers        headerArgs
 	followLocation bool
-	noPath         bool
 	method         string
 	saveStatus     int
 	timeout        int
@@ -58,10 +57,6 @@ func processArgs() config {
 	flag.BoolVar(&followLocation, "location", false, "")
 	flag.BoolVar(&followLocation, "L", false, "")
 
-	// no path part
-	noPath := false
-	flag.BoolVar(&noPath, "nopath", false, "")
-
 	// method param
 	method := "GET"
 	flag.StringVar(&method, "method", "GET", "")
@@ -118,7 +113,6 @@ func processArgs() config {
 		delay:          delay,
 		headers:        headers,
 		followLocation: followLocation,
-		noPath:         noPath,
 		method:         method,
 		saveStatus:     saveStatus,
 		timeout:        timeout,
@@ -142,7 +136,6 @@ func init() {
 		h += "  -d, --delay <millis>       Milliseconds between requests to the same host (defaut: 5000)\n"
 		h += "  -H, --header <header>      Send a custom HTTP header\n"
 		h += "  -L, --location             Follow redirects / location header\n"
-		h += "		--nopath			   Treat the hosts file as complete URLs\n"
 		h += "  -r, --rawhttp              Use the rawhttp library for requests (experimental)\n"
 		h += "  -s, --savestatus <status>  Save only responses with specific status code\n"
 		h += "  -t, --timeout <millis>     Set the HTTP timeout (default: 10000)\n"
diff --git a/main.go b/main.go
index 48e0629..2722874 100644
--- a/main.go
+++ b/main.go
@@ -27,17 +27,11 @@ func main() {
 	// get the config struct
 	c := processArgs()
 
-	// read the paths file; unless the nopath option is set
-	var paths []string
-	var err error
-	if c.noPath {
-		paths = []string{""}
-	} else {
-		paths, err = readLinesOrLiteral(c.paths, defaultPathsFile)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "failed to open paths file: %s\n", err)
-			os.Exit(1)
-		}
+	// read the paths file
+	paths, err := readLinesOrLiteral(c.paths, defaultPathsFile)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to open paths file: %s\n", err)
+		os.Exit(1)
 	}
 
 	// read the hosts file