From owner-svn-src-head@freebsd.org  Mon May  8 08:34:51 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 B5BC1D621DE;
 Mon,  8 May 2017 08:34:51 +0000 (UTC)
 (envelope-from trasz@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 7C6DB3F1;
 Mon,  8 May 2017 08:34:51 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v488YoqI026409;
 Mon, 8 May 2017 08:34:50 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v488YonF026408;
 Mon, 8 May 2017 08:34:50 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201705080834.v488YonF026408@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 8 May 2017 08:34:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317933 - head/usr.bin/resizewin
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 May 2017 08:34:52 -0000

Author: trasz
Date: Mon May  8 08:34:50 2017
New Revision: 317933
URL: https://svnweb.freebsd.org/changeset/base/317933

Log:
  Use tcflush(3) instead of (nonstandard) TIOCFLUSH.
  
  Reported by:	kib
  MFC after:	2 weeks
  Sponsored by:	DARPA, AFRL

Modified:
  head/usr.bin/resizewin/resizewin.c

Modified: head/usr.bin/resizewin/resizewin.c
==============================================================================
--- head/usr.bin/resizewin/resizewin.c	Mon May  8 01:29:40 2017	(r317932)
+++ head/usr.bin/resizewin/resizewin.c	Mon May  8 08:34:50 2017	(r317933)
@@ -52,7 +52,7 @@ main(__unused int argc, __unused char **
 {
 	struct termios old, new;
 	struct winsize w;
-	int ret, fd, cnt, error, what;
+	int ret, fd, cnt, error;
 	char data[20];
 	struct timeval then, now;
 
@@ -72,10 +72,9 @@ main(__unused int argc, __unused char **
 		exit(1);
 
 	/* Discard input received so far */
-	what = FREAD | FWRITE;
-	error = ioctl(fd, TIOCFLUSH, &what);
+	error = tcflush(fd, TCIOFLUSH);
 	if (error != 0)
-		warn("ioctl");
+		warn("tcflush");
 
 	if (write(fd, query, sizeof(query)) != sizeof(query)) {
 		error = 1;