RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7.

This commit is contained in:
Darren Tucker 2005-11-10 16:48:10 +11:00
parent f976e6f883
commit f5ebfe9f68
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -24,7 +24,7 @@
- (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14.
Removal of rcsid, will no longer strlcpy parts of the string.
- (dtucker) [openbsd-compat/strtoll.c] Update from OpenBSD 1.4 -> 1.5.
Removal of rcsid.
- (dtucker) [openbsd-compat/strtoul.c] Update from OpenBSD 1.5 -> 1.7.
20051105
- (djm) OpenBSD CVS Sync
@ -3267,4 +3267,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3967 2005/11/10 05:46:26 dtucker Exp $
$Id: ChangeLog,v 1.3968 2005/11/10 05:48:10 dtucker Exp $

18
openbsd-compat/strtoul.c
View File

@ -1,3 +1,4 @@
/* $OpenBSD: strtoul.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1990 Regents of the University of California.
* All rights reserved.
@ -32,10 +33,6 @@
#include "includes.h"
#ifndef HAVE_STRTOUL
#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <ctype.h>
#include <errno.h>
#include <limits.h>
@ -48,15 +45,12 @@ static char *rcsid = "$OpenBSD: strtoul.c,v 1.5 2003/06/02 20:18:38 millert Exp
* alphabets and digits are each contiguous.
*/
unsigned long
strtoul(nptr, endptr, base)
const char *nptr;
char **endptr;
register int base;
strtoul(const char *nptr, char **endptr, int base)
{
register const char *s;
register unsigned long acc, cutoff;
register int c;
register int neg, any, cutlim;
const char *s;
unsigned long acc, cutoff;
int c;
int neg, any, cutlim;
/*
* See strtol for comments as to the logic used.