From e3a18f6f505c56ddc339b87d78ec9e7a182d5178 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Sat, 20 Dec 1997 03:36:35 +0000 Subject: More cleanups... --- src/backend/port/dynloader/sparc_solaris.h | 38 ++++++++ src/backend/port/sco/port-protos.h | 36 ------- src/backend/port/sparc_solaris/port-protos.h | 38 -------- src/backend/port/strtol.c | 140 +++++++++++++++++++++++++++ src/backend/port/sunos4/port-protos.h | 34 ------- src/backend/port/sunos4/strtol.c | 140 --------------------------- 6 files changed, 178 insertions(+), 248 deletions(-) create mode 100644 src/backend/port/dynloader/sparc_solaris.h delete mode 100644 src/backend/port/sco/port-protos.h delete mode 100644 src/backend/port/sparc_solaris/port-protos.h create mode 100644 src/backend/port/strtol.c delete mode 100644 src/backend/port/sunos4/port-protos.h delete mode 100644 src/backend/port/sunos4/strtol.c (limited to 'src') diff --git a/src/backend/port/dynloader/sparc_solaris.h b/src/backend/port/dynloader/sparc_solaris.h new file mode 100644 index 00000000000..3645c939aeb --- /dev/null +++ b/src/backend/port/dynloader/sparc_solaris.h @@ -0,0 +1,38 @@ +/*------------------------------------------------------------------------- + * + * port-protos.h-- + * port-specific prototypes for SunOS 4 + * + * + * Copyright (c) 1994, Regents of the University of California + * + * $Id: sparc_solaris.h,v 1.1 1997/12/20 03:35:55 scrappy Exp $ + * + *------------------------------------------------------------------------- + */ +#ifndef PORT_PROTOS_H +#define PORT_PROTOS_H + +#include /* For struct in_addr */ +#include + +#include + +#include "fmgr.h" /* for func_ptr */ +#include "utils/dynamic_loader.h" + +/* dynloader.c */ +/* + * Dynamic Loader on SunOS 4. + * + * this dynamic loader uses the system dynamic loading interface for shared + * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared + * library as the file to be dynamically loaded. + * + */ +#define pg_dlopen(f) dlopen(f,1) +#define pg_dlsym dlsym +#define pg_dlclose dlclose +#define pg_dlerror dlerror + +#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/sco/port-protos.h b/src/backend/port/sco/port-protos.h deleted file mode 100644 index 9526f7c747d..00000000000 --- a/src/backend/port/sco/port-protos.h +++ /dev/null @@ -1,36 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port-protos.h-- - * port-specific prototypes for SCO 3.2v5.2 - * - * - * Copyright (c) 1994, Regents of the University of California - * - * $Id: port-protos.h,v 1.2 1997/09/07 04:46:41 momjian Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include -#include "fmgr.h" /* for func_ptr */ -#include "utils/dynamic_loader.h" - -/* dynloader.c */ -/* - * Dynamic Loader on SCO 3.2v5.0.2 - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - * - */ -#define pg_dlopen(f) dlopen(f,1) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror - -/* port.c */ - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/sparc_solaris/port-protos.h b/src/backend/port/sparc_solaris/port-protos.h deleted file mode 100644 index 11434e254b5..00000000000 --- a/src/backend/port/sparc_solaris/port-protos.h +++ /dev/null @@ -1,38 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port-protos.h-- - * port-specific prototypes for SunOS 4 - * - * - * Copyright (c) 1994, Regents of the University of California - * - * $Id: port-protos.h,v 1.8 1997/12/19 22:46:15 scrappy Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include /* For struct in_addr */ -#include - -#include - -#include "fmgr.h" /* for func_ptr */ -#include "utils/dynamic_loader.h" - -/* dynloader.c */ -/* - * Dynamic Loader on SunOS 4. - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - * - */ -#define pg_dlopen(f) dlopen(f,1) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/strtol.c b/src/backend/port/strtol.c new file mode 100644 index 00000000000..dcf3e89860d --- /dev/null +++ b/src/backend/port/strtol.c @@ -0,0 +1,140 @@ +/*- + * Copyright (c) 1990 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 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[] = "@(#)strtol.c 5.4 (Berkeley) 2/23/91"; + +#endif /* LIBC_SCCS and not lint */ + +#include +#include +#include +#include + +#define const + +/* + * Convert a string to a long integer. + * + * Ignores `locale' stuff. Assumes that the upper and lower case + * alphabets and digits are each contiguous. + */ +long +strtol(nptr, endptr, base) +const char *nptr; +char **endptr; +register int base; +{ + register const char *s = nptr; + register unsigned long acc; + register int c; + register unsigned long cutoff; + register int neg = 0, + any, + cutlim; + + /* + * Skip white space and pick up leading +/- sign if any. If base is 0, + * allow 0x for hex and 0 for octal, else assume decimal; if base is + * already 16, allow 0x. + */ + do + { + c = *s++; + } while (isspace(c)); + if (c == '-') + { + neg = 1; + c = *s++; + } + else if (c == '+') + c = *s++; + if ((base == 0 || base == 16) && + c == '0' && (*s == 'x' || *s == 'X')) + { + c = s[1]; + s += 2; + base = 16; + } + if (base == 0) + base = c == '0' ? 8 : 10; + + /* + * Compute the cutoff value between legal numbers and illegal numbers. + * That is the largest legal value, divided by the base. An input + * number that is greater than this value, if followed by a legal + * input character, is too big. One that is equal to this value may + * be valid or not; the limit between valid and invalid numbers is + * then based on the last digit. For instance, if the range for longs + * is [-2147483648..2147483647] and the input base is 10, cutoff will + * be set to 214748364 and cutlim to either 7 (neg==0) or 8 (neg==1), + * meaning that if we have accumulated a value > 214748364, or equal + * but the next digit is > 7 (or 8), the number is too big, and we + * will return a range error. + * + * Set any if any `digits' consumed; make it negative to indicate + * overflow. + */ + cutoff = neg ? -(unsigned long) LONG_MIN : LONG_MAX; + cutlim = cutoff % (unsigned long) base; + cutoff /= (unsigned long) base; + for (acc = 0, any = 0;; c = *s++) + { + if (isdigit(c)) + c -= '0'; + else if (isalpha(c)) + c -= isupper(c) ? 'A' - 10 : 'a' - 10; + else + break; + if (c >= base) + break; + if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) + any = -1; + else + { + any = 1; + acc *= base; + acc += c; + } + } + if (any < 0) + { + acc = neg ? LONG_MIN : LONG_MAX; + errno = ERANGE; + } + else if (neg) + acc = -acc; + if (endptr != 0) + *endptr = any ? s - 1 : (char *) nptr; + return (acc); +} diff --git a/src/backend/port/sunos4/port-protos.h b/src/backend/port/sunos4/port-protos.h deleted file mode 100644 index 33ec1e40e93..00000000000 --- a/src/backend/port/sunos4/port-protos.h +++ /dev/null @@ -1,34 +0,0 @@ -/*------------------------------------------------------------------------- - * - * port-protos.h-- - * port-specific prototypes for SunOS 4 - * - * - * Copyright (c) 1994, Regents of the University of California - * - * $Id: port-protos.h,v 1.2 1997/09/07 04:47:00 momjian Exp $ - * - *------------------------------------------------------------------------- - */ -#ifndef PORT_PROTOS_H -#define PORT_PROTOS_H - -#include -#include "fmgr.h" /* for func_ptr */ -#include "utils/dynamic_loader.h" - -/* dynloader.c */ -/* - * Dynamic Loader on SunOS 4. - * - * this dynamic loader uses the system dynamic loading interface for shared - * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared - * library as the file to be dynamically loaded. - * - */ -#define pg_dlopen(f) dlopen(f, 1) -#define pg_dlsym dlsym -#define pg_dlclose dlclose -#define pg_dlerror dlerror - -#endif /* PORT_PROTOS_H */ diff --git a/src/backend/port/sunos4/strtol.c b/src/backend/port/sunos4/strtol.c deleted file mode 100644 index dcf3e89860d..00000000000 --- a/src/backend/port/sunos4/strtol.c +++ /dev/null @@ -1,140 +0,0 @@ -/*- - * Copyright (c) 1990 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 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[] = "@(#)strtol.c 5.4 (Berkeley) 2/23/91"; - -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include - -#define const - -/* - * Convert a string to a long integer. - * - * Ignores `locale' stuff. Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -long -strtol(nptr, endptr, base) -const char *nptr; -char **endptr; -register int base; -{ - register const char *s = nptr; - register unsigned long acc; - register int c; - register unsigned long cutoff; - register int neg = 0, - any, - cutlim; - - /* - * Skip white space and pick up leading +/- sign if any. If base is 0, - * allow 0x for hex and 0 for octal, else assume decimal; if base is - * already 16, allow 0x. - */ - do - { - c = *s++; - } while (isspace(c)); - if (c == '-') - { - neg = 1; - c = *s++; - } - else if (c == '+') - c = *s++; - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) - { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - - /* - * Compute the cutoff value between legal numbers and illegal numbers. - * That is the largest legal value, divided by the base. An input - * number that is greater than this value, if followed by a legal - * input character, is too big. One that is equal to this value may - * be valid or not; the limit between valid and invalid numbers is - * then based on the last digit. For instance, if the range for longs - * is [-2147483648..2147483647] and the input base is 10, cutoff will - * be set to 214748364 and cutlim to either 7 (neg==0) or 8 (neg==1), - * meaning that if we have accumulated a value > 214748364, or equal - * but the next digit is > 7 (or 8), the number is too big, and we - * will return a range error. - * - * Set any if any `digits' consumed; make it negative to indicate - * overflow. - */ - cutoff = neg ? -(unsigned long) LONG_MIN : LONG_MAX; - cutlim = cutoff % (unsigned long) base; - cutoff /= (unsigned long) base; - for (acc = 0, any = 0;; c = *s++) - { - if (isdigit(c)) - c -= '0'; - else if (isalpha(c)) - c -= isupper(c) ? 'A' - 10 : 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim) - any = -1; - else - { - any = 1; - acc *= base; - acc += c; - } - } - if (any < 0) - { - acc = neg ? LONG_MIN : LONG_MAX; - errno = ERANGE; - } - else if (neg) - acc = -acc; - if (endptr != 0) - *endptr = any ? s - 1 : (char *) nptr; - return (acc); -} -- cgit v1.2.3