From b1455f33a8a7b6826fcb0d4b3f4849e322755d28 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 30 Apr 2004 02:16:28 +0000
Subject: Little fixes.

---
 src/cmd/9term/win.c   | 18 ++++++++++++------
 src/cmd/bzip2/bzip2.c |  3 +++
 src/cmd/draw/gview.c  |  4 ++--
 src/cmd/gzip/gzip.c   |  3 +++
 src/cmd/rc/exec.h     |  1 +
 5 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/cmd')

diff --git a/src/cmd/9term/win.c b/src/cmd/9term/win.c
index f341c102..a92c1656 100644
--- a/src/cmd/9term/win.c
+++ b/src/cmd/9term/win.c
@@ -121,18 +121,24 @@ threadmain(int argc, char **argv)
 	case 'd':
 		debug = 1;
 		break;
+	case 'n':
+		name = EARGF(usage());
+		break;
 	default:
 		usage();
 	}ARGEND
 
 	prog = argv;
 
-	if(argc > 0){
-		name = argv[0];
-		argc--;
-		argv++;
-	}else
-		name = "gnot";
+	if(name == nil){
+		if(argc > 0)
+			name = argv[0];
+		else{
+			name = sysname();
+			if(name == nil)
+				name = "gnot";
+		}
+	}
 
 	threadnotify(nopipes, 1);
 	if((fs = nsmount("acme", "")) == 0)
diff --git a/src/cmd/bzip2/bzip2.c b/src/cmd/bzip2/bzip2.c
index e7ac9953..cc21a57c 100644
--- a/src/cmd/bzip2/bzip2.c
+++ b/src/cmd/bzip2/bzip2.c
@@ -38,6 +38,9 @@ main(int argc, char **argv)
 	case 'c':
 		stdout++;
 		break;
+	case 'f':
+		/* force */
+		break;
 	case 'd':
 		/*
 		 * gnu tar expects bzip2 -d to decompress
diff --git a/src/cmd/draw/gview.c b/src/cmd/draw/gview.c
index 5e80ee2a..0508d2dc 100644
--- a/src/cmd/draw/gview.c
+++ b/src/cmd/draw/gview.c
@@ -1934,9 +1934,9 @@ void doevent(void)
 			if (mobile) {
 				mvtime = ev.mouse.msec + Mv_delay;
 				prepare_mv(cur_sel.fp);
+				if (!lift_button(1, &ev.mouse, mvtime))
+					save_mv(do_move(1, &ev.mouse));
 			}
-			if (!lift_button(1, &ev.mouse, mvtime) && mobile)
-				save_mv(do_move(1, &ev.mouse));
 		} else if (ev.mouse.buttons & But2)
 			do_emenu(2, &ev.mouse);
 		else if (ev.mouse.buttons & But3)
diff --git a/src/cmd/gzip/gzip.c b/src/cmd/gzip/gzip.c
index f37405b9..f4038b88 100644
--- a/src/cmd/gzip/gzip.c
+++ b/src/cmd/gzip/gzip.c
@@ -52,6 +52,9 @@ main(int argc, char *argv[])
 		exec("gunzip", oargv);
 		sysfatal("exec gunzip failed");
 		break;
+	case 'f':
+		/* force */
+		break;
 	case 'v':
 		verbose++;
 		break;
diff --git a/src/cmd/rc/exec.h b/src/cmd/rc/exec.h
index fbfe2dbb..1704b6f3 100644
--- a/src/cmd/rc/exec.h
+++ b/src/cmd/rc/exec.h
@@ -51,6 +51,7 @@ struct thread{
 	int iflag;			/* interactive? */
 	int lineno;			/* linenumber */
 	int pid;			/* process for Xpipewait to wait for */
+	int done;			/* have we seen a wait message for this process? */
 	char status[NSTATUS];		/* status for Xpipewait */
 	tree *treenodes;		/* tree nodes created by this process */
 	thread *ret;		/* who continues when this finishes */
-- 
cgit v1.2.3