diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/strtoul.c | 18 |
2 files changed, 8 insertions, 14 deletions
@@ -24,7 +24,7 @@ | |||
24 | - (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14. | 24 | - (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14. |
25 | Removal of rcsid, will no longer strlcpy parts of the string. | 25 | Removal of rcsid, will no longer strlcpy parts of the string. |
26 | - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5. | 26 | - (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5. |
27 | Removal of rcsid. | 27 | - (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7. |
28 | 28 | ||
29 | 20051105 | 29 | 20051105 |
30 | - (djm) OpenBSD CVS Sync | 30 | - (djm) OpenBSD CVS Sync |
@@ -3267,4 +3267,4 @@ | |||
3267 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3267 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3268 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3268 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3269 | 3269 | ||
3270 | $Id: ChangeLog,v 1.3967 2005/11/10 05:46:26 dtucker Exp $ | 3270 | $Id: ChangeLog,v 1.3968 2005/11/10 05:48:10 dtucker Exp $ |
diff --git a/openbsd-compat/strtoul.c b/openbsd-compat/strtoul.c index 7c093c48f..8219c8391 100644 --- a/openbsd-compat/strtoul.c +++ b/openbsd-compat/strtoul.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: strtoul.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 1990 Regents of the University of California. | 3 | * Copyright (c) 1990 Regents of the University of California. |
3 | * All rights reserved. | 4 | * All rights reserved. |
@@ -32,10 +33,6 @@ | |||
32 | #include "includes.h" | 33 | #include "includes.h" |
33 | #ifndef HAVE_STRTOUL | 34 | #ifndef HAVE_STRTOUL |
34 | 35 | ||
35 | #if defined(LIBC_SCCS) && !defined(lint) | ||
36 | static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp $"; | ||
37 | #endif /* LIBC_SCCS and not lint */ | ||
38 | |||
39 | #include <ctype.h> | 36 | #include <ctype.h> |
40 | #include <errno.h> | 37 | #include <errno.h> |
41 | #include <limits.h> | 38 | #include <limits.h> |
@@ -48,15 +45,12 @@ static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp | |||
48 | * alphabets and digits are each contiguous. | 45 | * alphabets and digits are each contiguous. |
49 | */ | 46 | */ |
50 | unsigned long | 47 | unsigned long |
51 | strtoul(nptr, endptr, base) | 48 | strtoul(const char *nptr, char **endptr, int base) |
52 | const char *nptr; | ||
53 | char **endptr; | ||
54 | register int base; | ||
55 | { | 49 | { |
56 | register const char *s; | 50 | const char *s; |
57 | register unsigned long acc, cutoff; | 51 | unsigned long acc, cutoff; |
58 | register int c; | 52 | int c; |
59 | register int neg, any, cutlim; | 53 | int neg, any, cutlim; |
60 | 54 | ||
61 | /* | 55 | /* |
62 | * See strtol for comments as to the logic used. | 56 | * See strtol for comments as to the logic used. |