Sun Aug 30 19:45:05 2020 UTC ()

Since "struct job" gained a pgrp member some time ago now, use it
instead of simply assuming that the pid of the first (leftmost) process
in a pipeline is the pgrp - someday we may switch things around and
create pipelines right to left instead, which has several advantages,
but which would invalidate the assumption which was being made here.


(kre)

diff -r1.108 -r1.109 src/bin/sh/jobs.c

--- src/bin/sh/jobs.c 2020/08/20 23:03:17	1.108
+++ src/bin/sh/jobs.c 2020/08/30 19:45:05	1.109

 @@ -1,14 +1,14 @@
-/*	$NetBSD: jobs.c,v 1.108 2020/08/20 23:03:17 kre Exp $	*/
+/*	$NetBSD: jobs.c,v 1.109 2020/08/30 19:45:05 kre Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: jobs.c,v 1.108 2020/08/20 23:03:17 kre Exp $");
+__RCSID("$NetBSD: jobs.c,v 1.109 2020/08/30 19:45:05 kre Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <paths.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #ifdef BSD
 @@ -961,27 +961,27 @@ jobidcmd(int argc, char **argv)
 	return 0;
+}
 int
 getjobpgrp(const char *name)
+{
 	struct job *jp;
 	if (jobs_invalid)
 		error("No such job: %s", name);
 	jp = getjob(name, 1);
 	if (jp == 0)
 		return 0;
-	return -jp->ps[0].pid;
+	return -jp->pgrp;
+}
 /*
  * Convert a job name to a job structure.
  */
 STATIC struct job *
 getjob(const char *name, int noerror)
+{
 	int jobno = -1;
 	struct job *jp;
 	int pid;
 	int i;