plan9port

commit b7e6f4150f0974a3f3b145a23911b7c8a4b9399b
parent 58611a1bbf601c7f38c76421d3a3ece58bc56efb
Author: rsc <devnull@localhost>
Date:   Sun, 23 Nov 2003 18:16:51 +0000

make -> mk

use $HOME/mnt/plumb as named pipe.

Diffstat:
D
src/libplumb/Makefile
 | 
19
-------------------
M
src/libplumb/mesg.c
 | 
16
++++++++++++----
A
src/libplumb/mkfile
 | 
10
++++++++++

3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/libplumb/Makefile b/src/libplumb/Makefile
@@ -1,19 +0,0 @@
-
-LIB=../../lib/libplumb.a
-OFILES=\
-	mesg.o\
-
-HFILES=../../include/plumb.h
-
-INCLUDES=-I../../include
-
-CFLAGS += $(INCLUDES) -D_POSIX_SOURCE
-
-CC=cc
-
-$(LIB): $(OFILES)
-	ar r $(LIB) $(OFILES)
-
-clean:
-	rm -rf $(TARG) $(OFILES)
-
diff --git a/src/libplumb/mesg.c b/src/libplumb/mesg.c
@@ -4,28 +4,36 @@
 
 static char attrbuf[4096];
 
+char *home;
+
 int
 plumbopen(char *name, int omode)
 {
 	int fd, f;
 	char *s;
-	char buf[128];
+	char buf[256];
 
 	if(name[0] == '/')
 		return open(name, omode);
-	snprint(buf, sizeof buf, "/mnt/plumb/%s", name);
-	fd = open(buf, omode);
+	if(home == nil){
+		home = getenv("HOME");
+		if(home == nil)
+			return -1;
+	}
+	snprint(buf, sizeof buf, "%s/mnt/plumb", home);
+/*	fd = open(buf, omode);
 	if(fd >= 0)
 		return fd;
 	snprint(buf, sizeof buf, "/mnt/term/mnt/plumb/%s", name);
 	fd = open(buf, omode);
 	if(fd >= 0)
 		return fd;
-	/* try mounting service */
+	/* try mounting service * /
 	s = getenv("plumbsrv");
 	if(s == nil)
 		return -1;
 	snprint(buf, sizeof buf, "/mnt/plumb/%s", name);
+*/
 	return open(buf, omode);
 }
 
diff --git a/src/libplumb/mkfile b/src/libplumb/mkfile
@@ -0,0 +1,10 @@
+</$objtype/mkfile
+
+LIB=/$objtype/lib/libplumb.a
+OFILES=\
+	event.$O\
+	mesg.$O\
+
+HFILES=/sys/include/plumb.h
+
+</sys/src/cmd/mksyslib