From owner-svn-src-head@freebsd.org Tue Sep 1 18:50:27 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7ED123D341C; Tue, 1 Sep 2020 18:50:27 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bgx372mDfz42Bm; Tue, 1 Sep 2020 18:50:27 +0000 (UTC) (envelope-from chs@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41E711DF52; Tue, 1 Sep 2020 18:50:27 +0000 (UTC) (envelope-from chs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081IoR96024008; Tue, 1 Sep 2020 18:50:27 GMT (envelope-from chs@FreeBSD.org) Received: (from chs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081IoQqj024006; Tue, 1 Sep 2020 18:50:26 GMT (envelope-from chs@FreeBSD.org) Message-Id: <202009011850.081IoQqj024006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: chs set sender to chs@FreeBSD.org using -f From: Chuck Silvers Date: Tue, 1 Sep 2020 18:50:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365056 - head/sbin/fsck_ffs X-SVN-Group: head X-SVN-Commit-Author: chs X-SVN-Commit-Paths: head/sbin/fsck_ffs X-SVN-Commit-Revision: 365056 X-SVN-Commit-Repository: base 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.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 18:50:27 -0000 Author: chs Date: Tue Sep 1 18:50:26 2020 New Revision: 365056 URL: https://svnweb.freebsd.org/changeset/base/365056 Log: Move all of the error prints in readsb() from stderr to stdout. The only output from fsck that should go to stderr is the usage message. if setup() fails then exit with EEXIT rather than 0. Reviewed by: mckusick Sponsored by: Netflix Modified: head/sbin/fsck_ffs/main.c head/sbin/fsck_ffs/setup.c Modified: head/sbin/fsck_ffs/main.c ============================================================================== --- head/sbin/fsck_ffs/main.c Tue Sep 1 16:20:42 2020 (r365055) +++ head/sbin/fsck_ffs/main.c Tue Sep 1 18:50:26 2020 (r365056) @@ -408,7 +408,7 @@ checkfilesys(char *filesys) case 0: if (preen) pfatal("CAN'T CHECK FILE SYSTEM."); - return (0); + return (EEXIT); case -1: clean: pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree + Modified: head/sbin/fsck_ffs/setup.c ============================================================================== --- head/sbin/fsck_ffs/setup.c Tue Sep 1 16:20:42 2020 (r365055) +++ head/sbin/fsck_ffs/setup.c Tue Sep 1 18:50:26 2020 (r365056) @@ -339,15 +339,15 @@ readsb(int listerr) return (0); case ENOENT: if (bflag) - fprintf(stderr, "%jd is not a file system " + printf("%jd is not a file system " "superblock\n", super / dev_bsize); else - fprintf(stderr, "Cannot find file system " + printf("Cannot find file system " "superblock\n"); return (0); case EIO: default: - fprintf(stderr, "I/O error reading %jd\n", + printf("I/O error reading %jd\n", super / dev_bsize); return (0); }