From owner-p4-projects@FreeBSD.ORG  Fri Jul 23 20:54:45 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ECACE1065677; Fri, 23 Jul 2010 20:54:44 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B18961065673
	for <perforce@FreeBSD.org>; Fri, 23 Jul 2010 20:54:44 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F0188FC0C
	for <perforce@FreeBSD.org>; Fri, 23 Jul 2010 20:54:44 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6NKsibf024552
	for <perforce@FreeBSD.org>; Fri, 23 Jul 2010 20:54:44 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6NKsiY3024550
	for perforce@freebsd.org; Fri, 23 Jul 2010 20:54:44 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Fri, 23 Jul 2010 20:54:44 GMT
Message-Id: <201007232054.o6NKsiY3024550@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye <jlaffaye@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181393 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jul 2010 20:54:45 -0000

http://p4web.freebsd.org/@@181393?ac=10

Change 181393 by jlaffaye@jlaffaye-chulak on 2010/07/23 20:53:46

	Read from stdin if filename is '-'.

Affected files ...

.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#5 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#5 (text+ko) ====

@@ -64,6 +64,7 @@
 	struct archive *a = NULL;
 	struct archive_entry *entry;
 	const char *pathname;
+	int fd = 0;
 	int retcode = 0;
 
 	a = archive_read_new();
@@ -80,7 +81,16 @@
 	    /* TODO: add support */
 	    return (1);
 	} else {
-	    if (archive_read_open_filename(a, fname, 10240) != ARCHIVE_OK) {
+	    if (strcmp(fname, "-") == 0)
+		fd = fileno(stdin);
+	    else {
+		if ((fd = open(fname, O_RDONLY)) == -1) {
+		    warn("open(%s)", fname);
+		    return (1);
+		}
+	    }
+
+	    if (archive_read_open_fd(a, fd, 10240) != ARCHIVE_OK) {
 		warnx("Can not open '%s' archive: %s", fname,
 		      archive_error_string(a));
 		retcode = 1;