improve

eoghan2t9 · Jun 17, 2020 · 9d3e280 · 9d3e280
1 parent 9b8c710
commit 9d3e280
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/util/auto_hosts.go b/util/auto_hosts.go
@@ -169,11 +169,21 @@ func (a *AutoHosts) load(table map[string][]net.IP, tableRev map[string]string,
 		}
 		for i := 1; i != len(fields); i++ {
 			host := fields[i]
-			if len(host) == 0 || host[0] == '#' {
+			if len(host) == 0 {
 				break
 			}
+			sharp := strings.IndexByte(host, '#')
+			if sharp == 0 {
+				break // skip the rest of the line after #
+			} else if sharp > 0 {
+				host = host[:sharp]
+			}
+
 			a.updateTable(table, host, ipAddr)
 			a.updateTableRev(tableRev, host, ipAddr)
+			if sharp >= 0 {
+				break // skip the rest of the line after #
+			}
 		}
 	}
 }

diff --git a/util/auto_hosts_test.go b/util/auto_hosts_test.go
@@ -30,7 +30,7 @@ func TestAutoHostsResolution(t *testing.T) {
 	defer f.Close()
 
 	_, _ = f.WriteString("  127.0.0.1   host  localhost # comment \n")
-	_, _ = f.WriteString("  ::1   localhost  \n")
+	_, _ = f.WriteString("  ::1   localhost#comment  \n")
 
 	ah.Init(f.Name())