sync with upstream

Author: 320x200

INSTALL

@@ -23,48 +23,49 @@ x-r)
 	exit 1
 esac
 
-PLAN9=`pwd` export PLAN9
-PATH=/bin:/usr/bin:$PLAN9/bin:$PATH export PATH
-case `uname` in
-SunOS)
-	awk=nawk
-	;;
-*)
-	awk=awk
-	;;
-esac
-
 echo "+ Mailing list: https://groups.google.com/group/plan9port-dev"
 echo "+ Issue tracker: https://github.com/9fans/plan9port/issues/"
 echo "+ Submitting changes: https://github.com/9fans/plan9port/pulls"
 echo " "
 echo "* Resetting $PLAN9/config"
 rm -f config
 
-(
-if [ `uname` = FreeBSD ]; then
+PLAN9=`pwd` export PLAN9
+PATH=/bin:/usr/bin:$PLAN9/bin:$PATH export PATH
+case `uname` in
+SunOS)
+	awk=nawk
+	;;
+DragonFly|*BSD)
 	case `cc -v 2>&1` in
 	*clang*)
 		echo "CC9=clang" >> $PLAN9/config
 		;;
+	*gcc*)
+		echo "CC9=gcc" >> $PLAN9/config
+		;;
+	esac
+	echo "* Running on" `uname`", adjusting linker flags"
+	case `uname` in
+	OpenBSD)
+		echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config
+		;;
+	NetBSD)
+		echo "LDFLAGS='-L/usr/X11R7/lib -pthread'" >> $PLAN9/config
+		;;
 	*)
+		echo "LDFLAGS='-L/usr/local/lib -pthread'" >> $PLAN9/config
 		;;
 	esac
-	echo "* Running on FreeBSD, adjusting linker flags"
-	echo "LDFLAGS='-L/usr/local/lib'" >> $PLAN9/config
-fi
-
-if [ `uname` = DragonFly ]; then
-	echo "* Running on DragonFly BSD, adjusting linker flags"
-	echo "LDFLAGS='-L/usr/local/lib -pthread'" >> $PLAN9/config
 	echo "CFLAGS='-pthread'" >> $PLAN9/config
-fi
-
-if [ `uname` = OpenBSD ]; then
-	echo "* Running on OpenBSD, adjusting linker flags"
-	echo "LDFLAGS='-L/usr/X11R6/lib -pthread'" >> $PLAN9/config
-fi
+	awk=awk
+	;;
+*)
+	awk=awk
+	;;
+esac
 
+(
 if [ `uname` = Linux ]; then
 	# On Linux, we use the kernel version to decide whether
 	# to use pthreads or not.  On 2.6 versions that aren't
@@ -135,6 +136,7 @@ if [ `uname` != Darwin ]; then
 	# Determine whether fontsrv X11 files are available.
 	rm -f a.out
 	cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
+	    -I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
 	    -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
 	if [ -f a.out ]; then
 		echo "	fontsrv dependencies found."

README.md

@@ -4,7 +4,7 @@ Installation
 ------------
 
 To install, run ./INSTALL.  It builds mk and then uses mk to
-run the rest of the installation.  
+run the rest of the installation.
 
 For more details, see install(1), at install.txt in this directory
 and at https://9fans.github.io/plan9port/man/man1/install.html.
@@ -22,15 +22,15 @@ or differences from Plan 9.
 Helping out
 -----------
 
-If you'd like to help out, great!  The TODO file contains a small list.
+If you'd like to help out, great!
 
 If you port this code to other architectures, please share your changes
 so others can benefit.
 
 Git
 ---
 
-You can use Git to keep your local copy up-to-date as we make 
+You can use Git to keep your local copy up-to-date as we make
 changes and fix bugs.  See the git(1) man page here ("9 man git")
 for details on using Git.
 

TODO

@@ -14,6 +14,10 @@ usegcc()
 		-Wno-comment \
 		-Wno-sign-compare \
 		-Wno-unknown-pragmas \
+		-Wno-misleading-indentation \
+		-Wno-stringop-truncation \
+		-Wno-stringop-overflow \
+		-Wno-format-truncation \
 		-fno-omit-frame-pointer \
 		-fsigned-char \
 	"
@@ -79,9 +83,8 @@ useclang()
 
 tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}-${CC9:-cc}"
 case "$tag" in
-*FreeBSD*gcc*)	usegcc ;;
-*FreeBSD*clang*)	useclang ;;
-*DragonFly*|*BSD*)	usegcc ;;
+*DragonFly*gcc*|*BSD*gcc*)	usegcc ;;
+*DragonFly*clang|*BSD*clang*)	useclang ;;
 *Darwin-x86_64*)
 		useclang
 		cflags="$ngflags -g3 -m64"
@@ -133,7 +136,7 @@ case "$tag" in
 esac
 
 # N.B. Must use temp file to avoid pipe; pipe loses status.
-xtmp=/tmp/9c.$$.$USER.out
+xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out
 $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp
 status=$?
 quiet $xtmp

bin/9c

@@ -11,19 +11,6 @@ nmflags=""
 extralibs="-lm"
 tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
 case "$tag" in
-*FreeBSD*)
-	ld=${CC9:-gcc}
-	userpath=true
-	extralibs="$extralibs -lutil"
-	case "`uname -r`" in
-	5.2.*)
-		extralibs="$extralibs -lkse"
-		;;
-	[5-9].*|1[0-9].*)
-		extralibs="$extralibs -lpthread"
-		;;
-	esac
-	;;
 *DragonFly*|*BSD*)
 	ld=${CC9:-gcc}
 	userpath=true
@@ -40,7 +27,7 @@ case "$tag" in
 	userpath=true
 	extralibs="$extralibs -lutil -lresolv"
 	case "${SYSVERSION:-`uname -r`}" in
-	2.6.* | 3.* | 4.*)
+	2.6.* | [3-9].* | [1-9][0-9].*)
 		extralibs="$extralibs -lpthread"
 		;;
 	esac
@@ -346,7 +333,7 @@ then
 	echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks
 fi
 
-xtmp=/tmp/9l.$$.$USER.out
+xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out"
 xxout() {
 	sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | 
 	egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub' 

bin/9l

@@ -2,19 +2,10 @@
 
 . 9.rc
 
-fn text {
-	if(~ $winid [0-9]*)
-		9p read acme/$winid/body
-	if not if(~ $text9term unix!*)
-		dial -e $text9term </dev/null
-	if not
-		status=''
-}
-
 PROMPT='[^ 	]*[%;$#][ 	]+'
 
 fn cmds {
-	text | sed -n 's/^'$PROMPT'([^"])/	\1/p'
+	wintext | sed -n 's/^'$PROMPT'([^"])/	\1/p'
 }
 
 switch($#*) {

bin/quote1

@@ -1,6 +1,6 @@
 #!/usr/local/plan9/bin/rc
 
-cmd = `{" $* | tail -1}
+cmd = `{quote1 $* | tail -1}
 if (~ $#cmd 0) {
 	echo no such command found >[1=2]
 	exit notfound

bin/quote2

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 case "$winid" in
 [0-9]*)
@@ -12,5 +12,11 @@ unix!*)
 	exit 0
 esac
 
+case "$TMUX" in
+?*)
+	tmux capture-pane -p
+	exit 0
+esac
+
 echo 'no running window found' 2>&1
 exit 1

bin/wintext

@@ -1,21 +1,6 @@
 #!/bin/sh
 
 # run this in the src directory
-SYSNAME=`uname` export SYSNAME
-OBJTYPE=`(uname -m -p 2>/dev/null || uname -m) | sed '
-	s;.*i[3-6]86.*;386;;
-	s;.*i86pc.*;386;;
-	s;.*amd64.*;x86_64;;
-	s;.*x86_64.*;x86_64;;
-	s;.*armv.*;arm;g;
-	s;.*powerpc.*;power;g;
-	s;.*PowerMacintosh.*;power;g;
-	s;.*Power.Macintosh.*;power;g;
-	s;.*macppc.*;power;g;
-	s;.*mips.*;mips;g;
-	s;.*ppc64.*;power;g;
-	s;.*ppc.*;power;g;
-	s;.*alpha.*;alpha;g;
-	s;.*sun4u.*;sun4u;g;
-'` export OBJTYPE
+. ../src/mkenv
+export SYSNAME OBJTYPE
 sh -x mkmk.sh

dist/buildmk

@@ -25,6 +25,9 @@ tag[1] Rrdkbd rune[2]
 tag[1] Tlabel label[s]
 tag[1] Rlabel 
 
+tag[1] Tctxt wsysid[s]
+tag[1] Rctxt
+
 tag[1] Tinit winsize[s] label[s] font[s]
 tag[1] Rinit
 
@@ -94,6 +97,8 @@ enum {
 	Rresize,
 	Tcursor2 = 28,
 	Rcursor2,
+	Tctxt = 30,
+	Rctxt,
 	Tmax,
 };
 
@@ -116,6 +121,7 @@ struct Wsysmsg
 	char *label;
 	char *snarf;
 	char *error;
+	char *id;
 	uchar *data;
 	uint count;
 	Rectangle rect;

include/drawfcall.h

@@ -11,13 +11,13 @@
 #define _LIBC_H_ 1
 #if defined(__cplusplus)
 extern "C" {
-#endif                                                                
+#endif
 
 #include <utf.h>
 #include <fmt.h>
 
 /*
- * Begin usual libc.h 
+ * Begin usual libc.h
  */
 
 #ifndef nil
@@ -361,7 +361,7 @@ enum
 extern	int	p9atexit(void(*)(void));
 extern	void	p9atexitdont(void(*)(void));
 extern	int	atnotify(int(*)(void*, char*), int);
-/* 
+/*
  * <stdlib.h>
 extern	double	atof(char*); <stdlib.h>
  */
@@ -383,8 +383,11 @@ extern	int	encodefmt(Fmt*);
 extern	int	dirmodefmt(Fmt*);
 extern	int	exitcode(char*);
 extern	void	exits(char*);
-extern	double	frexp(double, int*);
+extern	double	p9frexp(double, int*);
 extern	ulong	getcallerpc(void*);
+#if defined(__GNUC__) || defined(__clang__)
+#define getcallerpc(x) ((ulong)__builtin_return_address(0))
+#endif
 extern	char*	p9getenv(char*);
 extern	int	p9putenv(char*, char*);
 extern	int	getfields(char*, char**, int, int, char*);
@@ -433,6 +436,8 @@ extern	void	(*_unpin)(void);
 #define atoll		p9atoll
 #define encrypt		p9encrypt
 #define decrypt		p9decrypt
+#undef frexp
+#define frexp		p9frexp
 #define getenv		p9getenv
 #define	getwd		p9getwd
 #define	longjmp		p9longjmp
@@ -479,7 +484,7 @@ extern	void	lock(Lock*);
 extern	void	unlock(Lock*);
 extern	int	canlock(Lock*);
 extern	int	(*_lock)(Lock*, int, ulong);
-extern	void	(*_unlock)(Lock*, ulong);	
+extern	void	(*_unlock)(Lock*, ulong);
 
 typedef struct QLock QLock;
 struct QLock
@@ -670,15 +675,15 @@ extern	void		freenetconninfo(NetConnInfo*);
 
 enum
 {
-	RFNAMEG		= (1<<0), 
-	RFENVG		= (1<<1), 
+	RFNAMEG		= (1<<0),
+	RFENVG		= (1<<1),
 	RFFDG		= (1<<2),
 	RFNOTEG		= (1<<3),
 	RFPROC		= (1<<4),
 	RFMEM		= (1<<5),
 	RFNOWAIT	= (1<<6),
-	RFCNAMEG	= (1<<10), 
-	RFCENVG		= (1<<11), 
+	RFCNAMEG	= (1<<10),
+	RFCENVG		= (1<<11),
 	RFCFDG		= (1<<12)
 /*	RFREND		= (1<<13), */
 /*	RFNOMNT		= (1<<14) */
@@ -707,7 +712,7 @@ struct Dir {
 	char	*uid;	/* owner name */
 	char	*gid;	/* group name */
 	char	*muid;	/* last modifier name */
-	
+
 	/* 9P2000.u extensions */
 	uint	uidnum;		/* numeric uid */
 	uint	gidnum;		/* numeric gid */
@@ -750,7 +755,7 @@ extern	int	p9exec(char*, char*[]);
 extern	int	p9execl(char*, ...);
 /* extern	int	p9fork(void); */
 extern	int	p9rfork(int);
-/* not implemented 
+/* not implemented
 extern	int	fauth(int, char*);
 extern	int	fstat(int, uchar*, int);
 extern	int	fwstat(int, uchar*, int);
@@ -767,7 +772,7 @@ extern	int	notifyoff(char*);
 extern	int	p9open(char*, int);
 extern	int	fd2path(int, char*, int);
 extern	int	p9pipe(int*);
-/* 
+/*
  * use defs from <unistd.h>
 extern	long	pread(int, void*, long, vlong);
 extern	long	preadv(int, IOchunk*, int, vlong);