Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ksh93/patches/085-CR7046434.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 18 May 2015 14:11:16 -0700
changeset 4305 90493abe0c5c
permissions -rw-r--r--
backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4305
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     1
 
diff -rupN INIT.2011-02-08/src/cmd/ksh93/sh/subshell.c INIT.2011-02-08.clean/src/cmd/ksh93/sh/subshell.c
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     2
 
--- INIT.2011-02-08/src/cmd/ksh93/sh/subshell.c	2012-05-01 10:06:04.621554775 -0700
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     3
 
+++ INIT.2011-02-08.clean/src/cmd/ksh93/sh/subshell.c	2012-05-01 10:05:25.139965959 -0700
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
 
@@ -241,9 +241,6 @@ Namval_t *sh_assignok(register Namval_t
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
 	/* don't bother with this */
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     6
 
 	if(!sp->shpwd || np==SH_LEVELNOD || np==L_ARGNOD || np==SH_SUBSCRNOD || np==SH_NAMENOD)
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
 		return(np);
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
-	/* don't bother to save if in newer scope */
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
 
-	if(sp->var!=shp->var_tree && shp->last_root==shp->var_tree)
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
 
-		return(np);
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
 
 	if((ap=nv_arrayptr(np)) && (mp=nv_opensub(np)))
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
 
 	{
90493abe0c5c backout 17533968/17817727/17699248/17777549/18119738/18229654/16169978/18302723/16507675/18920300/18355790/19907453/18426052/20808157/20948390/20948350 - causes 21091065
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    13
 
 		shp->last_root = ap->table;
upstream/oracle/userland-gate