components/ksh93/patches/190-17432413.patch
changeset 4196 d697072a92f5
parent 1549 f683981a3096
equal deleted inserted replaced
4195:d88c5d15a4af 4196:d697072a92f5
       
     1 --- a/src/cmd/ksh93/sh/init.c
       
     2 +++ b/src/cmd/ksh93/sh/init.c
       
     3 @@ -720,7 +720,7 @@ static char* get_lastarg(Namval_t* np, Namfun_t *fp)
       
     4  	char	*cp;
       
     5  	int	pid;
       
     6          if(sh_isstate(SH_INIT) && (cp=shp->lastarg) && *cp=='*' && (pid=strtol(cp+1,&cp,10)) && *cp=='*')
       
     7 -		nv_putval(np,(pid==shp->gd->ppid?cp+1:0),0);
       
     8 +		nv_putval(np,cp+1,0);
       
     9  	return(shp->lastarg);
       
    10  }
       
    11  
       
    12 --- a/src/cmd/ksh93/sh/main.c
       
    13 +++ b/src/cmd/ksh93/sh/main.c
       
    14 @@ -298,7 +298,7 @@ int sh_main(int ac, char *av[], Shinit_f userinit)
       
    15  					 */
       
    16  					if (shp->st.repl_index > 0)
       
    17  						av[shp->st.repl_index] = shp->st.repl_arg;
       
    18 -					if(((type = sh_type(cp = av[0])) & SH_TYPE_SH) && (!(name = nv_getval(L_ARGNOD)) || !((type = sh_type(cp = name)) & SH_TYPE_SH)))
       
    19 +					if(((type = sh_type(cp = av[0])) & SH_TYPE_SH) && (name = nv_getval(L_ARGNOD)) && (!((type = sh_type(cp = name)) & SH_TYPE_SH)))
       
    20  					{
       
    21  						av[0] = (type & SH_TYPE_LOGIN) ? cp : path_basename(cp);
       
    22  						/*  exec to change $0 for ps */
       
    23