From 81014fa81be179142ff7cb1740a8eed9ed285723 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Wed, 6 Jun 2007 23:41:24 +0000
Subject: [PATCH] more errno cleanup

---
 funcs.c | 7 ++++---
 jobs.c  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/funcs.c b/funcs.c
index 09ecb9e..76f94bb 100644
--- a/funcs.c
+++ b/funcs.c
@@ -5,7 +5,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.56 2007/06/06 23:28:15 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.57 2007/06/06 23:41:23 tg Exp $");
 
 int
 c_cd(const char **wp)
@@ -3008,11 +3008,12 @@ c_ulimit(const char **wp)
 			if (how & HARD)
 				limit.rlim_max = val;
 			if (setrlimit(l->scmd, &limit) < 0) {
-				if (errno == EPERM)
+				how = errno;
+				if (how == EPERM)
 					bi_errorf("exceeds allowable limit");
 				else
 					bi_errorf("bad limit: %s",
-					    strerror(errno));
+					    strerror(how));
 				return 1;
 			}
 		} else {
diff --git a/jobs.c b/jobs.c
index bab9aea..13e4a1b 100644
--- a/jobs.c
+++ b/jobs.c
@@ -2,7 +2,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.23 2007/06/06 23:28:15 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.24 2007/06/06 23:41:24 tg Exp $");
 
 /* Order important! */
 #define PRUNNING	0
@@ -649,6 +649,7 @@ j_resume(const char *cp, int bg)
 			if (ttypgrp_ok &&
 			    tcsetpgrp(tty_fd, (j->flags & JF_SAVEDTTYPGRP) ?
 			    j->saved_ttypgrp : j->pgrp) < 0) {
+				rv = errno;
 				if (j->flags & JF_SAVEDTTY)
 					tcsetattr(tty_fd, TCSADRAIN, &tty_state);
 				sigprocmask(SIG_SETMASK, &omask,
@@ -657,7 +658,7 @@ j_resume(const char *cp, int bg)
 				    tty_fd,
 				    (int) ((j->flags & JF_SAVEDTTYPGRP) ?
 				    j->saved_ttypgrp : j->pgrp),
-				    strerror(errno));
+				    strerror(rv));
 				return 1;
 			}
 		}
@@ -668,7 +669,7 @@ j_resume(const char *cp, int bg)
 	}
 
 	if (j->state == PRUNNING && killpg(j->pgrp, SIGCONT) < 0) {
-		int	err = errno;
+		int err = errno;
 
 		if (!bg) {
 			j->flags &= ~JF_FG;