From owner-svn-src-stable-8@FreeBSD.ORG Tue May 10 05:30:10 2011 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF5E81065672; Tue, 10 May 2011 05:30:10 +0000 (UTC) (envelope-from ru@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 336D18FC08; Tue, 10 May 2011 05:30:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4A5U7FQ028422; Tue, 10 May 2011 05:30:07 GMT (envelope-from ru@svn.freebsd.org) Received: (from ru@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4A5U7Vq028420; Tue, 10 May 2011 05:30:07 GMT (envelope-from ru@svn.freebsd.org) Message-Id: <201105100530.p4A5U7Vq028420@svn.freebsd.org> From: Ruslan Ermilov Date: Tue, 10 May 2011 05:30:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221723 - stable/8/bin/stty X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2011 05:30:10 -0000 Author: ru Date: Tue May 10 05:30:06 2011 New Revision: 221723 URL: http://svn.freebsd.org/changeset/base/221723 Log: MFC r221372: Don't call -f option's argument "stdin". Modified: stable/8/bin/stty/stty.c Directory Properties: stable/8/bin/stty/ (props changed) Modified: stable/8/bin/stty/stty.c ============================================================================== --- stable/8/bin/stty/stty.c Tue May 10 04:32:27 2011 (r221722) +++ stable/8/bin/stty/stty.c Tue May 10 05:30:06 2011 (r221723) @@ -61,9 +61,11 @@ main(int argc, char *argv[]) struct info i; enum FMT fmt; int ch; + const char *file; fmt = NOTSET; i.fd = STDIN_FILENO; + file = "stdin"; opterr = 0; while (optind < argc && @@ -79,6 +81,7 @@ main(int argc, char *argv[]) case 'f': if ((i.fd = open(optarg, O_RDONLY | O_NONBLOCK)) < 0) err(1, "%s", optarg); + file = optarg; break; case 'g': fmt = GFLAG; @@ -92,7 +95,7 @@ args: argc -= optind; argv += optind; if (tcgetattr(i.fd, &i.t) < 0) - errx(1, "stdin isn't a terminal"); + errx(1, "%s isn't a terminal", file); if (ioctl(i.fd, TIOCGETD, &i.ldisc) < 0) err(1, "TIOCGETD"); if (ioctl(i.fd, TIOCGWINSZ, &i.win) < 0)