From owner-svn-src-user@freebsd.org  Mon Dec 26 12:39:26 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43F0EC64911
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Mon, 26 Dec 2016 12:39:26 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 1417613E2;
 Mon, 26 Dec 2016 12:39:26 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQCdPh0094275;
 Mon, 26 Dec 2016 12:39:25 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQCdPZ3094274;
 Mon, 26 Dec 2016 12:39:25 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201612261239.uBQCdPZ3094274@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 26 Dec 2016 12:39:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r310596 - user/bapt/diff
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.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Dec 2016 12:39:26 -0000

Author: bapt
Date: Mon Dec 26 12:39:25 2016
New Revision: 310596
URL: https://svnweb.freebsd.org/changeset/base/310596

Log:
  Do not pause in pr(1) to have the same behaviour as GNU diff
  
  Use execl instead of execv to avoid warnings

Modified:
  user/bapt/diff/diffreg.c

Modified: user/bapt/diff/diffreg.c
==============================================================================
--- user/bapt/diff/diffreg.c	Mon Dec 26 11:46:05 2016	(r310595)
+++ user/bapt/diff/diffreg.c	Mon Dec 26 12:39:25 2016	(r310596)
@@ -381,10 +381,8 @@ diffreg(char *file1, char *file2, int fl
 		/* redirect stdout to pr */
 		int	 pfd[2];
 		char	*header;
-		char * prargv[] = { "pr", "-h", NULL, "-f", NULL };
 
 		xasprintf(&header, "%s %s %s", diffargs, file1, file2);
-		prargv[2] = header;
 		signal(SIGPIPE, SIG_IGN);
 		fflush(stdout);
 		rewind(stdout);
@@ -401,7 +399,7 @@ diffreg(char *file1, char *file2, int fl
 				close(pfd[0]);
 			}
 			close(pfd[1]);
-			execv(_PATH_PR, (char *const *)prargv);
+			execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0);
 			_exit(127);
 		default:
 			/* parent */