From owner-svn-src-user@freebsd.org Sun Apr 1 07:49:49 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0395F6BED7 for ; Sun, 1 Apr 2018 07:49:49 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 62B7E7BA99; Sun, 1 Apr 2018 07:49:49 +0000 (UTC) (envelope-from pho@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 5C51A23EBA; Sun, 1 Apr 2018 07:49:49 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w317nnSB056233; Sun, 1 Apr 2018 07:49:49 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w317nn1j056232; Sun, 1 Apr 2018 07:49:49 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201804010749.w317nn1j056232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 1 Apr 2018 07:49:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r331865 - user/pho/stress2/lib X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/lib X-SVN-Commit-Revision: 331865 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Apr 2018 07:49:49 -0000 Author: pho Date: Sun Apr 1 07:49:48 2018 New Revision: 331865 URL: https://svnweb.freebsd.org/changeset/base/331865 Log: Fix wrong format in sscanf(). Truncate long program names for column alignment. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/lib/options.c Modified: user/pho/stress2/lib/options.c ============================================================================== --- user/pho/stress2/lib/options.c Sun Apr 1 07:45:52 2018 (r331864) +++ user/pho/stress2/lib/options.c Sun Apr 1 07:49:48 2018 (r331865) @@ -131,11 +131,11 @@ environment(void) usage("VERBOSE"); } if ((cp = gete("KBLOCKS")) != NULL) { - if (sscanf(cp, "%d", &op->kblocks) != 1) + if (sscanf(cp, "%jd", &op->kblocks) != 1) usage("KBLOCKS"); } if ((cp = gete("INODES")) != NULL) { - if (sscanf(cp, "%d", &op->inodes) != 1) + if (sscanf(cp, "%jd", &op->inodes) != 1) usage("INODES"); } } @@ -208,17 +208,20 @@ options(int argc, char **argv) void show_status(void) { - char buf[80]; + char buf[80], pgname[9]; int days; time_t t; if (op->verbose > 0) { + strncpy(pgname, getprogname(), sizeof(pgname)); + pgname[8] = 0; t = op->run_time; days = t / (60 * 60 * 24); t = t % (60 * 60 * 24); strftime(buf, sizeof(buf), "%T", gmtime(&t)); - printf("%8s: run time %2d+%s, incarnations %3d, load %3d, verbose %d\n", - getprogname(), days, buf, op->incarnations, op->load, + printf("%8s: run time %2d+%s, incarnations %3d, load %3d, " + "verbose %d\n", + pgname, days, buf, op->incarnations, op->load, op->verbose); fflush(stdout); } @@ -227,7 +230,8 @@ show_status(void) void rmval(void) { - if (snprintf(path, sizeof(path), "%s/%s.conf", op->cd, getprogname()) < 0) + if (snprintf(path, sizeof(path), "%s/%s.conf", op->cd, + getprogname()) < 0) err(1, "snprintf path"); (void) unlink(path); } @@ -257,7 +261,8 @@ getval(void) break; } if (n < 0) - err(1, "readlink(%s). %s:%d", path, __FILE__, __LINE__); + err(1, "readlink(%s). %s:%d", path, __FILE__, + __LINE__); } buf[n] = '\0'; if (sscanf(buf, "%ld", &val) != 1)