Blame SOURCES/ksh-20120801-cdfork.patch
|
 |
2642b8 |
--- ksh-20120801/src/cmd/ksh93/sh/path.c 2014-09-01 15:08:06.738969962 -0300
|
|
|
2642b8 |
+++ ksh-20120801/src/cmd/ksh93/sh/path.c 2014-09-01 15:13:51.321459978 -0300
|
|
|
2642b8 |
@@ -229,13 +229,12 @@ static pid_t path_xargs(Shell_t *shp,con
|
|
|
2642b8 |
/*
|
|
|
2642b8 |
* make sure PWD is set up correctly
|
|
|
2642b8 |
* Return the present working directory
|
|
|
2642b8 |
- * Invokes getcwd() if flag==0 and if necessary
|
|
|
2642b8 |
+ * Invokes getcwd() if necessary
|
|
|
2642b8 |
* Sets the PWD variable to this value
|
|
|
2642b8 |
*/
|
|
|
2642b8 |
char *path_pwd(Shell_t *shp,int flag)
|
|
|
2642b8 |
{
|
|
|
2642b8 |
register char *cp;
|
|
|
2642b8 |
- register char *dfault = (char*)e_dot;
|
|
|
2642b8 |
register int count = 0;
|
|
|
2642b8 |
if(shp->pwd)
|
|
|
2642b8 |
return((char*)shp->pwd);
|
|
|
2642b8 |
@@ -254,11 +253,6 @@ char *path_pwd(Shell_t *shp,int flag)
|
|
|
2642b8 |
cp = "/";
|
|
|
2642b8 |
break;
|
|
|
2642b8 |
case 3:
|
|
|
2642b8 |
- cp = (char*)e_crondir;
|
|
|
2642b8 |
- if(flag) /* skip next case when non-zero flag */
|
|
|
2642b8 |
- ++count;
|
|
|
2642b8 |
- break;
|
|
|
2642b8 |
- case 4:
|
|
|
2642b8 |
{
|
|
|
2642b8 |
if(cp=getcwd(NIL(char*),0))
|
|
|
2642b8 |
{
|
|
|
2642b8 |
@@ -269,8 +263,8 @@ char *path_pwd(Shell_t *shp,int flag)
|
|
|
2642b8 |
}
|
|
|
2642b8 |
break;
|
|
|
2642b8 |
}
|
|
|
2642b8 |
- case 5:
|
|
|
2642b8 |
+ case 4:
|
|
|
2642b8 |
- return(dfault);
|
|
|
2642b8 |
+ return((char*)e_dot);
|
|
|
2642b8 |
}
|
|
|
2642b8 |
if(cp && *cp=='/' && test_inode(cp,e_dot))
|
|
|
2642b8 |
break;
|