From owner-svn-src-stable-8@FreeBSD.ORG Mon Nov 12 14:14:01 2012 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BA450C03; Mon, 12 Nov 2012 14:14:01 +0000 (UTC) (envelope-from bapt@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 9E8F58FC08; Mon, 12 Nov 2012 14:14:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACEE1QY030887; Mon, 12 Nov 2012 14:14:01 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACEE1Pf030886; Mon, 12 Nov 2012 14:14:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201211121414.qACEE1Pf030886@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 12 Nov 2012 14:14:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r242917 - stable/8/usr.sbin/pw X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Nov 2012 14:14:01 -0000 Author: bapt Date: Mon Nov 12 14:14:01 2012 New Revision: 242917 URL: http://svnweb.freebsd.org/changeset/base/242917 Log: Remove useless atoi(3), previous strspn(3) makes sure that a_name->val is a number. This also allow pw user show to work as expected. PR: bin/172112 Submitted by: Ilya A. Arkhipov Modified: stable/8/usr.sbin/pw/pw_user.c Directory Properties: stable/8/usr.sbin/pw/ (props changed) Modified: stable/8/usr.sbin/pw/pw_user.c ============================================================================== --- stable/8/usr.sbin/pw/pw_user.c Mon Nov 12 14:13:49 2012 (r242916) +++ stable/8/usr.sbin/pw/pw_user.c Mon Nov 12 14:14:01 2012 (r242917) @@ -322,7 +322,7 @@ pw_user(struct userconf * cnf, int mode, */ if (mode != M_ADD && pwd == NULL && strspn(a_name->val, "0123456789") == strlen(a_name->val) - && atoi(a_name->val) > 0) { /* Assume uid */ + && *a_name->val) { (a_uid = a_name)->ch = 'u'; a_name = NULL; }