commit - 73a5509ae929e41ca0047254a880c8efd4aa72a1
commit + 6215fd56f1c9d9392806efd1ac499f91c8ae83fb
blob - 7177e53e9b567e9acf98457e5fa18ebe2f19cce7
blob + 5c64528777742a33c5088facc9af9df4f14176d9
--- man/man3/dial.3
+++ man/man3/dial.3
@@ -161,6 +161,22 @@ makes an address suitable for dialing or announcing.
 It takes an address along with a default network and service to use
 if they are not specified in the address.
 It returns a pointer to static data holding the actual address to use.
+.PP
+.I Netmkaddr
+also translates Unix conventions into Plan 9 syntax.
+If 
+.I addr
+is the name of a local file or Unix domain socket,
+.I netmkaddr
+will return
+.IB unix ! addr \fR.
+If
+.I addr
+is of the form 
+.IB host : port \fR,
+.I netmkaddr
+will return
+.IB net ! host ! port \fR.
 .PP
 .I Dialparse
 parses a network address as described above
blob - dcbdc0b8073ba23aa4047c7396889a74e46789a8
blob + 88dcf56492dba5e43d09e1b68ab8caa3c33618c1
--- src/lib9/dial.c
+++ src/lib9/dial.c
@@ -118,6 +118,9 @@ Unix:
 		free(buf);
 		return -1;
 	}
+	/* Allow regular files in addition to Unix sockets. */
+	if((s = open(unix, ORDWR)) >= 0)
+		return s;
 	memset(&su, 0, sizeof su);
 	su.sun_family = AF_UNIX;
 	if(strlen(unix)+1 > sizeof su.sun_path){
blob - fd53f46842dadad237031e814feb21cf026ed025
blob + b476516d910c192b3802fec54358960a2eb8c438
--- src/lib9/netmkaddr.c
+++ src/lib9/netmkaddr.c
@@ -16,21 +16,25 @@ netmkaddr(char *linear, char *defnet, char *defsrv)
 	 */
 	cp = strchr(linear, '!');
 	if(cp == 0){
-		if(defnet==0){
-			if(defsrv)
-				snprint(addr, sizeof(addr), "net!%s!%s",
-					linear, defsrv);
-			else
-				snprint(addr, sizeof(addr), "net!%s", linear);
+		if(defnet == 0)
+			defnet = "net";
+		/* allow unix sockets to omit unix! prefix */
+		if(access(linear, 0) >= 0){
+			snprint(addr, sizeof(addr), "unix!%s", linear);
+			return addr;
 		}
-		else {
-			if(defsrv)
-				snprint(addr, sizeof(addr), "%s!%s!%s", defnet,
-					linear, defsrv);
-			else
-				snprint(addr, sizeof(addr), "%s!%s", defnet,
-					linear);
+		/* allow host:service in deference to Unix convention */
+		if((cp = strchr(linear, ':')) != nil){
+			snprint(addr, sizeof(addr), "%s!%.*s!%s", 
+				defnet, utfnlen(linear, cp-linear),
+				linear, cp+1);
+			return addr;
 		}
+		if(defsrv)
+			snprint(addr, sizeof(addr), "%s!%s!%s",
+				defnet, linear, defsrv);
+		else
+			snprint(addr, sizeof(addr), "%s!%s", defnet, linear);
 		return addr;
 	}