Use bufio.Scanner
This commit is contained in:
14
targets.go
14
targets.go
@@ -22,16 +22,11 @@ func NewTargetsFromFile(filename string) (Targets, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewTargets(source io.Reader) (Targets, error) {
|
func NewTargets(source io.Reader) (Targets, error) {
|
||||||
reader := bufio.NewReader(source)
|
|
||||||
targets := make([]*http.Request, 0)
|
targets := make([]*http.Request, 0)
|
||||||
|
scanner := bufio.NewScanner(source)
|
||||||
|
|
||||||
for {
|
for scanner.Scan() {
|
||||||
line, err := reader.ReadString('\n')
|
line := scanner.Text()
|
||||||
if err != nil && err == io.EOF {
|
|
||||||
break
|
|
||||||
} else if err != nil {
|
|
||||||
return targets, err
|
|
||||||
}
|
|
||||||
if line = strings.TrimSpace(line); line == "" { // Empty line
|
if line = strings.TrimSpace(line); line == "" { // Empty line
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -46,6 +41,9 @@ func NewTargets(source io.Reader) (Targets, error) {
|
|||||||
}
|
}
|
||||||
targets = append(targets, req)
|
targets = append(targets, req)
|
||||||
}
|
}
|
||||||
|
if err := scanner.Err(); err != nil {
|
||||||
|
return targets, err
|
||||||
|
}
|
||||||
return targets, nil
|
return targets, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user