From owner-svn-src-all@FreeBSD.ORG Wed Apr 2 17:10:18 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1B6BA38; Wed, 2 Apr 2014 17:10:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 A4383C46; Wed, 2 Apr 2014 17:10:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s32HAI7Z076593; Wed, 2 Apr 2014 17:10:18 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s32HAH2l076588; Wed, 2 Apr 2014 17:10:17 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201404021710.s32HAH2l076588@svn.freebsd.org> From: Jaakko Heinonen Date: Wed, 2 Apr 2014 17:10:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r264047 - stable/9/usr.bin/tail X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Apr 2014 17:10:18 -0000 Author: jh Date: Wed Apr 2 17:10:17 2014 New Revision: 264047 URL: http://svnweb.freebsd.org/changeset/base/264047 Log: MFC r251565: Print file names without stdio buffering to avoid mixing buffered and unbuffered ouput. PR: bin/176886 Modified: stable/9/usr.bin/tail/extern.h stable/9/usr.bin/tail/forward.c stable/9/usr.bin/tail/misc.c stable/9/usr.bin/tail/tail.c Directory Properties: stable/9/usr.bin/tail/ (props changed) Modified: stable/9/usr.bin/tail/extern.h ============================================================================== --- stable/9/usr.bin/tail/extern.h Wed Apr 2 16:53:07 2014 (r264046) +++ stable/9/usr.bin/tail/extern.h Wed Apr 2 17:10:17 2014 (r264047) @@ -67,5 +67,6 @@ void ierr(const char *); void oerr(void); int mapprint(struct mapinfo *, off_t, off_t); int maparound(struct mapinfo *, off_t); +void printfn(const char *, int); extern int Fflag, fflag, qflag, rflag, rval, no_files; Modified: stable/9/usr.bin/tail/forward.c ============================================================================== --- stable/9/usr.bin/tail/forward.c Wed Apr 2 16:53:07 2014 (r264046) +++ stable/9/usr.bin/tail/forward.c Wed Apr 2 17:10:17 2014 (r264047) @@ -243,7 +243,7 @@ show(file_info_t *file) while ((ch = getc(file->fp)) != EOF) { if (last != file && no_files > 1) { if (!qflag) - (void)printf("\n==> %s <==\n", file->file_name); + printfn(file->file_name, 1); last = file; } if (putchar(ch) == EOF) @@ -320,7 +320,7 @@ follow(file_info_t *files, enum STYLE st active = 1; n++; if (no_files > 1 && !qflag) - (void)printf("\n==> %s <==\n", file->file_name); + printfn(file->file_name, 1); forward(file->fp, file->file_name, style, off, &file->st); if (Fflag && fileno(file->fp) != STDIN_FILENO) n++; Modified: stable/9/usr.bin/tail/misc.c ============================================================================== --- stable/9/usr.bin/tail/misc.c Wed Apr 2 16:53:07 2014 (r264046) +++ stable/9/usr.bin/tail/misc.c Wed Apr 2 17:10:17 2014 (r264047) @@ -113,3 +113,17 @@ maparound(struct mapinfo *mip, off_t off return (0); } + +/* + * Print the file name without stdio buffering. + */ +void +printfn(const char *fn, int print_nl) +{ + + if (print_nl) + WR("\n", 1); + WR("==> ", 4); + WR(fn, strlen(fn)); + WR(" <==\n", 5); +} Modified: stable/9/usr.bin/tail/tail.c ============================================================================== --- stable/9/usr.bin/tail/tail.c Wed Apr 2 16:53:07 2014 (r264046) +++ stable/9/usr.bin/tail/tail.c Wed Apr 2 17:10:17 2014 (r264047) @@ -203,10 +203,8 @@ main(int argc, char *argv[]) continue; } if (argc > 1 && !qflag) { - (void)printf("%s==> %s <==\n", - first ? "" : "\n", fn); + printfn(fn, !first); first = 0; - (void)fflush(stdout); } if (rflag)