rpms/ksh/F-11 ksh-20100309-compsubst.patch, NONE, 1.1 ksh-20100309-fixwhence.patch, NONE, 1.1

Michal Hlavinka mhlavink at fedoraproject.org
Wed May 5 11:19:51 UTC 2010


Author: mhlavink

Update of /cvs/pkgs/rpms/ksh/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20028

Added Files:
	ksh-20100309-compsubst.patch ksh-20100309-fixwhence.patch 
Log Message:
* Mon Mar 29 2010 Michal Hlavinka <mhlavink at redhat.com> - 20100309-3
- fix typo in last patch


ksh-20100309-compsubst.patch:
 jobs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ksh-20100309-compsubst.patch ---
--- a/src/cmd/ksh93/sh/jobs.c	2010-03-10 23:57:41.000000000 +0530
+++ b/src/cmd/ksh93/sh/jobs.c	2010-04-20 18:12:15.000000000 +0530
@@ -1341,7 +1341,7 @@ int	job_wait(register pid_t pid)
 		sfprintf(sfstderr,"ksh: job line %4d: wait pid=%d critical=%d flags=%o\n",__LINE__,getpid(),job.in_critical,pw->p_flag);
 #endif /* DEBUG*/
 	errno = 0;
-	if(sh.coutpipe>=0 && sh.cpid==lastpid)
+	if(sh.coutpipe>=0 && sh.cpid && sh.cpid==lastpid )
 	{
 		sh_close(sh.coutpipe);
 		sh_close(sh.cpipe[1]);

ksh-20100309-fixwhence.patch:
 whence.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE ksh-20100309-fixwhence.patch ---
diff -up ksh-20100309/src/cmd/ksh93/bltins/whence.c.fixwh ksh-20100309/src/cmd/ksh93/bltins/whence.c
--- ksh-20100309/src/cmd/ksh93/bltins/whence.c.fixwh	2008-09-19 16:13:40.000000000 +0200
+++ ksh-20100309/src/cmd/ksh93/bltins/whence.c	2010-04-29 12:03:22.744013139 +0200
@@ -234,7 +234,10 @@ static int whence(Shell_t *shp,char **ar
 				}
 			}
 			if(flags&Q_FLAG)
+			{
 				r |= !cp;
+				pp = 0;
+			}
 			else if(cp)
 			{
 				if(flags&V_FLAG)



More information about the scm-commits mailing list