Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/bin/sh Pull up following revision(s) (requested by kre in...



details:   https://anonhg.NetBSD.org/src/rev/546f92334f9d
branches:  netbsd-8
changeset: 435298:546f92334f9d
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 09 09:51:57 2018 +0000

description:
Pull up following revision(s) (requested by kre in ticket #1050):

        bin/sh/jobs.c: revision 1.101

A change in rev 1.91 interacted badly with the way that showjobs()
worked, preventing $(jobs) (and more usefully $(jobs -p) from
working.   Fix that.

XXX pullup -8

diffstat:

 bin/sh/jobs.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r fb00973a1d66 -r 546f92334f9d bin/sh/jobs.c
--- a/bin/sh/jobs.c     Tue Oct 09 09:49:35 2018 +0000
+++ b/bin/sh/jobs.c     Tue Oct 09 09:51:57 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jobs.c,v 1.85.2.2 2017/11/17 14:56:52 martin Exp $     */
+/*     $NetBSD: jobs.c,v 1.85.2.3 2018/10/09 09:51:57 martin Exp $     */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)jobs.c     8.5 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: jobs.c,v 1.85.2.2 2017/11/17 14:56:52 martin Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.85.2.3 2018/10/09 09:51:57 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -578,14 +578,13 @@
                silent = 1;
        }
 #endif
-       if (jobs_invalid)
-               return;
 
        for (jobno = 1, jp = jobtab ; jobno <= njobs ; jobno++, jp++) {
                if (!jp->used)
                        continue;
                if (jp->nprocs == 0) {
-                       freejob(jp);
+                       if (!jobs_invalid)
+                               freejob(jp);
                        continue;
                }
                if ((mode & SHOW_CHANGED) && !jp->changed)



Home | Main Index | Thread Index | Old Index