From owner-svn-src-all@FreeBSD.ORG Sun Feb 3 01:22:29 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D3C878DE; Sun, 3 Feb 2013 01:22:29 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AC8C4E19; Sun, 3 Feb 2013 01:22:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r131MTws075465; Sun, 3 Feb 2013 01:22:29 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r131MTIh075462; Sun, 3 Feb 2013 01:22:29 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201302030122.r131MTIh075462@svn.freebsd.org> From: Eitan Adler Date: Sun, 3 Feb 2013 01:22:29 +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: r246277 - in stable/9: tools/regression/usr.bin/printf usr.bin/printf 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.14 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: Sun, 03 Feb 2013 01:22:29 -0000 Author: eadler Date: Sun Feb 3 01:22:28 2013 New Revision: 246277 URL: http://svnweb.freebsd.org/changeset/base/246277 Log: MFC r244407,r244409: POSIX requires that non-existent or null arguments be treated as if a zero argument were supplied. Add regression tests to catch this case as well. PR: bin/174521 Approved by: cperciva (mentor, implicit) Added: stable/9/tools/regression/usr.bin/printf/regress.zero.out - copied unchanged from r244407, head/tools/regression/usr.bin/printf/regress.zero.out Modified: stable/9/tools/regression/usr.bin/printf/regress.sh stable/9/usr.bin/printf/printf.c Directory Properties: stable/9/tools/regression/ (props changed) stable/9/usr.bin/printf/ (props changed) Modified: stable/9/tools/regression/usr.bin/printf/regress.sh ============================================================================== --- stable/9/tools/regression/usr.bin/printf/regress.sh Sun Feb 3 01:08:01 2013 (r246276) +++ stable/9/tools/regression/usr.bin/printf/regress.sh Sun Feb 3 01:22:28 2013 (r246277) @@ -2,7 +2,7 @@ REGRESSION_START($1) -echo '1..11' +echo '1..12' REGRESSION_TEST(`b', `printf "abc%b%b" "def\n" "\cghi"') REGRESSION_TEST(`d', `printf "%d,%5d,%.5d,%0*d,%.*d\n" 123 123 123 5 123 5 123') @@ -15,5 +15,9 @@ REGRESSION_TEST(`m3', `printf "%%%s\n" a REGRESSION_TEST(`m4', `printf "%d,%f,%c,%s\n"') REGRESSION_TEST(`m5', `printf -- "-d\n"') REGRESSION_TEST(`s', `printf "%.3s,%-5s\n" abcd abc') +REGRESSION_TEST('zero', `printf "%u%u\n" 15') +REGRESSION_TEST('zero', `printf "%d%d\n" 15') +REGRESSION_TEST('zero', `printf "%d%u\n" 15') +REGRESSION_TEST('zero', `printf "%u%d\n" 15') REGRESSION_END() Copied: stable/9/tools/regression/usr.bin/printf/regress.zero.out (from r244407, head/tools/regression/usr.bin/printf/regress.zero.out) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/regression/usr.bin/printf/regress.zero.out Sun Feb 3 01:22:28 2013 (r246277, copy of r244407, head/tools/regression/usr.bin/printf/regress.zero.out) @@ -0,0 +1 @@ +150 Modified: stable/9/usr.bin/printf/printf.c ============================================================================== --- stable/9/usr.bin/printf/printf.c Sun Feb 3 01:08:01 2013 (r246276) +++ stable/9/usr.bin/printf/printf.c Sun Feb 3 01:22:28 2013 (r246277) @@ -467,7 +467,7 @@ getnum(intmax_t *ip, uintmax_t *uip, int int rval; if (!*gargv) { - *ip = 0; + *ip = *uip = 0; return (0); } if (**gargv == '"' || **gargv == '\'') {