Merge remote-tracking branch 'upstream/master'

28 files changed, 23 insertions, 68 deletions

diff --git a/src/cmd/.cvsignore b/src/cmd/.cvsignore
deleted file mode 100644
index 49072760..00000000
--- a/src/cmd/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-o.*
-bc.tab.c
-bc.tab.h
-u9fs
-units.tab.c
-units.tab.h
-venti
diff --git a/src/cmd/9660/.cvsignore b/src/cmd/9660/.cvsignore
deleted file mode 100644
index 0b5dca63..00000000
--- a/src/cmd/9660/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-o.dump9660
-o.mk9660
diff --git a/src/cmd/acid/.cvsignore b/src/cmd/acid/.cvsignore
deleted file mode 100644
index c774979d..00000000
--- a/src/cmd/acid/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-y.tab.c
-y.tab.h
diff --git a/src/cmd/astro/.cvsignore b/src/cmd/astro/.cvsignore
deleted file mode 100644
index 588b9511..00000000
--- a/src/cmd/astro/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-o.out
-o.astro
diff --git a/src/cmd/awk/README b/src/cmd/awk/README
index bcf46126..e3efb50d 100644
--- a/src/cmd/awk/README
+++ b/src/cmd/awk/README
@@ -6,7 +6,7 @@ as such, it's copyright is held by Lucent Technologies and distributed under the
 Lucent Public License version 1.02 [http://www.opensource.org/licenses/lucent1.02.php].
 
 Modifications were made by Jeff Sickel in order to build using Plan 9 from User
-Space [http://swtch.com/plan9port/] to the following files:
+Space [https://9fans.github.io/plan9port/] to the following files:
 
     mkfile
     re.c
diff --git a/src/cmd/draw/.cvsignore b/src/cmd/draw/.cvsignore
deleted file mode 100644
index dd7a6e11..00000000
--- a/src/cmd/draw/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-o.*
-*.o
diff --git a/src/cmd/ed.c b/src/cmd/ed.c
index 79b90e7e..788b35be 100644
--- a/src/cmd/ed.c
+++ b/src/cmd/ed.c
@@ -13,7 +13,7 @@ enum
 	FNSIZE	= 128,		/* file name */
 	LBSIZE	= 4096,		/* max line size */
 	BLKSIZE	= 4096,		/* block size in temp file */
-	NBLK	= 8191,		/* max size of temp file */
+	NBLK	= 32767,		/* max size of temp file */
 	ESIZE	= 256,		/* max size of reg exp */
 	GBSIZE	= 256,		/* max size of global command */
 	MAXSUB	= 9,		/* max number of sub reg exp */
diff --git a/src/cmd/eqn/.cvsignore b/src/cmd/eqn/.cvsignore
deleted file mode 100644
index 1442fe84..00000000
--- a/src/cmd/eqn/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-eqn.c
-prevy.tab.h
-y.tab.h
diff --git a/src/cmd/grap/.cvsignore b/src/cmd/grap/.cvsignore
deleted file mode 100644
index a9938493..00000000
--- a/src/cmd/grap/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-grap.c
-grapl.c
-y.tab.h
diff --git a/src/cmd/grep/.cvsignore b/src/cmd/grep/.cvsignore
deleted file mode 100644
index c774979d..00000000
--- a/src/cmd/grep/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-y.tab.c
-y.tab.h
diff --git a/src/cmd/hoc/.cvsignore b/src/cmd/hoc/.cvsignore
deleted file mode 100644
index c774979d..00000000
--- a/src/cmd/hoc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-y.tab.c
-y.tab.h
diff --git a/src/cmd/jpg/.cvsignore b/src/cmd/jpg/.cvsignore
deleted file mode 100644
index d895c24c..00000000
--- a/src/cmd/jpg/.cvsignore
+++ /dev/null
@@ -1,15 +0,0 @@
-o.bmp
-o.gif
-o.ico
-o.jpg
-o.png
-o.ppm
-o.rgbrgbv
-o.rgbycc
-o.togif
-o.toico
-o.topng
-o.toppm
-o.yuv
-rgbv.h
-ycbcr.h
diff --git a/src/cmd/lex/.cvsignore b/src/cmd/lex/.cvsignore
deleted file mode 100644
index c774979d..00000000
--- a/src/cmd/lex/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-y.tab.c
-y.tab.h
diff --git a/src/cmd/mpm/.cvsignore b/src/cmd/mpm/.cvsignore
deleted file mode 100644
index a45a32ad..00000000
--- a/src/cmd/mpm/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-pm
diff --git a/src/cmd/pic/.cvsignore b/src/cmd/pic/.cvsignore
deleted file mode 100644
index 6e9127f7..00000000
--- a/src/cmd/pic/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-picl.c
-picy.c
-y.tab.c
-y.tab.h
diff --git a/src/cmd/postscript/mcolor/.cvsignore b/src/cmd/postscript/mcolor/.cvsignore
deleted file mode 100644
index 0c5af57d..00000000
--- a/src/cmd/postscript/mcolor/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tmac.color
diff --git a/src/cmd/postscript/misc/.cvsignore b/src/cmd/postscript/misc/.cvsignore
deleted file mode 100644
index c865cf4e..00000000
--- a/src/cmd/postscript/misc/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-ibmfont
-laserbar
-macfont
-pscrypt
diff --git a/src/cmd/postscript/mpictures/.cvsignore b/src/cmd/postscript/mpictures/.cvsignore
deleted file mode 100644
index b352e031..00000000
--- a/src/cmd/postscript/mpictures/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tmac.pictures
diff --git a/src/cmd/postscript/postreverse/.cvsignore b/src/cmd/postscript/postreverse/.cvsignore
deleted file mode 100644
index ce6f8746..00000000
--- a/src/cmd/postscript/postreverse/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-postreverse
diff --git a/src/cmd/postscript/psencoding/.cvsignore b/src/cmd/postscript/psencoding/.cvsignore
deleted file mode 100644
index 7f441579..00000000
--- a/src/cmd/postscript/psencoding/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-psencoding
diff --git a/src/cmd/rc/.cvsignore b/src/cmd/rc/.cvsignore
deleted file mode 100644
index abdaeea5..00000000
--- a/src/cmd/rc/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-x.tab.h
-y.tab.c
-y.tab.h
diff --git a/src/cmd/svgpic/plsvg.c b/src/cmd/svgpic/plsvg.c
index 3f342e68..7f6db9d4 100644
--- a/src/cmd/svgpic/plsvg.c
+++ b/src/cmd/svgpic/plsvg.c
@@ -288,14 +288,12 @@ void circle(double x, double y, double r)
 void spline(double x, double y, double n, ofloat *p, int attr, double ddval)
 {
 	int i;
-	double x1, y1, x2, y2;
+	double x1, y1;
 
 	printf("<path d=\"M %.3f %.3f", xconv(x), yconv(y));
 	x1 = 0;
 	y1 = 0;
 	for (i = 0; i < 2 * n; i += 2) {
-		x2 = x1;
-		y2 = y1;
 		x1 = x;
 		y1 = y;
 		x += p[i];
diff --git a/src/cmd/tbl/.cvsignore b/src/cmd/tbl/.cvsignore
deleted file mode 100644
index 9483a3fa..00000000
--- a/src/cmd/tbl/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-o.trbl
diff --git a/src/cmd/troff/.cvsignore b/src/cmd/troff/.cvsignore
deleted file mode 100644
index 6b401b18..00000000
--- a/src/cmd/troff/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-o.troff
diff --git a/src/lib9/frand.c b/src/lib9/frand.c
new file mode 100644
index 00000000..841f9685
--- /dev/null
+++ b/src/lib9/frand.c
@@ -0,0 +1,17 @@
+#include	<u.h>
+#include	<libc.h>
+
+#define	MASK	0x7fffffffL
+#define	NORM	(1.0/(1.0+MASK))
+
+double
+p9frand(void)
+{
+	double x;
+
+	do {
+		x = lrand() * NORM;
+		x = (x + lrand()) * NORM;
+	} while(x >= 1);
+	return x;
+}
diff --git a/src/lib9/mkfile b/src/lib9/mkfile
index 4bbd0f8b..8f7283ef 100644
--- a/src/lib9/mkfile
+++ b/src/lib9/mkfile
@@ -102,6 +102,7 @@ LIB9OFILES=\
 	execl.$O\
 	exitcode.$O\
 	fcallfmt.$O\
+	frand.$O\
 	get9root.$O\
 	getcallerpc-$OBJTYPE.$O\
 	getenv.$O\
diff --git a/src/libmach/symstabs.c b/src/libmach/symstabs.c
index 77c6bab7..e253f023 100644
--- a/src/libmach/symstabs.c
+++ b/src/libmach/symstabs.c
@@ -309,7 +309,8 @@ stabsline2pc(Fhdr *fhdr, u64int startpc, ulong line, u64int *pc)
 
 	l.type = LADDR;
 	l.addr = startpc;
-	if((s = ffindsym(fhdr, l, CTEXT)) == nil)
+	if((s = ffindsym(fhdr, l, CTEXT)) == nil
+	|| stabsym(&fhdr->stabs, s->u.stabs.i, &ss) < 0)
 		return -1;
 
 	trigger = 0;
diff --git a/src/libsec/386/.cvsignore b/src/libsec/386/.cvsignore
deleted file mode 100644
index 586a2bf7..00000000
--- a/src/libsec/386/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-md5block.s
-sha1block.s