shithub: snarflog

Info  •  Files  •  Log  •  Branches

support -s to specify srv

--- a/main.go

+++ b/main.go

@@ -144,7 +144,14 @@

 func main() {

 	foreground := flag.Bool("f", false, "run in foreground")

+	help := flag.Bool("h", false, "output usage")

+	srv := flag.String("s", "snarflog", "srv point")

 	flag.Parse()

+	if *help {

+		fmt.Printf("usage: %s [-s srv]\n", os.Args[0])

+		os.Exit(0)

+	}

+	srvpath := "/srv/" + *srv

 	if *foreground {

 		os.Args = append(os.Args[:1], os.Args[2:]...)

 	} else {

@@ -166,9 +173,9 @@

 		os.Exit(0)

 	}

-	_, err := os.Stat("/srv/snarflog")

+	_, err := os.Stat(srvpath)

 	if err == nil {

-		srvFd, err := plan9.Open("/srv/snarflog", plan9.O_RDWR)

+		srvFd, err := plan9.Open(srvpath, plan9.O_RDWR)

 		if err != nil {

 			fmt.Printf("bad snarflog in srv: %v\n", err)

 			os.Exit(1)

@@ -203,7 +210,7 @@

 			Srv:   fid.Server(),

 			state: &snarfFSState{},

 		}

-		if err := go9p.PostSrv("snarflog", server); err != nil {

+		if err := go9p.PostSrv(*srv, server); err != nil {

 			fmt.Printf("Failed to post server: %v\n", err)

 			os.Exit(1)

 		}

@@ -211,7 +218,7 @@

 	}()

 	for {

-		_, err := os.Stat("/srv/snarflog")

+		_, err := os.Stat(srvpath)

 		if err == nil {

 			break

 		}

@@ -218,9 +225,9 @@

 		time.Sleep(100 * time.Millisecond)

 	}

-	srvFd, err := plan9.Open("/srv/snarflog", plan9.O_RDWR)

+	srvFd, err := plan9.Open(srvpath, plan9.O_RDWR)

 	if err != nil {

-		fmt.Printf("Failed to open /srv/snarflog: %v\n", err)

+		fmt.Printf("Failed to open %s: %s\n", srvpath, err)

 		os.Exit(1)

 	}

 	defer plan9.Close(srvFd)

-- 

⑨