- add dehumanize_number
- decls for humanize_number and dehumanize_number are in stdlib.h
This commit is contained in:
christos
parent
b31749e77b
commit
6d28b23da6
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.inc,v 1.158 2007/02/22 22:08:20 drochner Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.159 2007/12/14 17:26:19 christos Exp $
|
||||
# from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
|
||||
|
||||
# gen sources
|
||||
@ -6,9 +6,9 @@
|
||||
|
||||
SRCS+= _errno.c alarm.c alphasort.c arc4random.c assert.c basename.c clock.c \
|
||||
closedir.c closefrom.c confstr.c ctermid.c ctype_.c daemon.c \
|
||||
devname.c dirname.c disklabel.c err.c errx.c errlist.c \
|
||||
errno.c execl.c execle.c execlp.c execv.c execvp.c extattr.c \
|
||||
fmtcheck.c fmtmsg.c fnmatch.c fstab.c ftok.c \
|
||||
dehumanize_number.c devname.c dirname.c disklabel.c err.c errx.c \
|
||||
errlist.c errno.c execl.c execle.c execlp.c execv.c execvp.c \
|
||||
extattr.c fmtcheck.c fmtmsg.c fnmatch.c fstab.c ftok.c \
|
||||
fts.c ftw.c getbsize.c getcap.c getcwd.c \
|
||||
getdevmajor.c getdomainname.c getgrent.c \
|
||||
getgrouplist.c getgroupmembership.c gethostname.c \
|
||||
@ -122,6 +122,7 @@ MLINKS+=getttyent.3 endttyent.3 getttyent.3 getttynam.3 \
|
||||
getttyent.3 setttyent.3 getttyent.3 setttyentpath.3
|
||||
MLINKS+=getusershell.3 endusershell.3 getusershell.3 setusershell.3
|
||||
MLINKS+=glob.3 globfree.3
|
||||
MLINKS+=humanize_number.3 dehumanize_number.3
|
||||
MLINKS+=makecontext.3 swapcontext.3
|
||||
MLINKS+=popen.3 pclose.3
|
||||
MLINKS+=psignal.3 sys_siglist.3 psignal.3 sys_signame.3
|
||||
|
||||
122
lib/libc/gen/dehumanize_number.c
Normal file
122
lib/libc/gen/dehumanize_number.c
Normal file
@ -0,0 +1,122 @@
|
||||
/* $NetBSD: dehumanize_number.c,v 1.1 2007/12/14 17:26:19 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Julio M. Merino Vidal, developed as part of Google's Summer of Code
|
||||
* 2005 program.
|
||||
*
|
||||
* 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.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 THE FOUNDATION 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 <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: dehumanize_number.c,v 1.1 2007/12/14 17:26:19 christos Exp $");
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include "namespace.h"
|
||||
#include <inttypes.h>
|
||||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
|
||||
/*
|
||||
* Converts the number given in 'str', which may be given in a humanized
|
||||
* form (as described in humanize_number(3), but with some limitations),
|
||||
* to a file size (off_t) without units.
|
||||
* In case of success, 0 is returned and *size holds the value.
|
||||
* Otherwise, -1 is returned and *size is untouched.
|
||||
*
|
||||
* TODO: Internationalization, SI units.
|
||||
*/
|
||||
int
|
||||
dehumanize_number(const char *str, int64_t *size)
|
||||
{
|
||||
char *ep, unit;
|
||||
const char *delimit;
|
||||
long multiplier;
|
||||
long long tmp, tmp2;
|
||||
size_t len;
|
||||
|
||||
len = strlen(str);
|
||||
if (len == 0) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
multiplier = 1;
|
||||
|
||||
unit = str[len - 1];
|
||||
if (isalpha((unsigned char)unit)) {
|
||||
switch (tolower((unsigned char)unit)) {
|
||||
case 'b':
|
||||
multiplier = 1;
|
||||
break;
|
||||
|
||||
case 'k':
|
||||
multiplier = 1024;
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
multiplier = 1024 * 1024;
|
||||
break;
|
||||
|
||||
case 'g':
|
||||
multiplier = 1024 * 1024 * 1024;
|
||||
break;
|
||||
|
||||
default:
|
||||
errno = EINVAL;
|
||||
return -1; /* Invalid suffix. */
|
||||
}
|
||||
|
||||
delimit = &str[len - 1];
|
||||
} else
|
||||
delimit = NULL;
|
||||
|
||||
errno = 0;
|
||||
tmp = strtoll(str, &ep, 10);
|
||||
if (str[0] == '\0' || (ep != delimit && *ep != '\0'))
|
||||
return -1; /* Not a number. */
|
||||
else if (errno == ERANGE && (tmp == LLONG_MAX || tmp == LLONG_MIN))
|
||||
return -1; /* Out of range. */
|
||||
|
||||
tmp2 = tmp * multiplier;
|
||||
tmp2 = tmp2 / multiplier;
|
||||
if (tmp != tmp2) {
|
||||
errno = ERANGE;
|
||||
return -1; /* Out of range. */
|
||||
}
|
||||
*size = tmp * multiplier;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: humanize_number.c,v 1.12 2007/03/13 02:52:10 enami Exp $ */
|
||||
/* $NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
|
||||
@ -39,7 +39,7 @@
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: humanize_number.c,v 1.12 2007/03/13 02:52:10 enami Exp $");
|
||||
__RCSID("$NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $");
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include "namespace.h"
|
||||
@ -49,7 +49,6 @@ __RCSID("$NetBSD: humanize_number.c,v 1.12 2007/03/13 02:52:10 enami Exp $");
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <locale.h>
|
||||
#include <util.h>
|
||||
|
||||
int
|
||||
humanize_number(char *buf, size_t len, int64_t bytes,
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: shlib_version,v 1.191 2007/11/27 21:06:41 ad Exp $
|
||||
# $NetBSD: shlib_version,v 1.192 2007/12/14 17:26:19 christos Exp $
|
||||
# Remember to update distrib/sets/lists/base/shl.* when changing
|
||||
#
|
||||
# things we wish to do on next major version bump:
|
||||
@ -17,4 +17,4 @@
|
||||
# - libc/net/getnet{ent,namadr}.c, netdb.h: remove __n_pad0
|
||||
#
|
||||
major=12
|
||||
minor=156
|
||||
minor=157
|
||||
|
||||
Loading…
Reference in New Issue
Block a user