20110819-1306

4 files changed, 5 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index 5c37adee..b7cc1dbe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20110819
+	appl/cmd/mk/mk.b - use raise "fail:..." for exit status [issue 268]
 20110629
 	change x86 getcallerpc to avoid use of %ebp [issue 266]
 	change type of getcallerpc to uintptr from ulong
diff --git a/appl/cmd/mk/mk.b b/appl/cmd/mk/mk.b
index cf705cf0..82c97bf5 100644
--- a/appl/cmd/mk/mk.b
+++ b/appl/cmd/mk/mk.b
@@ -368,7 +368,6 @@ main(argc: int, argv: array of array of byte)
 	if(uflag)
 		prusage();
 	bout.flush();
-	exit;
 }
 
 badusage()
@@ -575,7 +574,7 @@ execl(sh: string, name: string, a1: string, a2: string, a3: string, a4: string)
 	c := load Command sh;
 	if(c == nil){
 		sys->fprint(sys->fildes(2), "x %s: %r\n", sh);
-		return;
+		raise "fail:execl";
 	}
 	argl: list of string;
 	if(a4 != nil)
@@ -3232,8 +3231,6 @@ fork1(c1: chan of int, args: array of byte, cmd: array of byte, buf: ref Bufbloc
 			else
 				execl(shell, shellname, argss, nil, nil, nil);
 			exit;
-			# perror(shell);
-			# exits("exec");
 		}
 	}
 }
@@ -3260,7 +3257,6 @@ fork2(c2: chan of int, cmd: array of byte, in: array of ref Sys->FD, out: array
 		}
 		in[1] = nil;
 		exit;
-		# exits(nil);
 	}
 }
 
@@ -3317,8 +3313,6 @@ fork3(c3: chan of int, cmd: array of byte, e: array of Envy, fd: array of ref Sy
 		else
 			execl(shell, shellname, "-c", cmds, nil, nil);
 		exit;
-		# perror(shell);
-		# exits("exec");
 	}
 }
 
@@ -3351,7 +3345,7 @@ Exit()
 	while(wait().t0 >= 0)
 		;
 	bout.flush();
-	exit;
+	raise "fail:error";
 }
 
 nnote: int;
diff --git a/dis/mk.dis b/dis/mk.dis
index 4496d665..1067f316 100644
--- a/dis/mk.dis
+++ b/dis/mk.dis
diff --git a/include/version.h b/include/version.h
index db8015a9..8e004e56 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20110629)"
+#define VERSION	"Fourth Edition (20110819)"