From owner-svn-src-user@FreeBSD.ORG  Thu Nov  6 21:59:24 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D37B2BE9;
 Thu,  6 Nov 2014 21:59:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BEDDFFE3;
 Thu,  6 Nov 2014 21:59:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA6LxOR8095159;
 Thu, 6 Nov 2014 21:59:24 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA6LxOn2095158;
 Thu, 6 Nov 2014 21:59:24 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201411062159.sA6LxOn2095158@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dchagin set sender to
 dchagin@FreeBSD.org using -f
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Thu, 6 Nov 2014 21:59:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r274197 - user/dchagin/lemul/sys/compat/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2014 21:59:24 -0000

Author: dchagin
Date: Thu Nov  6 21:59:24 2014
New Revision: 274197
URL: https://svnweb.freebsd.org/changeset/base/274197

Log:
  Correctly fill si_status in the siginfo for the CLD_STOPPED and
  CLD_CONTINUED status.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_signal.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_signal.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_signal.c	Thu Nov  6 21:49:35 2014	(r274196)
+++ user/dchagin/lemul/sys/compat/linux/linux_signal.c	Thu Nov  6 21:59:24 2014	(r274197)
@@ -687,9 +687,17 @@ siginfo_to_lsiginfo(siginfo_t *si, l_sig
 		lsi->lsi_band = si->si_band;
 		break;
 	case LINUX_SIGCHLD:
+		lsi->lsi_errno = 0;
 		lsi->lsi_pid = si->si_pid;
 		lsi->lsi_uid = si->si_uid;
-		lsi->lsi_status = si->si_status;
+
+		if (si->si_code == CLD_STOPPED)
+			lsi->lsi_status = BSD_TO_LINUX_SIGNAL(si->si_status);
+		else if (si->si_code == CLD_CONTINUED)
+			lsi->lsi_status = BSD_TO_LINUX_SIGNAL(SIGCONT);
+		else
+			lsi->lsi_status = si->si_status;
+
 		break;
 	case LINUX_SIGBUS:
 	case LINUX_SIGILL: