Thread: license cleanup
This patch cleans up the licensing terms on some imported BSD-licensed
files in the source tree:
- src/port/qsort.c is from NetBSD, and still contained the old 4-clause
BSD license. The NetBSD folks have updated the BSD licensing terms in
their CVS code, so I upgraded our copy to the latest CVS copy (I just
merged the licensing fixes, no other substantive changes were made).
- src/port/crypt.c is also from NetBSD, so I updated the licensing terms
in a similar fashion. I also merged another upstream change: a bunch of
static read-only arrays were const-ified.
- src/port/memcmp.c was imported from NetBSD, but whoever imported it
didn't also include the licensing terms (which is not good, needless to
say). I added the copyright blurb from the current version of the file
in NetBSD CVS.
There is a bunch more license cleanup of this kind that can be done, but
this is a start.
I was also going to update the licenses on files imported from FreeBSD,
but apparently they haven't bothered fixing their files to reflect the
3-clause Berkeley license. Of course the fact they haven't done this
doesn't matter (the license change applies anyway); do people think it
is worth modifying the licenses on these imported files anyway?
Barring any objections I intend to apply this patch on Tuesday.
-Neil
Index: src/port/crypt.c
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql-server/src/port/crypt.c,v
retrieving revision 1.8
diff -c -r1.8 crypt.c
*** src/port/crypt.c 27 Sep 2004 19:16:02 -0000 1.8
--- src/port/crypt.c 3 Oct 2004 15:18:44 -0000
***************
*** 11,32 ****
* 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)
--- 11,28 ----
* 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. 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)
***************
*** 36,50 ****
* SUCH DAMAGE.
*/
- #if defined(LIBC_SCCS) && !defined(lint)
- #if 0
- static char sccsid[] = "@(#)crypt.c 8.1.1.1 (Berkeley) 8/18/93";
-
- #else
- __RCSID("$NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $");
- #endif
- #endif /* not lint */
-
#include "pg_config.h"
#include <stddef.h>
--- 32,37 ----
***************
*** 339,345 ****
/* ===== (mostly) Standard DES Tables ==================== */
! static unsigned char IP[] = { /* initial permutation */
58, 50, 42, 34, 26, 18, 10, 2,
60, 52, 44, 36, 28, 20, 12, 4,
62, 54, 46, 38, 30, 22, 14, 6,
--- 326,332 ----
/* ===== (mostly) Standard DES Tables ==================== */
! static const unsigned char IP[] = { /* initial permutation */
58, 50, 42, 34, 26, 18, 10, 2,
60, 52, 44, 36, 28, 20, 12, 4,
62, 54, 46, 38, 30, 22, 14, 6,
***************
*** 352,358 ****
/* The final permutation is the inverse of IP - no table is necessary */
! static unsigned char ExpandTr[] = { /* expansion operation */
32, 1, 2, 3, 4, 5,
4, 5, 6, 7, 8, 9,
8, 9, 10, 11, 12, 13,
--- 339,345 ----
/* The final permutation is the inverse of IP - no table is necessary */
! static const unsigned char ExpandTr[] = { /* expansion operation */
32, 1, 2, 3, 4, 5,
4, 5, 6, 7, 8, 9,
8, 9, 10, 11, 12, 13,
***************
*** 363,369 ****
28, 29, 30, 31, 32, 1,
};
! static unsigned char PC1[] = { /* permuted choice table 1 */
57, 49, 41, 33, 25, 17, 9,
1, 58, 50, 42, 34, 26, 18,
10, 2, 59, 51, 43, 35, 27,
--- 350,356 ----
28, 29, 30, 31, 32, 1,
};
! static const unsigned char PC1[] = { /* permuted choice table 1 */
57, 49, 41, 33, 25, 17, 9,
1, 58, 50, 42, 34, 26, 18,
10, 2, 59, 51, 43, 35, 27,
***************
*** 375,386 ****
21, 13, 5, 28, 20, 12, 4,
};
! static unsigned char Rotates[] = { /* PC1 rotation schedule */
1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
};
/* note: each "row" of PC2 is left-padded with bits that make it invertible */
! static unsigned char PC2[] = { /* permuted choice table 2 */
9, 18, 14, 17, 11, 24, 1, 5,
22, 25, 3, 28, 15, 6, 21, 10,
35, 38, 23, 19, 12, 4, 26, 8,
--- 362,373 ----
21, 13, 5, 28, 20, 12, 4,
};
! static const unsigned char Rotates[] = { /* PC1 rotation schedule */
1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1,
};
/* note: each "row" of PC2 is left-padded with bits that make it invertible */
! static const unsigned char PC2[] = { /* permuted choice table 2 */
9, 18, 14, 17, 11, 24, 1, 5,
22, 25, 3, 28, 15, 6, 21, 10,
35, 38, 23, 19, 12, 4, 26, 8,
***************
*** 392,398 ****
0, 0, 46, 42, 50, 36, 29, 32,
};
! static unsigned char S[8][64] = { /* 48->32 bit substitution tables */
/* S[1] */
{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
--- 379,385 ----
0, 0, 46, 42, 50, 36, 29, 32,
};
! static const unsigned char S[8][64] = { /* 48->32 bit substitution tables */
/* S[1] */
{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
***************
*** 435,441 ****
2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}
};
! static unsigned char P32Tr[] = { /* 32-bit permutation function */
16, 7, 20, 21,
29, 12, 28, 17,
1, 15, 23, 26,
--- 422,428 ----
2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}
};
! static const unsigned char P32Tr[] = { /* 32-bit permutation function */
16, 7, 20, 21,
29, 12, 28, 17,
1, 15, 23, 26,
***************
*** 446,452 ****
22, 11, 4, 25,
};
! static unsigned char CIFP[] = { /* compressed/interleaved permutation */
1, 2, 3, 4, 17, 18, 19, 20,
5, 6, 7, 8, 21, 22, 23, 24,
9, 10, 11, 12, 25, 26, 27, 28,
--- 433,439 ----
22, 11, 4, 25,
};
! static const unsigned char CIFP[] = { /* compressed/interleaved permutation */
1, 2, 3, 4, 17, 18, 19, 20,
5, 6, 7, 8, 21, 22, 23, 24,
9, 10, 11, 12, 25, 26, 27, 28,
***************
*** 458,464 ****
45, 46, 47, 48, 61, 62, 63, 64,
};
! static unsigned char itoa64[] = /* 0..63 => ascii-64 */
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
--- 445,451 ----
45, 46, 47, 48, 61, 62, 63, 64,
};
! static const unsigned char itoa64[] = /* 0..63 => ascii-64 */
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
Index: src/port/memcmp.c
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql-server/src/port/memcmp.c,v
retrieving revision 1.5
diff -c -r1.5 memcmp.c
*** src/port/memcmp.c 29 Aug 2004 04:13:12 -0000 1.5
--- src/port/memcmp.c 3 Oct 2004 15:24:53 -0000
***************
*** 4,19 ****
* compares memory bytes
*
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql-server/src/port/memcmp.c,v 1.4 2003/11/29 19:52:13 pgsql Exp $
*
* This file was taken from NetBSD and is used by SunOS because memcmp
! * on that platform does not properly compare negative bytes.
*
! *-------------------------------------------------------------------------
*/
#include <string.h>
--- 4,49 ----
* compares memory bytes
*
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql-server/src/port/memcmp.c,v 1.4 2003/11/29 19:52:13 pgsql Exp $
*
* This file was taken from NetBSD and is used by SunOS because memcmp
! * on that platform does not properly compare negative bytes. The
! * NetBSD copyright terms follow.
! */
!
! /*-
! * Copyright (c) 1990, 1993
! * The Regents of the University of California. All rights reserved.
! *
! * This code is derived from software contributed to Berkeley by
! * Chris Torek.
! *
! * 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. 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.
*/
#include <string.h>
Index: src/port/qsort.c
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql-server/src/port/qsort.c,v
retrieving revision 1.4
diff -c -r1.4 qsort.c
*** src/port/qsort.c 29 Nov 2003 19:52:13 -0000 1.4
--- src/port/qsort.c 3 Oct 2004 15:03:38 -0000
***************
*** 1,12 ****
/*
! * Copied from NetBSD CVS, 2002-07-19, bjm
! * Add do ... while() macro fix
! * Remove __inline, _DIAGASSERTs, __P
*
* $PostgreSQL: /cvsroot/pgsql-server/src/port/qsort.c,v 1.3 2002/09/04 20:31:48 momjian Exp $
*/
! /* $NetBSD: qsort.c,v 1.12 1999/09/20 04:39:40 lukem Exp $ */
/*-
* Copyright (c) 1992, 1993
--- 1,12 ----
/*
! * Modifications from vanilla NetBSD sources:
! * Add do ... while() macro fix
! * Remove __inline, _DIAGASSERTs, __P
*
* $PostgreSQL: /cvsroot/pgsql-server/src/port/qsort.c,v 1.3 2002/09/04 20:31:48 momjian Exp $
*/
! /* $NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $ */
/*-
* Copyright (c) 1992, 1993
***************
*** 16,37 ****
* 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)
--- 16,33 ----
* 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. 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)
Neil Conway <neilc@samurai.com> writes:
> This patch cleans up the licensing terms on some imported BSD-licensed
> files in the source tree:
Looks good.
> I was also going to update the licenses on files imported from FreeBSD,
> but apparently they haven't bothered fixing their files to reflect the
> 3-clause Berkeley license. Of course the fact they haven't done this
> doesn't matter (the license change applies anyway); do people think it
> is worth modifying the licenses on these imported files anyway?
I think it is a real bad idea to unilaterally change the copyright text
in files we got from somewhere else, no matter how benign our intentions.
Instead, how about adopting the NetBSD version of the functionality?
If the files did indeed come from UCB originally, then NetBSD should
have a copy too ...
regards, tom lane
Tom Lane wrote:
> I think it is a real bad idea to unilaterally change the copyright text
> in files we got from somewhere else, no matter how benign our intentions.
Agreed.
> Instead, how about adopting the NetBSD version of the functionality?
> If the files did indeed come from UCB originally, then NetBSD should
> have a copy too ...
Attached is a patch that replaces src/port/{strtol.c,strtoul.c} with
versions derived from current NetBSD CVS sources, which has a 3-clause
BSD license. The code is different than the FreeBSD sources in a few
ways (mostly trivial); I've eyeballed the diffs and I couldn't see
anything that would result in a change in behavior, but I may have
missed something. The NetBSD sources are actually better in a few ways
(e.g. they don't use the "register" keyword).
Barring any objections, I intend to apply this patch to HEAD on Tuesday.
There are a few more files whose licenses need updating, but I'll leave
that for later. And of course, there's contrib/ to sort out as well...
-Neil
Index: src/port/strtol.c
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql-server/src/port/strtol.c,v
retrieving revision 1.4
diff -c -r1.4 strtol.c
*** src/port/strtol.c 29 Aug 2004 04:13:12 -0000 1.4
--- src/port/strtol.c 4 Oct 2004 06:20:12 -0000
***************
*** 1,28 ****
! /*
! * Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
! * Portions 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)
--- 1,25 ----
! /* $NetBSD: strtol.c,v 1.16 2003/08/07 16:43:44 agc Exp $ */
!
! /*-
! * Copyright (c) 1990, 1993
! * 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. 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)
***************
*** 33,47 ****
*/
#if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)strtol.c 5.4 (Berkeley) 2/23/91";
! #endif /* LIBC_SCCS and not lint */
- #include <limits.h>
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
- #define const
/*
* Convert a string to a long integer.
--- 30,47 ----
*/
#if defined(LIBC_SCCS) && !defined(lint)
! #if 0
! static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93";
! #else
! __RCSID("$NetBSD: strtol.c,v 1.16 2003/08/07 16:43:44 agc Exp $");
! #endif
! #endif /* LIBC_SCCS and not lint */
#include <ctype.h>
#include <errno.h>
+ #include <limits.h>
#include <stdlib.h>
/*
* Convert a string to a long integer.
***************
*** 51,87 ****
*/
long
strtol(nptr, endptr, base)
! const char *nptr;
! char **endptr;
! int base;
{
! const char *s = nptr;
! unsigned long acc;
! unsigned char c;
! unsigned long cutoff;
! 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;
--- 51,86 ----
*/
long
strtol(nptr, endptr, base)
! const char *nptr;
! char **endptr;
! int base;
{
! const char *s;
! long acc, cutoff;
! int c;
! int neg, any, cutlim;
!
! /* endptr may be NULL */
/*
! * 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.
*/
! s = nptr;
! do {
! c = (unsigned char) *s++;
} while (isspace(c));
! if (c == '-') {
neg = 1;
c = *s++;
+ } else {
+ neg = 0;
+ if (c == '+')
+ c = *s++;
}
if ((base == 0 || base == 16) &&
! c == '0' && (*s == 'x' || *s == 'X')) {
c = s[1];
s += 2;
base = 16;
***************
*** 90,140 ****
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 ((int) c >= base)
break;
! if (any < 0 || acc > cutoff || acc == cutoff && (int) 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;
}
--- 89,155 ----
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 ? LONG_MIN : LONG_MAX;
! cutlim = (int)(cutoff % base);
! cutoff /= base;
! if (neg) {
! if (cutlim > 0) {
! cutlim -= base;
! cutoff += 1;
! }
! cutlim = -cutlim;
! }
! for (acc = 0, any = 0;; c = (unsigned char) *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)
! continue;
! if (neg) {
! if (acc < cutoff || (acc == cutoff && c > cutlim)) {
! any = -1;
! acc = LONG_MIN;
! errno = ERANGE;
! } else {
! any = 1;
! acc *= base;
! acc -= c;
! }
! } else {
! if (acc > cutoff || (acc == cutoff && c > cutlim)) {
! any = -1;
! acc = LONG_MAX;
! errno = ERANGE;
! } else {
! any = 1;
! acc *= base;
! acc += c;
! }
}
}
if (endptr != 0)
! /* LINTED interface specification */
! *endptr = (char *)(any ? s - 1 : nptr);
! return (acc);
}
Index: src/port/strtoul.c
===================================================================
RCS file: /Users/neilc/local/cvs/pgsql-server/src/port/strtoul.c,v
retrieving revision 1.1
diff -c -r1.1 strtoul.c
*** src/port/strtoul.c 18 Jul 2002 04:13:59 -0000 1.1
--- src/port/strtoul.c 4 Oct 2004 06:15:42 -0000
***************
*** 1,3 ****
--- 1,5 ----
+ /* $NetBSD: strtoul.c,v 1.16 2003/08/07 16:43:45 agc Exp $ */
+
/*
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
***************
*** 6,27 ****
* 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)
--- 8,25 ----
* 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. 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)
***************
*** 32,43 ****
*/
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93";
! #endif /* LIBC_SCCS and not lint */
- #include <limits.h>
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
/*
--- 30,45 ----
*/
#if defined(LIBC_SCCS) && !defined(lint)
+ #if 0
static char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93";
! #else
! __RCSID("$NetBSD: strtoul.c,v 1.16 2003/08/07 16:43:45 agc Exp $");
! #endif
! #endif /* LIBC_SCCS and not lint */
#include <ctype.h>
#include <errno.h>
+ #include <limits.h>
#include <stdlib.h>
/*
***************
*** 48,119 ****
*/
unsigned long
strtoul(nptr, endptr, base)
! const char *nptr;
! char **endptr;
! register int base;
{
! register const char *s = nptr;
! register unsigned long acc;
! register unsigned char c;
! register unsigned long cutoff;
! register int neg = 0,
! any,
! cutlim;
/*
* See strtol for comments as to the logic used.
*/
! 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;
! cutoff = (unsigned long) ULONG_MAX / (unsigned long) base;
! cutlim = (unsigned long) ULONG_MAX % (unsigned long) base;
! for (acc = 0, any = 0;; c = *s++)
! {
! if (!isascii(c))
! break;
if (isdigit(c))
c -= '0';
else if (isalpha(c))
c -= isupper(c) ? 'A' - 10 : 'a' - 10;
else
break;
! if ((int) c >= base)
break;
! if (any < 0 || acc > cutoff || (acc == cutoff && (int) c > cutlim))
any = -1;
! else
! {
any = 1;
! acc *= base;
acc += c;
}
}
! if (any < 0)
! {
! acc = ULONG_MAX;
! errno = ERANGE;
! }
! else if (neg)
acc = -acc;
if (endptr != 0)
! *endptr = (char *) (any ? s - 1 : nptr);
! return acc;
}
--- 50,117 ----
*/
unsigned long
strtoul(nptr, endptr, base)
! const char *nptr;
! char **endptr;
! int base;
{
! const char *s;
! unsigned long acc, cutoff;
! int c;
! int neg, any, cutlim;
!
! /* endptr may be NULL */
/*
* See strtol for comments as to the logic used.
*/
! s = nptr;
! do {
! c = (unsigned char) *s++;
} while (isspace(c));
! if (c == '-') {
neg = 1;
c = *s++;
+ } else {
+ neg = 0;
+ 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;
!
! cutoff = ULONG_MAX / (unsigned long)base;
! cutlim = (int)(ULONG_MAX % (unsigned long)base);
! for (acc = 0, any = 0;; c = (unsigned char) *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)
! continue;
! if (acc > cutoff || (acc == cutoff && c > cutlim)) {
any = -1;
! acc = ULONG_MAX;
! errno = ERANGE;
! } else {
any = 1;
! acc *= (unsigned long)base;
acc += c;
}
}
! if (neg && any > 0)
acc = -acc;
if (endptr != 0)
! /* LINTED interface specification */
! *endptr = (char *)(any ? s - 1 : nptr);
! return (acc);
}
Neil Conway wrote:
> Attached is a patch that replaces src/port/{strtol.c,strtoul.c} with
> versions derived from current NetBSD CVS sources, which has a
> 3-clause BSD license.
In my opinion, this is a completely pointless exercise in replacing
perfectly good code with code that we didn't know until today. Not
during beta please.
--
Peter Eisentraut
http://developer.postgresql.org/~petere/
On Mon, 4 Oct 2004, Peter Eisentraut wrote:
> Neil Conway wrote:
>> Attached is a patch that replaces src/port/{strtol.c,strtoul.c} with
>> versions derived from current NetBSD CVS sources, which has a
>> 3-clause BSD license.
>
> In my opinion, this is a completely pointless exercise in replacing
> perfectly good code with code that we didn't know until today. Not
> during beta please.
Oh good, I feared it was just me that thought that this seemed like a 'not
so good' idea :(
----
Marc G. Fournier Hub.Org Networking Services (http://www.hub.org)
Email: scrappy@hub.org Yahoo!: yscrappy ICQ: 7615664
On Tue, 2004-10-05 at 00:11, Peter Eisentraut wrote: > In my opinion, this is a completely pointless exercise in replacing > perfectly good code with code that we didn't know until today. Not > during beta please. Well, I think the chance of there being a bug in NetBSD's strtol/strtoul (that doesn't also exist in FreeBSD's) is slim to none. But I'm fine with not applying the second patch until we branch for 8.1 -Neil
On Mon, 2004-10-04 at 02:04, Neil Conway wrote: > This patch cleans up the licensing terms on some imported BSD-licensed > files in the source tree Patch applied. -Neil