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/185-Bug17714341.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Mon, 27 Apr 2015 10:19:50 -0500
changeset 4196 d697072a92f5
parent 1539 components/ksh93/patches/Bug17714341.patch@f92203f7c0c2
permissions -rw-r--r--
19782029 userland should be able to build from SCM repositories
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1539
f92203f7c0c2 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
f92203f7c0c2 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
f92203f7c0c2 17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     3
 
@@ -81,7 +81,7 @@
f92203f7c0c2 17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     4
 
 	dir =  argv[0];
f92203f7c0c2 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)
f92203f7c0c2 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));
f92203f7c0c2 17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     7
 
-	oldpwd = (char*)shp->pwd;
f92203f7c0c2 17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     8
 
+	oldpwd = path_pwd(shp,0);
f92203f7c0c2 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);
f92203f7c0c2 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);
f92203f7c0c2 17714341 /usr/bin/cd core dumps during string substitution
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    11
 
 	if(argc==2)
upstream/oracle/userland-gate