commit 9f134f934141bdf659dd5ee010687eb66d6bdc0b
from: Omar Polo <op@omarpolo.com>
date: Wed Nov 23 17:16:04 2022 UTC

kamiftp: accept an optional 9p:// prefix in the connstring

commit - 514e8d4318a37182f68029dbe82d2580ac2e4451
commit + 9f134f934141bdf659dd5ee010687eb66d6bdc0b
blob - 11003288d404feba2a2245692db67c8df8325e59
blob + 2c35981703a1c8a66d03c14aa0126907af23d465
--- kamiftp/ftp.c
+++ kamiftp/ftp.c
@@ -214,7 +214,7 @@ static void __dead
 usage(int ret)
 {
 	fprintf(stderr, "usage: %s [-C cert] [-K key] [-o output] "
-	    "[user@]host[:port][/path]\n", getprogname());
+	    "[9p://][user@]host[:port][/path]\n", getprogname());
 	fprintf(stderr, "kamid suite version " KAMID_VERSION "\n");
 	exit(ret);
 }
@@ -1647,6 +1647,9 @@ parse_addr(const char *url, const char **user,
 	if (strlcpy(buf, url, sizeof(buf)) >= sizeof(buf))
 		errx(1, "connection string too long");
 
+	if (!strncmp(host, "9p://", 5))
+		host += 5;
+
 	if ((t = strchr(host, '/')) != NULL) {
 		if (t == host)
 			errx(1, "invalid connection string: %s", url);
blob - d366c74e27e27662accd63c85b5129a69c38c8c8
blob + 1d7768e8b549a3095444a6b642d15503d635358b
--- kamiftp/kamiftp.1
+++ kamiftp/kamiftp.1
@@ -23,7 +23,7 @@
 .Op Fl C Ar cert
 .Op Fl K Ar key
 .Op Fl o Ar output
-.Oo Ar user Ns @ Oc Ns Ar host Ns Oo : Ns Ar port Oc Ns Op / Ns Ar path
+.Oo 9p:// Oc Ns Oo Ar user Ns @ Oc Ns Ar host Ns Oo : Ns Ar port Oc Ns Op / Ns Ar path
 .Sh DESCRIPTION
 .Nm
 is a