Fix ordering of if statements

JohnoKing · Dec 17, 2024 · e429d71 · e429d71
1 parent 967a80a
commit e429d71
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/cmd/ksh93/sh/subshell.c b/src/cmd/ksh93/sh/subshell.c
@@ -785,15 +785,16 @@ Sfio_t *sh_subshell(Shnode_t *t, volatile int flags, int comsub)
 		}
 		sh.options = sp->options;
 		/* restore the present working directory */
-		if(sp->pwdfd > 0 && fchdir(sp->pwdfd) < 0)
+		if(sh.pwdfd != sp->pwdfd && sp->pwdfd > 0 && fchdir(sp->pwdfd) < 0)
 		{
+			sh_close(sp->pwdfd);
 			saveerrno = errno;
 			fatalerror = 2;
 		}
-		if(fatalerror != 2)
-			sh_pwdupdate(sp->pwdfd);
 		else if(sp->pwd && strcmp(sp->pwd,sh.pwd))
 			path_newdir(sh.pathlist);
+		if(fatalerror != 2)
+			sh_pwdupdate(sp->pwdfd);
 		if(sh.pwd)
 			free((void*)sh.pwd);
 		sh.pwd = sp->pwd;