| author | Danek Duvall <danek.duvall@oracle.com> |
| Fri, 15 May 2015 11:21:43 -0700 | |
| branch | s11-update |
| changeset 4318 | 7f2f7aebce6e |
| parent 2357 | c3849e036731 |
| permissions | -rw-r--r-- |
|
2357
c3849e036731
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 |
|
c3849e036731
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 |
|
c3849e036731
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 |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
4 |
@@ -1181,7 +1181,7 @@ |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
5 |
Shell_t *shp; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
6 |
register int n; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
7 |
int type; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
8 |
- static char *login_files[3]; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
9 |
+ static char *login_files[2]; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
10 |
memfatal(); |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
11 |
n = strlen(e_version); |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
12 |
if(e_version[n-1]=='$' && e_version[n-2]==' ') |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
13 |
@@ -1468,7 +1468,6 @@ |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
14 |
shp->topscope = (Shscope_t*)shp->st.self; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
15 |
sh_offstate(SH_INIT); |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
16 |
login_files[0] = (char*)e_profile; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
17 |
- login_files[1] = ".profile"; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
18 |
shp->gd->login_files = login_files; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
19 |
shp->bltindata.version = SH_VERSION; |
|
c3849e036731
7175995 Problem with shell/korn93
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff
changeset
|
20 |
shp->bltindata.shp = shp; |