Parital revert to fix a test failure in functions.sh

src/cmd/ksh93/bltins/trap.c

@@ -174,7 +174,7 @@ int	b_trap(int argc,char *argv[],Shbltin_t *context)
 		 * Set a flag for sh_exec() to disable exec-without-fork optimizations if any trap is set and non-empty.
 		 * (In ksh functions, there may be parent scope traps, so do not reset to 0 if in a ksh function.)
 		 */
-		if(sh.infunction!=FUN_KSH)
+		if(sh.fn_depth==0)
 			sh.st.trapdontexec = 0;
 		if(!sh.st.trapdontexec)
 		{

src/cmd/ksh93/sh/macro.c

@@ -2856,7 +2856,7 @@ static char *special(int c)
 	    case '?':
 		return ltos(sh.savexit);
 	    case 0:
-		if(sh_isstate(SH_PROFILE) || sh.infunction!=FUN_KSH || !sh.st.cmdname)
+		if(sh_isstate(SH_PROFILE) || sh.fn_depth==0 || !sh.st.cmdname)
 			return sh.shname;
 		else
 			return sh.st.cmdname;