Skip to content

Fix runner/worker errors #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ScriptTiger merged 2 commits into from
Jun 28, 2026
+50 −22
Merged

Fix runner/worker errors #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffec24d
Fix runner/worker errors
ScriptTiger Jun 18, 2026
685bd78
Ensure backward-compatible arguments
ScriptTiger Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2025 ScriptTiger
Copyright (c) 2026 ScriptTiger

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
70 changes: 49 additions & 21 deletions hosts-bl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var (
//hasher hash.Hash64
addressStrings []string
addressInts [][]int
stdin bool
)

// Function to display help text and exit
Expand All @@ -49,6 +50,7 @@ func help(err int) {
" -o <file> Destination file\n"+
" -to_blackhole <IPv4> Black hole address in destination\n"+
" -to_blackhole_v6 <IPv6> IPv6 Black hole address in destination\n")
if stdin {_, _ = io.Copy(io.Discard, os.Stdin)}
os.Exit(err)
}

Expand Down Expand Up @@ -385,6 +387,7 @@ func main() {
iData []byte
iReader *bytes.Reader
scanner *bufio.Scanner
headlessSrc bool
)

// Initialize argument parameter pointers
Expand All @@ -407,9 +410,9 @@ func main() {
dupe = false
cmts = false

// Check if any data available from standard input and use it as default source if there is
// Check if standard input available
stdinStat, _ := os.Stdin.Stat()
if stdinStat.Mode() & os.ModeNamedPipe != 0 {*iFilePtr = "-"}
if stdinStat.Mode() & os.ModeNamedPipe != 0 {stdin = true}

// Parse arguments
for i := 1; i < len(os.Args); i++ {
Expand All @@ -423,66 +426,91 @@ func main() {
case "i":
i++
if *iFilePtr != "" {help(2)}
if os.Args[i] == "-" && !stdin {help(3)}
iFilePtr = &os.Args[i]
continue
case "compression":
i++
if cmp != -1 {help(3)}
if cmp != -1 {help(4)}
cmp, err = strconv.Atoi(os.Args[i])
if err != nil {help(4)}
if cmp < 1 || cmp > 9 {help(5)}
if err != nil {help(5)}
if cmp < 1 || cmp > 9 {help(6)}
continue
case "hash":
i++
if hbits != -1 {help(6)}
if hbits != -1 {help(7)}
hbits, err = strconv.Atoi(os.Args[i])
if err != nil {help(7)}
if hbits != 64 && hbits != 128 && hbits != 192 && hbits != 256 {help(8)}
if err != nil {help(8)}
if hbits != 64 && hbits != 128 && hbits != 192 && hbits != 256 {help(9)}
continue
case "from_blackhole":
i++
if *fbhPtr != "" {help(9)}
if *fbhPtr != "" {help(10)}
fbhPtr = &os.Args[i]
continue
case "to_blackhole":
i++
if *tbhPtr != "0.0.0.0" {help(10)}
if *tbhPtr != "0.0.0.0" {help(11)}
tbhPtr = &os.Args[i]
continue
case "to_blackhole_v6":
i++
if *tbh6Ptr != "::" {help(11)}
if *tbh6Ptr != "::" {help(12)}
tbh6Ptr = &os.Args[i]
continue
case "comments":
if cmts {help(12)}
if cmts {help(13)}
cmts = true
continue
case "dupe":
if dupe {help(13)}
if dupe {help(14)}
dupe = true
continue
case "o":
i++
if *oFilePtr != "" {help(14)}
if *oFilePtr != "" {help(15)}
oFilePtr = &os.Args[i]
continue
case "":
if *iFilePtr == "" {
iFilePtr = &os.Args[i]
headlessSrc = true
} else if *oFilePtr == "" {oFilePtr = &os.Args[i]
} else {help(16)}
default:
help(15)
help(17)
}
} else if *iFilePtr == "" {iFilePtr = &os.Args[i]
} else if *iFilePtr == "" {
iFilePtr = &os.Args[i]
headlessSrc = true
} else if *oFilePtr == "" {oFilePtr = &os.Args[i]
} else {help(16)}
} else {help(18)}
}

// Print help if no input available
if *iFilePtr == "" {help(0)}
// If one headless argument is given and standard input is available, use headless argument as output and standard input as input
if headlessSrc && *oFilePtr == "" && stdin {
*oFilePtr = *iFilePtr
*iFilePtr = "-"
}

// Default to standard input if available and no input given, otherwise print help and exit if no input
if *iFilePtr == "" {
if stdin {*iFilePtr = "-"
} else {help(0)}
}

// If standard input is available, but not used, discard the input while also keeping the pipe alive to avoid errors
if stdin && *iFilePtr != "-" {
go func() {
_, _ = io.Copy(io.Discard, os.Stdin)
}()
}

// Initialize format string for quick reference
format := strings.ToLower(*fmtPtr)

// Exit if invalid format is given
if !isValidFormat(format) {help(17)}
if !isValidFormat(format) {help(19)}

// Set defaults for unset arguments
if cmp == -1 {cmp = 9}
Expand All @@ -508,7 +536,7 @@ func main() {
if *fbhPtr == "" {
scanner = readerReset(iFilePtr, iReader, iFile)
for scanner.Scan() {countAddresses(scanner.Text())}
if len(addressInts) == 0 {help(18)}
if len(addressInts) == 0 {help(20)}
sort.SliceStable(addressInts, func(i, j int) bool {
return addressInts[j][1] < addressInts[i][1]
})
Expand Down