Skip to content

Commit 7af1293

Browse files
authored
Merge pull request #21 from bgp/feature/abort-on-leftover-positional-args
Abort when positional arguments are provided
2 parents 4fbaebe + 4d3afc7 commit 7af1293

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

cmd/rtrdump/rtrdump.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ import (
66
"errors"
77
"flag"
88
"fmt"
9-
rtr "github.com/bgp/stayrtr/lib"
10-
"github.com/bgp/stayrtr/prefixfile"
11-
log "github.com/sirupsen/logrus"
12-
"golang.org/x/crypto/ssh"
139
"io"
1410
"io/ioutil"
1511
"net"
1612
"os"
1713
"runtime"
14+
"strings"
15+
16+
rtr "github.com/bgp/stayrtr/lib"
17+
"github.com/bgp/stayrtr/prefixfile"
18+
log "github.com/sirupsen/logrus"
19+
"golang.org/x/crypto/ssh"
1820
)
1921

2022
const (
@@ -127,6 +129,10 @@ func main() {
127129
runtime.GOMAXPROCS(runtime.NumCPU())
128130

129131
flag.Parse()
132+
if flag.NArg() > 0 {
133+
fmt.Printf("%s: illegal positional argument(s) provided (\"%s\") - did you mean to provide a flag?\n", os.Args[0], strings.Join(flag.Args(), " "))
134+
os.Exit(2)
135+
}
130136
if *Version {
131137
fmt.Println(AppVersion)
132138
os.Exit(0)

cmd/rtrmon/rtrmon.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,10 @@ func main() {
768768
runtime.GOMAXPROCS(runtime.NumCPU())
769769

770770
flag.Parse()
771+
if flag.NArg() > 0 {
772+
fmt.Printf("%s: illegal positional argument(s) provided (\"%s\") - did you mean to provide a flag?\n", os.Args[0], strings.Join(flag.Args(), " "))
773+
os.Exit(2)
774+
}
771775
if *Version {
772776
fmt.Println(AppVersion)
773777
os.Exit(0)

cmd/stayrtr/stayrtr.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,10 @@ func main() {
487487
runtime.GOMAXPROCS(runtime.NumCPU())
488488

489489
flag.Parse()
490+
if flag.NArg() > 0 {
491+
fmt.Printf("%s: illegal positional argument(s) provided (\"%s\") - did you mean to provide a flag?\n", os.Args[0], strings.Join(flag.Args(), " "))
492+
os.Exit(2)
493+
}
490494
if *Version {
491495
fmt.Println(AppVersion)
492496
os.Exit(0)

0 commit comments

Comments
 (0)