Merge pull request #21 from bgp/feature/abort-on-leftover-positional-…

…args Abort when positional arguments are provided
bgp · Aug 27, 2021 · 7af1293 · 7af1293
2 parents 4fbaebe + 4d3afc7
commit 7af1293
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/cmd/rtrdump/rtrdump.go b/cmd/rtrdump/rtrdump.go
@@ -6,15 +6,17 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	rtr "github.com/bgp/stayrtr/lib"
-	"github.com/bgp/stayrtr/prefixfile"
-	log "github.com/sirupsen/logrus"
-	"golang.org/x/crypto/ssh"
 	"io"
 	"io/ioutil"
 	"net"
 	"os"
 	"runtime"
+	"strings"
+
+	rtr "github.com/bgp/stayrtr/lib"
+	"github.com/bgp/stayrtr/prefixfile"
+	log "github.com/sirupsen/logrus"
+	"golang.org/x/crypto/ssh"
 )
 
 const (
@@ -127,6 +129,10 @@ func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	flag.Parse()
+	if flag.NArg() > 0 {
+		fmt.Printf("%s: illegal positional argument(s) provided (\"%s\") - did you mean to provide a flag?\n", os.Args[0], strings.Join(flag.Args(), " "))
+		os.Exit(2)
+	}
 	if *Version {
 		fmt.Println(AppVersion)
 		os.Exit(0)

diff --git a/cmd/rtrmon/rtrmon.go b/cmd/rtrmon/rtrmon.go
@@ -768,6 +768,10 @@ func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	flag.Parse()
+	if flag.NArg() > 0 {
+		fmt.Printf("%s: illegal positional argument(s) provided (\"%s\") - did you mean to provide a flag?\n", os.Args[0], strings.Join(flag.Args(), " "))
+		os.Exit(2)
+	}
 	if *Version {
 		fmt.Println(AppVersion)
 		os.Exit(0)

diff --git a/cmd/stayrtr/stayrtr.go b/cmd/stayrtr/stayrtr.go
@@ -487,6 +487,10 @@ func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	flag.Parse()
+	if flag.NArg() > 0 {
+		fmt.Printf("%s: illegal positional argument(s) provided (\"%s\") - did you mean to provide a flag?\n", os.Args[0], strings.Join(flag.Args(), " "))
+		os.Exit(2)
+	}
 	if *Version {
 		fmt.Println(AppVersion)
 		os.Exit(0)