From 50568f27d680f3a286fdcfaebb5e4f361c4c7e8b Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Wed, 10 Mar 2010 02:16:04 +0000 Subject: Create the altix project branch. The altix project will add support for the SGI Altix 350 to FreeBSD/ia64. The hardware used for porting is a two-module system, consisting of a base compute module and a CPU expansion module. SGI's NUMAFlex architecture can be an excellent platform to test CPU affinity and NUMA-aware features in FreeBSD. --- libc/gen/pw_scan.c | 212 ------------------------------------------------- libc/gen/pw_scan.h | 36 --------- libc/stdlib/strtonum.c | 68 ---------------- 3 files changed, 316 deletions(-) delete mode 100644 libc/gen/pw_scan.c delete mode 100644 libc/gen/pw_scan.h delete mode 100644 libc/stdlib/strtonum.c (limited to 'libc') diff --git a/libc/gen/pw_scan.c b/libc/gen/pw_scan.c deleted file mode 100644 index 24e8225..0000000 --- a/libc/gen/pw_scan.c +++ /dev/null @@ -1,212 +0,0 @@ -/*- - * Copyright (c) 1990, 1993, 1994 - * The Regents of the University of California. 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. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)pw_scan.c 8.3 (Berkeley) 4/2/94"; -#endif /* LIBC_SCCS and not lint */ -#include -__FBSDID("$FreeBSD$"); - -/* - * This module is used to "verify" password entries by chpass(1) and - * pwd_mkdb(8). - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "pw_scan.h" - -/* - * Some software assumes that IDs are short. We should emit warnings - * for id's which cannot be stored in a short, but we are more liberal - * by default, warning for IDs greater than USHRT_MAX. - * - * If pw_big_ids_warning is -1 on entry to pw_scan(), it will be set based - * on the existence of PW_SCAN_BIG_IDS in the environment. - * - * It is believed all baseline system software that can not handle the - * normal ID sizes is now gone so pw_big_ids_warning is disabled for now. - * But the code has been left in place in case end-users want to re-enable - * it and/or for the next time the ID sizes get bigger but pieces of the - * system lag behind. - */ -static int pw_big_ids_warning = 0; - -int -__pw_scan(char *bp, struct passwd *pw, int flags) -{ - uid_t id; - int root; - char *ep, *p, *sh; - unsigned long temp; - - if (pw_big_ids_warning == -1) - pw_big_ids_warning = getenv("PW_SCAN_BIG_IDS") == NULL ? 1 : 0; - - pw->pw_fields = 0; - if (!(pw->pw_name = strsep(&bp, ":"))) /* login */ - goto fmt; - root = !strcmp(pw->pw_name, "root"); - if (pw->pw_name[0] && (pw->pw_name[0] != '+' || pw->pw_name[1] == '\0')) - pw->pw_fields |= _PWF_NAME; - - if (!(pw->pw_passwd = strsep(&bp, ":"))) /* passwd */ - goto fmt; - if (pw->pw_passwd[0]) - pw->pw_fields |= _PWF_PASSWD; - - if (!(p = strsep(&bp, ":"))) /* uid */ - goto fmt; - if (p[0]) - pw->pw_fields |= _PWF_UID; - else { - if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') { - if (flags & _PWSCAN_WARN) - warnx("no uid for user %s", pw->pw_name); - return (0); - } - } - errno = 0; - temp = strtoul(p, &ep, 10); - if ((temp == ULONG_MAX && errno == ERANGE) || temp > UID_MAX) { - if (flags & _PWSCAN_WARN) - warnx("%s > max uid value (%u)", p, UID_MAX); - return (0); - } - id = temp; - if (*ep != '\0') { - if (flags & _PWSCAN_WARN) - warnx("%s uid is incorrect", p); - return (0); - } - if (root && id) { - if (flags & _PWSCAN_WARN) - warnx("root uid should be 0"); - return (0); - } - if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) { - warnx("%s > recommended max uid value (%u)", p, USHRT_MAX); - /*return (0);*/ /* THIS SHOULD NOT BE FATAL! */ - } - pw->pw_uid = id; - - if (!(p = strsep(&bp, ":"))) /* gid */ - goto fmt; - if (p[0]) - pw->pw_fields |= _PWF_GID; - else { - if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') { - if (flags & _PWSCAN_WARN) - warnx("no gid for user %s", pw->pw_name); - return (0); - } - } - errno = 0; - temp = strtoul(p, &ep, 10); - if ((temp == ULONG_MAX && errno == ERANGE) || temp > GID_MAX) { - if (flags & _PWSCAN_WARN) - warnx("%s > max gid value (%u)", p, GID_MAX); - return (0); - } - id = temp; - if (*ep != '\0') { - if (flags & _PWSCAN_WARN) - warnx("%s gid is incorrect", p); - return (0); - } - if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) { - warnx("%s > recommended max gid value (%u)", p, USHRT_MAX); - /* return (0); This should not be fatal! */ - } - pw->pw_gid = id; - - if (flags & _PWSCAN_MASTER ) { - if (!(pw->pw_class = strsep(&bp, ":"))) /* class */ - goto fmt; - if (pw->pw_class[0]) - pw->pw_fields |= _PWF_CLASS; - - if (!(p = strsep(&bp, ":"))) /* change */ - goto fmt; - if (p[0]) - pw->pw_fields |= _PWF_CHANGE; - pw->pw_change = atol(p); - - if (!(p = strsep(&bp, ":"))) /* expire */ - goto fmt; - if (p[0]) - pw->pw_fields |= _PWF_EXPIRE; - pw->pw_expire = atol(p); - } - if (!(pw->pw_gecos = strsep(&bp, ":"))) /* gecos */ - goto fmt; - if (pw->pw_gecos[0]) - pw->pw_fields |= _PWF_GECOS; - - if (!(pw->pw_dir = strsep(&bp, ":"))) /* directory */ - goto fmt; - if (pw->pw_dir[0]) - pw->pw_fields |= _PWF_DIR; - - if (!(pw->pw_shell = strsep(&bp, ":"))) /* shell */ - goto fmt; - - p = pw->pw_shell; - if (root && *p) { /* empty == /bin/sh */ - for (setusershell();;) { - if (!(sh = getusershell())) { - if (flags & _PWSCAN_WARN) - warnx("warning, unknown root shell"); - break; - } - if (!strcmp(p, sh)) - break; - } - endusershell(); - } - if (p[0]) - pw->pw_fields |= _PWF_SHELL; - - if ((p = strsep(&bp, ":"))) { /* too many */ -fmt: - if (flags & _PWSCAN_WARN) - warnx("corrupted entry"); - return (0); - } - return (1); -} diff --git a/libc/gen/pw_scan.h b/libc/gen/pw_scan.h deleted file mode 100644 index 468096c..0000000 --- a/libc/gen/pw_scan.h +++ /dev/null @@ -1,36 +0,0 @@ -/*- - * Copyright (c) 1994 - * The Regents of the University of California. 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. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - * - * @(#)pw_scan.h 8.1 (Berkeley) 4/1/94 - * $FreeBSD$ - */ - -#define _PWSCAN_MASTER 0x01 -#define _PWSCAN_WARN 0x02 - -extern int __pw_scan(char *, struct passwd *, int); diff --git a/libc/stdlib/strtonum.c b/libc/stdlib/strtonum.c deleted file mode 100644 index 6dccd97..0000000 --- a/libc/stdlib/strtonum.c +++ /dev/null @@ -1,68 +0,0 @@ -/*- - * Copyright (c) 2004 Ted Unangst and Todd Miller - * All rights reserved. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $ - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include - -#define INVALID 1 -#define TOOSMALL 2 -#define TOOLARGE 3 - -long long -strtonum(const char *numstr, long long minval, long long maxval, - const char **errstrp) -{ - long long ll = 0; - char *ep; - int error = 0; - struct errval { - const char *errstr; - int err; - } ev[4] = { - { NULL, 0 }, - { "invalid", EINVAL }, - { "too small", ERANGE }, - { "too large", ERANGE }, - }; - - ev[0].err = errno; - errno = 0; - if (minval > maxval) - error = INVALID; - else { - ll = strtoll(numstr, &ep, 10); - if (errno == EINVAL || numstr == ep || *ep != '\0') - error = INVALID; - else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) - error = TOOSMALL; - else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval) - error = TOOLARGE; - } - if (errstrp != NULL) - *errstrp = ev[error].errstr; - errno = ev[error].err; - if (error) - ll = 0; - - return (ll); -} -- cgit v1.2.3-56-ge451