From owner-svn-src-all@freebsd.org Thu Mar 7 18:24:18 2019 Return-Path: Delivered-To: svn-src-all@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 05716150EFDD; Thu, 7 Mar 2019 18:24:18 +0000 (UTC) (envelope-from cem@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) server-signature RSA-PSS (4096 bits) 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 9629D6C125; Thu, 7 Mar 2019 18:24:17 +0000 (UTC) (envelope-from cem@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 8B7C31F82A; Thu, 7 Mar 2019 18:24:17 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x27IOHZd081150; Thu, 7 Mar 2019 18:24:17 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x27IOHWf081148; Thu, 7 Mar 2019 18:24:17 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201903071824.x27IOHWf081148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Thu, 7 Mar 2019 18:24:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r344891 - in head/usr.bin/seq: . tests X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: in head/usr.bin/seq: . tests X-SVN-Commit-Revision: 344891 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9629D6C125 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Thu, 07 Mar 2019 18:24:18 -0000 Author: cem Date: Thu Mar 7 18:24:16 2019 New Revision: 344891 URL: https://svnweb.freebsd.org/changeset/base/344891 Log: seq(1): Require user-provided format strings to contain a conversion This matches GNU seq, for example. For users that are looking for similar functionality, 'jot -b foo N' will print 'foo' N times. See jot(1). PR: 236347 Reported by: Sponsored by: Dell EMC Isilon Modified: head/usr.bin/seq/seq.c head/usr.bin/seq/tests/seq_test.sh Modified: head/usr.bin/seq/seq.c ============================================================================== --- head/usr.bin/seq/seq.c Thu Mar 7 18:12:34 2019 (r344890) +++ head/usr.bin/seq/seq.c Thu Mar 7 18:24:16 2019 (r344891) @@ -310,7 +310,8 @@ valid_format(const char *fmt) } } - return (conversions <= 1); + /* PR 236347 -- user format strings must have a conversion */ + return (conversions == 1); } /* Modified: head/usr.bin/seq/tests/seq_test.sh ============================================================================== --- head/usr.bin/seq/tests/seq_test.sh Thu Mar 7 18:12:34 2019 (r344890) +++ head/usr.bin/seq/tests/seq_test.sh Thu Mar 7 18:24:16 2019 (r344891) @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Conrad Meyer +# Copyright (c) 2019 Conrad Meyer # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,7 +34,22 @@ float_rounding_body() atf_check -o inline:'1\n1.1\n1.2\n' seq 1 0.1 1.2 } +atf_test_case format_includes_conversion +format_includes_conversion_head() +{ + atf_set "descr" "Check for correct user-provided format strings" +} +format_includes_conversion_body() +{ + # PR 236347 + atf_check -s exit:1 -o empty -e match:"invalid format string" \ + seq -f foo 3 + atf_check -s exit:0 -o inline:'foo1\nfoo2\n' -e empty \ + seq -f foo%g 2 +} + atf_init_test_cases() { atf_add_test_case float_rounding + atf_add_test_case format_includes_conversion }