From owner-svn-src-head@freebsd.org Wed Jul 29 06:23:07 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAABB9AEB24; Wed, 29 Jul 2015 06:23:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFB47185E; Wed, 29 Jul 2015 06:23:07 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6T6N76W073985; Wed, 29 Jul 2015 06:23:07 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6T6N7lq073984; Wed, 29 Jul 2015 06:23:07 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201507290623.t6T6N7lq073984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 29 Jul 2015 06:23:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r285997 - head/usr.sbin/pw X-SVN-Group: head 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.20 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: Wed, 29 Jul 2015 06:23:08 -0000 Author: bapt Date: Wed Jul 29 06:23:06 2015 New Revision: 285997 URL: https://svnweb.freebsd.org/changeset/base/285997 Log: Actually add the new code Added: head/usr.sbin/pw/strtounum.c (contents, props changed) Added: head/usr.sbin/pw/strtounum.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/pw/strtounum.c Wed Jul 29 06:23:06 2015 (r285997) @@ -0,0 +1,73 @@ +/*- + * Copyright (C) Baptiste Daroussin + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL DAVID L. NUGENT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#include "pw.h" + +#define INVALID "invalid" +#define TOOSMALL "too small" +#define TOOLARGE "too large" + +uintmax_t +strtounum(const char *numstr, uintmax_t minval, uintmax_t maxval, + const char **errstrp) +{ + uintmax_t ret = 0; + char *ep; + + if (minval > maxval) { + errno = EINVAL; + if (errstrp != NULL) + *errstrp = INVALID; + return (0); + } + + ret = strtoumax(numstr, &ep, 10); + if (errno == EINVAL || numstr == ep || *ep != '\0') { + errno = EINVAL; + if (errstrp != NULL) + *errstrp = INVALID; + return (0); + } else if ((ret == 0 && errno == ERANGE) || ret < minval) { + errno = ERANGE; + if (errstrp != NULL) + *errstrp = TOOSMALL; + return (0); + } else if ((ret == UINTMAX_MAX && errno == ERANGE) || ret > maxval) { + errno = ERANGE; + if (errstrp != NULL) + *errstrp = TOOLARGE; + return (0); + } + + return (ret); +}