diff --git a/ChangeLog b/ChangeLog index cd1e0f6a..66931a5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-25 Nicolas François + + * lib/Makefile.am, lib/get_pid.c, lib/getulong.c: Added get_pid() + and getulong(). + 2009-04-25 Nicolas François * lib/getlong.c: Do not check for NULL string but empty string. diff --git a/lib/Makefile.am b/lib/Makefile.am index e1b34371..024297ef 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,7 +19,9 @@ libshadow_la_SOURCES = \ getdef.h \ get_gid.c \ getlong.c \ + get_pid.c \ get_uid.c \ + getulong.c \ groupio.c \ groupmem.c \ groupio.h \ diff --git a/lib/get_pid.c b/lib/get_pid.c new file mode 100644 index 00000000..0918421d --- /dev/null +++ b/lib/get_pid.c @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2009 , Nicolas François + * All rights reserved. + * + * 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. The name of the copyright holders or contributors may not be used to + * endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * HOLDERS 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 + +#ident "$Id$" + +#include "prototypes.h" +#include "defines.h" + +int get_pid (const char *pidstr, pid_t *pid) +{ + long long int val; + char *endptr; + + errno = 0; + val = strtoll (pidstr, &endptr, 10); + if ( ('\0' == *pidstr) + || ('\0' != *endptr) + || (ERANGE == errno) + || (val != (pid_t)val)) { + return 0; + } + + *pid = (pid_t)val; + return 1; +} + diff --git a/lib/getulong.c b/lib/getulong.c new file mode 100644 index 00000000..3cd3d0a2 --- /dev/null +++ b/lib/getulong.c @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2007 - 2009, Nicolas François + * All rights reserved. + * + * 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. The name of the copyright holders or contributors may not be used to + * endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT + * HOLDERS 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 + +#ident "$Id: getlong.c 2763 2009-04-23 09:57:03Z nekral-guest $" + +#include +#include +#include "prototypes.h" + +/* + * getulong - extract an unsigned long integer provided by the numstr string in *result + * + * It supports decimal, hexadecimal or octal representations. + * + * Returns 0 on failure, 1 on success. + */ +int getulong (const char *numstr, /*@out@*/unsigned long int *result) +{ + long long int val; + char *endptr; + + errno = 0; + val = strtoll (numstr, &endptr, 0); + if ( ('\0' == *numstr) + || ('\0' != *endptr) + || (ERANGE == errno) + || (val != (unsigned long int)val)) { + return 0; + } + + *result = (unsigned long int)val; + return 1; +} +