From owner-p4-projects@FreeBSD.ORG  Thu Jul 26 19:49:57 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A4B41065673; Thu, 26 Jul 2012 19:49:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5CD601065670
	for <perforce@freebsd.org>; Thu, 26 Jul 2012 19:49:57 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 467378FC0C
	for <perforce@freebsd.org>; Thu, 26 Jul 2012 19:49:57 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QJnvvV034729
	for <perforce@freebsd.org>; Thu, 26 Jul 2012 19:49:57 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q6QJnu81034726
	for perforce@freebsd.org; Thu, 26 Jul 2012 19:49:56 GMT
	(envelope-from brooks@freebsd.org)
Date: Thu, 26 Jul 2012 19:49:56 GMT
Message-Id: <201207261949.q6QJnu81034726@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 214965 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: Thu, 26 Jul 2012 19:49:57 -0000

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

Change 214965 by brooks@brooks_ecr_current on 2012/07/26 19:49:22

	Access the correct commandline argument rather than a
	non-existant one when opening a tty.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#13 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#13 (text+ko) ====

@@ -752,10 +752,10 @@
     errx(1, "usage: pictview [-s <slide dir>] [tty]");
   if (argc == 1) {
     kbdfd = -1;
-    if (argv[1][0] != '/')
-      asprintf(&devpath, "/dev/%s", argv[1]);
+    if (argv[0][0] != '/')
+      asprintf(&devpath, "/dev/%s", argv[0]);
     else
-      devpath = argv[1];
+      devpath = argv[0];
     if ((tty = open(devpath, O_RDWR)) < 0) {
       syslog(LOG_ALERT, "open failed with %s", strerror(errno));
       err(1, "open(%s)", devpath);