author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 08 Sep 2014 23:00:19 -0700 | |
branch | s11-update |
changeset 3298 | 824a933aa683 |
parent 2837 | 4354bb214ece |
permissions | -rw-r--r-- |
2837
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
1 |
--- a/src/cmd/ksh93/bltins/cd_pwd.c 2013-10-31 16:18:43.904039613 +0100 |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
2 |
+++ b/src/cmd/ksh93/bltins/cd_pwd.c 2013-10-31 16:18:14.980499662 +0100 |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
3 |
@@ -81,7 +81,7 @@ |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
4 |
dir = argv[0]; |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
5 |
if(error_info.errors>0 || argc >2) |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
6 |
errormsg(SH_DICT,ERROR_usage(2),"%s",optusage((char*)0)); |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
7 |
- oldpwd = (char*)shp->pwd; |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
8 |
+ oldpwd = path_pwd(shp,0); |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
9 |
opwdnod = (shp->subshell?sh_assignok(OLDPWDNOD,1):OLDPWDNOD); |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
10 |
pwdnod = (shp->subshell?sh_assignok(PWDNOD,1):PWDNOD); |
4354bb214ece
17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff
changeset
|
11 |
if(argc==2) |