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/CR7175995.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 16 Oct 2013 10:00:08 -0700
changeset 1512 f57514e19ede
parent 953 a0fb7976f6c7
permissions -rw-r--r--
17596443 nm -p output change breaks userland 17361780 LD_Z_TEXT should, ya know, contain -z text not -z direct 17602195 elf_wrong_location_check could be better
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
953
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     1
 
diff -Naur INIT.2011-02-08.orig/src/cmd/ksh93/sh/init.c INIT.2011-02-08/src/cmd/ksh93/sh/init.c
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     2
 
--- INIT.2011-02-08.orig/src/cmd/ksh93/sh/init.c	2012-06-25 01:05:32.997978071 -0700
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     3
 
+++ INIT.2011-02-08/src/cmd/ksh93/sh/init.c	2012-06-25 01:19:10.000000000 -0700
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     4
 
@@ -1181,7 +1181,7 @@
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     5
 
 	Shell_t	*shp;
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     6
 
 	register int n;
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     7
 
 	int type;
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     8
 
-	static char *login_files[3];
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     9
 
+	static char *login_files[2];
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    10
 
 	memfatal();
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    11
 
 	n = strlen(e_version);
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    12
 
 	if(e_version[n-1]=='$' && e_version[n-2]==' ')
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    13
 
@@ -1468,7 +1468,6 @@
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    14
 
         shp->topscope = (Shscope_t*)shp->st.self;
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    15
 
 	sh_offstate(SH_INIT);
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    16
 
 	login_files[0] = (char*)e_profile;
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    17
 
-	login_files[1] = ".profile";
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    18
 
 	shp->gd->login_files = login_files;
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    19
 
 	shp->bltindata.version = SH_VERSION;
a0fb7976f6c7 7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    20
 
 	shp->bltindata.shp = shp;
upstream/oracle/userland-gate