diff --git a/9p b/9p new file mode 100755 index 0000000..14881ab Binary files /dev/null and b/9p differ diff --git a/cmd/9p/main.go b/cmd/ollie-9p/main.go similarity index 90% rename from cmd/9p/main.go rename to cmd/ollie-9p/main.go index f2e0d9a..15304e1 100644 --- a/cmd/9p/main.go +++ b/cmd/ollie-9p/main.go @@ -1,9 +1,9 @@ -// Command 9p is a complete 9P client for interacting with olliesrv. -// It replaces plan9port's 9p command with no external dependencies. +// Command ollie-9p is a 9P client for interacting with olliesrv. +// Auto-discovers the server via $NAMESPACE and identity via $OLLIE_UNAME. // // Usage: // -// 9p [-a addr] [-A aname] [-n] cmd args... +// ollie-9p [-a addr] cmd args... // // Commands: // @@ -31,18 +31,17 @@ import ( ) var ( - addr = flag.String("a", "", "server address (default: unix!$ns/ollie)") - noauth = flag.Bool("n", false, "no authentication") + addr = flag.String("a", "", "server address (default: unix!$NAMESPACE/ollie)") ) func usage() { - fmt.Fprintf(os.Stderr, "usage: 9p [-a addr] [-A aname] [-n] cmd args...\n") + fmt.Fprintf(os.Stderr, "usage: ollie-9p [-a addr] cmd args...\n") fmt.Fprintf(os.Stderr, "commands: read write rdwr stat ls create remove mkdir\n") os.Exit(1) } func fatalf(format string, args ...any) { - fmt.Fprintf(os.Stderr, "9p: "+format+"\n", args...) + fmt.Fprintf(os.Stderr, "ollie-9p: "+format+"\n", args...) os.Exit(1) } @@ -59,39 +58,39 @@ func main() { switch cmd { case "read": if len(args) != 1 { - fatalf("usage: 9p read path") + fatalf("usage: ollie-9p read path") } cmdRead(args[0]) case "write": if len(args) != 1 { - fatalf("usage: 9p write path") + fatalf("usage: ollie-9p write path") } cmdWrite(args[0]) case "rdwr": if len(args) != 1 { - fatalf("usage: 9p rdwr path") + fatalf("usage: ollie-9p rdwr path") } cmdRdwr(args[0]) case "stat": if len(args) != 1 { - fatalf("usage: 9p stat path") + fatalf("usage: ollie-9p stat path") } cmdStat(args[0]) case "ls": cmdLs(args) case "create": if len(args) != 1 { - fatalf("usage: 9p create path") + fatalf("usage: ollie-9p create path") } cmdCreate(args[0]) case "remove": if len(args) != 1 { - fatalf("usage: 9p remove path") + fatalf("usage: ollie-9p remove path") } cmdRemove(args[0]) case "mkdir": if len(args) != 1 { - fatalf("usage: 9p mkdir path") + fatalf("usage: ollie-9p mkdir path") } cmdMkdir(args[0]) default: diff --git a/ollie-9p b/ollie-9p new file mode 100755 index 0000000..8697c4f Binary files /dev/null and b/ollie-9p differ