tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 09:14:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [configure.ac openbsd-compat/Makefile.in openbsd-compat/bsd-asprintf.c

Browse Source 
openbsd-compat/bsd-snprintf.c openbsd-compat/openbsd-compat.h] Add an
   asprintf() implementation, after syncing our {v,}snprintf() implementation
   with some extra fixes from Samba's version. With help and debugging from
   dtucker and tim; ok dtucker@
This commit is contained in:
Damien Miller 2005-11-24 19:58:19 +11:00
parent efc17470e0
commit 57f3915b55
6 changed files with 560 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,10 @@
20051122
- (djm) [configure.ac openbsd-compat/Makefile.in openbsd-compat/bsd-asprintf.c
openbsd-compat/bsd-snprintf.c openbsd-compat/openbsd-compat.h] Add an
asprintf() implementation, after syncing our {v,}snprintf() implementation
with some extra fixes from Samba's version. With help and debugging from
dtucker and tim; ok dtucker@
20051122 20051122
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2005/11/12 18:37:59 - deraadt@cvs.openbsd.org 2005/11/12 18:37:59
@ -3333,4 +3340,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4002 2005/11/22 08:55:13 dtucker Exp $ $Id: ChangeLog,v 1.4003 2005/11/24 08:58:19 djm Exp $

70
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.307 2005/11/12 07:42:37 dtucker Exp $ # $Id: configure.ac,v 1.308 2005/11/24 08:58:20 djm Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -426,6 +426,7 @@ mips-sony-bsd|mips-sony-newsos4)
;; ;;
# UnixWare 1.x, UnixWare 2.x, and others based on code from Univel. # UnixWare 1.x, UnixWare 2.x, and others based on code from Univel.
*-*-sysv4.2*) *-*-sysv4.2*)
CFLAGS="$CFLAGS -Dva_list=_VA_LIST"
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(SETEUID_BREAKS_SETUID) AC_DEFINE(SETEUID_BREAKS_SETUID)
AC_DEFINE(BROKEN_SETREUID) AC_DEFINE(BROKEN_SETREUID)
@ -1106,6 +1107,7 @@ AC_ARG_WITH(audit,
dnl Checks for library functions. Please keep in alphabetical order dnl Checks for library functions. Please keep in alphabetical order
AC_CHECK_FUNCS( \ AC_CHECK_FUNCS( \
arc4random \ arc4random \
asprintf \
b64_ntop \ b64_ntop \
__b64_ntop \ __b64_ntop \
b64_pton \ b64_pton \
@ -1181,6 +1183,7 @@ AC_CHECK_FUNCS( \
truncate \ truncate \
unsetenv \ unsetenv \
updwtmpx \ updwtmpx \
vasprintf \
vhangup \ vhangup \
vsnprintf \ vsnprintf \
waitpid \ waitpid \
@ -1299,6 +1302,40 @@ int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
) )
fi fi
# If we don't have a working asprintf, then we strongly depend on vsnprintf
# returning the right thing on overflow: the number of characters it tried to
# create (as per SUSv3)
if test "x$ac_cv_func_asprintf" != "xyes" && \
test "x$ac_cv_func_vsnprintf" = "xyes" ; then
AC_MSG_CHECKING([whether vsnprintf returns correct values on overflow])
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <sys/types.h>
#include <stdio.h>
#include <stdarg.h>
int x_snprintf(char *str,size_t count,const char *fmt,...)
{
size_t ret; va_list ap;
va_start(ap, fmt); ret = vsnprintf(str, count, fmt, ap); va_end(ap);
return ret;
}
int main(void)
{
char x[1];
exit(x_snprintf(x, 1, "%s %d", "hello", 12345) == 11 ? 0 : 1);
} ]])],
[AC_MSG_RESULT(yes)],
[
AC_MSG_RESULT(no)
AC_DEFINE(BROKEN_SNPRINTF, 1,
[Define if your snprintf is busted])
AC_MSG_WARN([****** Your vsnprintf() function is broken, complain to your vendor])
],
[ AC_MSG_WARN([cross compiling: Assuming working vsnprintf()]) ]
)
fi
# Check for missing getpeereid (or equiv) support # Check for missing getpeereid (or equiv) support
NO_PEERCHECK="" NO_PEERCHECK=""
if test "x$ac_cv_func_getpeereid" != "xyes" ; then if test "x$ac_cv_func_getpeereid" != "xyes" ; then
@ -1978,7 +2015,10 @@ if test ! -z "$SONY" ; then
LIBS="$LIBS -liberty"; LIBS="$LIBS -liberty";
fi fi
# Checks for data types # Check for long long datatypes
AC_CHECK_TYPES([long long, unsigned long long, long double])
# Check datatype sizes
AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(char, 1)
AC_CHECK_SIZEOF(short int, 2) AC_CHECK_SIZEOF(short int, 2)
AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(int, 4)
@ -2669,6 +2709,32 @@ if test "x$ac_cv_cc_implements___func__" = "xyes" ; then
AC_DEFINE(HAVE___func__, 1, [Define if compiler implements __func__]) AC_DEFINE(HAVE___func__, 1, [Define if compiler implements __func__])
fi fi
AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
AC_TRY_LINK(
[#include <stdarg.h>
va_list x,y;],
[va_copy(x,y);],
[ ac_cv_have_va_copy="yes" ],
[ ac_cv_have_va_copy="no" ]
)
])
if test "x$ac_cv_have_va_copy" = "xyes" ; then
AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy exists])
fi
AC_CACHE_CHECK([whether __va_copy exists], ac_cv_have___va_copy, [
AC_TRY_LINK(
[#include <stdarg.h>
va_list x,y;],
[__va_copy(x,y);],
[ ac_cv_have___va_copy="yes" ],
[ ac_cv_have___va_copy="no" ]
)
])
if test "x$ac_cv_have___va_copy" = "xyes" ; then
AC_DEFINE(HAVE___VA_COPY, 1, [Define if __va_copy exists])
fi
AC_CACHE_CHECK([whether getopt has optreset support], AC_CACHE_CHECK([whether getopt has optreset support],
ac_cv_have_getopt_optreset, [ ac_cv_have_getopt_optreset, [
AC_TRY_LINK( AC_TRY_LINK(

4
openbsd-compat/Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.35 2005/08/26 20:15:20 tim Exp $ # $Id: Makefile.in,v 1.36 2005/11/24 08:58:21 djm Exp $
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
piddir=@piddir@ piddir=@piddir@
@ -18,7 +18,7 @@ LDFLAGS=-L. @LDFLAGS@
OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtonum.o strtoll.o strtoul.o vis.o OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o strtonum.o strtoll.o strtoul.o vis.o
COMPAT=bsd-arc4random.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-snprintf.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-snprintf.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o
PORTS=port-irix.o port-aix.o port-uw.o PORTS=port-irix.o port-aix.o port-uw.o

95
openbsd-compat/bsd-asprintf.c Normal file
View File

@ -0,0 +1,95 @@
/*
* Copyright (c) 2004 Darren Tucker.
*
* Based originally on asprintf.c from OpenBSD:
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
*
* 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.
*/
#include "includes.h"
#ifndef HAVE_VASPRINTF
#ifndef VA_COPY
# ifdef HAVE_VA_COPY
# define VA_COPY(dest, src) va_copy(dest, src)
# else
# ifdef HAVE___VA_COPY
# define VA_COPY(dest, src) __va_copy(dest, src)
# else
# define VA_COPY(dest, src) (dest) = (src)
# endif
# endif
#endif
#define INIT_SZ 128
int vasprintf(char **str, const char *fmt, va_list ap)
{
int ret = -1;
va_list ap2;
char *string, *newstr;
size_t len;
VA_COPY(ap2, ap);
if ((string = malloc(INIT_SZ)) == NULL)
goto fail;
ret = vsnprintf(string, INIT_SZ, fmt, ap2);
if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
*str = string;
} else if (ret == INT_MAX) { /* shouldn't happen */
goto fail;
} else { /* bigger than initial, realloc allowing for nul */
len = (size_t)ret + 1;
if ((newstr = realloc(string, len)) == NULL) {
free(string);
goto fail;
} else {
va_end(ap2);
VA_COPY(ap2, ap);
ret = vsnprintf(newstr, len, fmt, ap2);
if (ret >= 0 && (size_t)ret < len) {
*str = newstr;
} else { /* failed with realloc'ed string, give up */
free(newstr);
goto fail;
}
}
}
va_end(ap2);
return (ret);
fail:
*str = NULL;
errno = ENOMEM;
va_end(ap2);
return (-1);
}
#endif
#ifndef HAVE_ASPRINTF
int asprintf(char **str, const char *fmt, ...)
{
va_list ap;
int ret;
*str = NULL;
va_start(ap, fmt);
ret = vasprintf(str, fmt, ap);
va_end(ap);
return ret;
}
#endif

606
openbsd-compat/bsd-snprintf.c
View File

@ -45,45 +45,82 @@
* missing. Some systems only have snprintf() but not vsnprintf(), so * missing. Some systems only have snprintf() but not vsnprintf(), so
* the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF. * the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
* *
* Ben Lindstrom <mouring@eviladmin.org> 09/27/00 for OpenSSH * Andrew Tridgell (tridge@samba.org) Oct 1998
* Welcome to the world of %lld and %qd support. With other * fixed handling of %.0f
* long long support. This is needed for sftp-server to work * added test for HAVE_LONG_DOUBLE
* right.
* *
* Ben Lindstrom <mouring@eviladmin.org> 02/12/01 for OpenSSH * tridge@samba.org, idra@samba.org, April 2001
* Removed all hint of VARARGS stuff and banished it to the void, * got rid of fcvt code (twas buggy and made testing harder)
* and did a bit of KNF style work to make things a bit more * added C99 semantics
* acceptable. Consider stealing from mutt or enlightenment. *
* date: 2002/12/19 19:56:31; author: herb; state: Exp; lines: +2 -0
* actually print args for %g and %e
*
* date: 2002/06/03 13:37:52; author: jmcd; state: Exp; lines: +8 -0
* Since includes.h isn't included here, VA_COPY has to be defined here. I don't
* see any include file that is guaranteed to be here, so I'm defining it
* locally. Fixes AIX and Solaris builds.
*
* date: 2002/06/03 03:07:24; author: tridge; state: Exp; lines: +5 -13
* put the ifdef for HAVE_VA_COPY in one place rather than in lots of
* functions
*
* date: 2002/05/17 14:51:22; author: jmcd; state: Exp; lines: +21 -4
* Fix usage of va_list passed as an arg. Use __va_copy before using it
* when it exists.
*
* date: 2002/04/16 22:38:04; author: idra; state: Exp; lines: +20 -14
* Fix incorrect zpadlen handling in fmtfp.
* Thanks to Ollie Oldham <ollie.oldham@metro-optix.com> for spotting it.
* few mods to make it easier to compile the tests.
* addedd the "Ollie" test to the floating point ones.
*
* Martin Pool (mbp@samba.org) April 2003
* Remove NO_CONFIG_H so that the test case can be built within a source
* tree with less trouble.
* Remove unnecessary SAFE_FREE() definition.
*
* Martin Pool (mbp@samba.org) May 2003
* Put in a prototype for dummy_snprintf() to quiet compiler warnings.
*
* Move #endif to make sure VA_COPY, LDOUBLE, etc are defined even
* if the C library has some snprintf functions already.
**************************************************************/ **************************************************************/
#include "includes.h" #include "includes.h"
RCSID("$Id: bsd-snprintf.c,v 1.9 2004/09/23 11:35:09 dtucker Exp $"); RCSID("$Id: bsd-snprintf.c,v 1.10 2005/11/24 08:58:21 djm Exp $");
#if defined(BROKEN_SNPRINTF) /* For those with broken snprintf() */ #if defined(BROKEN_SNPRINTF) /* For those with broken snprintf() */
# undef HAVE_SNPRINTF # undef HAVE_SNPRINTF
# undef HAVE_VSNPRINTF # undef HAVE_VSNPRINTF
#endif #endif
#ifndef VA_COPY
# ifdef HAVE_VA_COPY
# define VA_COPY(dest, src) va_copy(dest, src)
# else
# ifdef HAVE___VA_COPY
# define VA_COPY(dest, src) __va_copy(dest, src)
# else
# define VA_COPY(dest, src) (dest) = (src)
# endif
# endif
#endif
#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
static void #ifdef HAVE_LONG_DOUBLE
dopr(char *buffer, size_t maxlen, const char *format, va_list args); # define LDOUBLE long double
#else
# define LDOUBLE double
#endif
static void #ifdef HAVE_LONG_LONG
fmtstr(char *buffer, size_t *currlen, size_t maxlen, char *value, int flags, # define LLONG long long
int min, int max); #else
# define LLONG long
static void #endif
fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base,
int min, int max, int flags);
static void
fmtfp(char *buffer, size_t *currlen, size_t maxlen, long double fvalue,
int min, int max, int flags);
static void
dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
/* /*
* dopr(): poor man's version of doprintf * dopr(): poor man's version of doprintf
@ -109,28 +146,49 @@ dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
#define DP_F_UNSIGNED (1 << 6) #define DP_F_UNSIGNED (1 << 6)
/* Conversion Flags */ /* Conversion Flags */
#define DP_C_SHORT 1 #define DP_C_SHORT 1
#define DP_C_LONG 2 #define DP_C_LONG 2
#define DP_C_LDOUBLE 3 #define DP_C_LDOUBLE 3
#define DP_C_LONG_LONG 4 #define DP_C_LLONG 4
#define char_to_int(p) (p - '0') #define char_to_int(p) ((p)- '0')
#define abs_val(p) (p < 0 ? -p : p) #ifndef MAX
# define MAX(p,q) (((p) >= (q)) ? (p) : (q))
#endif
static size_t dopr(char *buffer, size_t maxlen, const char *format,
va_list args_in);
static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
char *value, int flags, int min, int max);
static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
long value, int base, int min, int max, int flags);
static void fmtfp(char *buffer, size_t *currlen, size_t maxlen,
LDOUBLE fvalue, int min, int max, int flags);
static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
static void static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
dopr(char *buffer, size_t maxlen, const char *format, va_list args)
{ {
char *strvalue, ch; char ch;
long value; LLONG value;
long double fvalue; LDOUBLE fvalue;
int min = 0, max = -1, state = DP_S_DEFAULT, flags = 0, cflags = 0; char *strvalue;
size_t currlen = 0; int min;
int max;
ch = *format++; int state;
int flags;
int cflags;
size_t currlen;
va_list args;
VA_COPY(args, args_in);
state = DP_S_DEFAULT;
currlen = flags = cflags = min = 0;
max = -1;
ch = *format++;
while (state != DP_S_DONE) { while (state != DP_S_DONE) {
if ((ch == '\0') || (currlen >= maxlen)) if (ch == '\0')
state = DP_S_DONE; state = DP_S_DONE;
switch(state) { switch(state) {
@ -138,7 +196,7 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
if (ch == '%') if (ch == '%')
state = DP_S_FLAGS; state = DP_S_FLAGS;
else else
dopr_outch(buffer, &currlen, maxlen, ch); dopr_outch (buffer, &currlen, maxlen, ch);
ch = *format++; ch = *format++;
break; break;
case DP_S_FLAGS: case DP_S_FLAGS:
@ -170,34 +228,37 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
break; break;
case DP_S_MIN: case DP_S_MIN:
if (isdigit((unsigned char)ch)) { if (isdigit((unsigned char)ch)) {
min = 10 * min + char_to_int (ch); min = 10*min + char_to_int (ch);
ch = *format++; ch = *format++;
} else if (ch == '*') { } else if (ch == '*') {
min = va_arg (args, int); min = va_arg (args, int);
ch = *format++; ch = *format++;
state = DP_S_DOT; state = DP_S_DOT;
} else } else {
state = DP_S_DOT; state = DP_S_DOT;
}
break; break;
case DP_S_DOT: case DP_S_DOT:
if (ch == '.') { if (ch == '.') {
state = DP_S_MAX; state = DP_S_MAX;
ch = *format++; ch = *format++;
} else } else {
state = DP_S_MOD; state = DP_S_MOD;
}
break; break;
case DP_S_MAX: case DP_S_MAX:
if (isdigit((unsigned char)ch)) { if (isdigit((unsigned char)ch)) {
if (max < 0) if (max < 0)
max = 0; max = 0;
max = 10 * max + char_to_int(ch); max = 10*max + char_to_int (ch);
ch = *format++; ch = *format++;
} else if (ch == '*') { } else if (ch == '*') {
max = va_arg (args, int); max = va_arg (args, int);
ch = *format++; ch = *format++;
state = DP_S_MOD; state = DP_S_MOD;
} else } else {
state = DP_S_MOD; state = DP_S_MOD;
}
break; break;
case DP_S_MOD: case DP_S_MOD:
switch (ch) { switch (ch) {
@ -208,15 +269,11 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
case 'l': case 'l':
cflags = DP_C_LONG; cflags = DP_C_LONG;
ch = *format++; ch = *format++;
if (ch == 'l') { if (ch == 'l') { /* It's a long long */
cflags = DP_C_LONG_LONG; cflags = DP_C_LLONG;
ch = *format++; ch = *format++;
} }
break; break;
case 'q':
cflags = DP_C_LONG_LONG;
ch = *format++;
break;
case 'L': case 'L':
cflags = DP_C_LDOUBLE; cflags = DP_C_LDOUBLE;
ch = *format++; ch = *format++;
@ -231,37 +288,37 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
case 'd': case 'd':
case 'i': case 'i':
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg(args, int); value = va_arg (args, int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg(args, long int); value = va_arg (args, long int);
else if (cflags == DP_C_LONG_LONG) else if (cflags == DP_C_LLONG)
value = va_arg (args, long long); value = va_arg (args, LLONG);
else else
value = va_arg (args, int); value = va_arg (args, int);
fmtint(buffer, &currlen, maxlen, value, 10, min, max, flags); fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
break; break;
case 'o': case 'o':
flags |= DP_F_UNSIGNED; flags |= DP_F_UNSIGNED;
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg(args, unsigned int); value = va_arg (args, unsigned int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg(args, unsigned long int); value = (long)va_arg (args, unsigned long int);
else if (cflags == DP_C_LONG_LONG) else if (cflags == DP_C_LLONG)
value = va_arg(args, unsigned long long); value = (long)va_arg (args, unsigned LLONG);
else else
value = va_arg(args, unsigned int); value = (long)va_arg (args, unsigned int);
fmtint(buffer, &currlen, maxlen, value, 8, min, max, flags); fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags);
break; break;
case 'u': case 'u':
flags |= DP_F_UNSIGNED; flags |= DP_F_UNSIGNED;
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg(args, unsigned int); value = va_arg (args, unsigned int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg(args, unsigned long int); value = (long)va_arg (args, unsigned long int);
else if (cflags == DP_C_LONG_LONG) else if (cflags == DP_C_LLONG)
value = va_arg(args, unsigned long long); value = (LLONG)va_arg (args, unsigned LLONG);
else else
value = va_arg(args, unsigned int); value = (long)va_arg (args, unsigned int);
fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags); fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
break; break;
case 'X': case 'X':
@ -269,79 +326,86 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
case 'x': case 'x':
flags |= DP_F_UNSIGNED; flags |= DP_F_UNSIGNED;
if (cflags == DP_C_SHORT) if (cflags == DP_C_SHORT)
value = va_arg(args, unsigned int); value = va_arg (args, unsigned int);
else if (cflags == DP_C_LONG) else if (cflags == DP_C_LONG)
value = va_arg(args, unsigned long int); value = (long)va_arg (args, unsigned long int);
else if (cflags == DP_C_LONG_LONG) else if (cflags == DP_C_LLONG)
value = va_arg(args, unsigned long long); value = (LLONG)va_arg (args, unsigned LLONG);
else else
value = va_arg(args, unsigned int); value = (long)va_arg (args, unsigned int);
fmtint(buffer, &currlen, maxlen, value, 16, min, max, flags); fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags);
break; break;
case 'f': case 'f':
if (cflags == DP_C_LDOUBLE) if (cflags == DP_C_LDOUBLE)
fvalue = va_arg(args, long double); fvalue = va_arg (args, LDOUBLE);
else else
fvalue = va_arg(args, double); fvalue = va_arg (args, double);
/* um, floating point? */ /* um, floating point? */
fmtfp(buffer, &currlen, maxlen, fvalue, min, max, flags); fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags);
break; break;
case 'E': case 'E':
flags |= DP_F_UP; flags |= DP_F_UP;
case 'e': case 'e':
if (cflags == DP_C_LDOUBLE) if (cflags == DP_C_LDOUBLE)
fvalue = va_arg(args, long double); fvalue = va_arg (args, LDOUBLE);
else else
fvalue = va_arg(args, double); fvalue = va_arg (args, double);
fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags);
break; break;
case 'G': case 'G':
flags |= DP_F_UP; flags |= DP_F_UP;
case 'g': case 'g':
if (cflags == DP_C_LDOUBLE) if (cflags == DP_C_LDOUBLE)
fvalue = va_arg(args, long double); fvalue = va_arg (args, LDOUBLE);
else else
fvalue = va_arg(args, double); fvalue = va_arg (args, double);
fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags);
break; break;
case 'c': case 'c':
dopr_outch(buffer, &currlen, maxlen, va_arg(args, int)); dopr_outch (buffer, &currlen, maxlen, va_arg (args, int));
break; break;
case 's': case 's':
strvalue = va_arg(args, char *); strvalue = va_arg (args, char *);
if (max < 0) if (!strvalue) strvalue = "(NULL)";
max = maxlen; /* ie, no max */ if (max == -1) {
fmtstr(buffer, &currlen, maxlen, strvalue, flags, min, max); max = strlen(strvalue);
}
if (min > 0 && max >= 0 && min > max) max = min;
fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
break; break;
case 'p': case 'p':
strvalue = va_arg(args, void *); strvalue = va_arg (args, void *);
fmtint(buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags); fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
break; break;
case 'n': case 'n':
if (cflags == DP_C_SHORT) { if (cflags == DP_C_SHORT) {
short int *num; short int *num;
num = va_arg(args, short int *); num = va_arg (args, short int *);
*num = currlen; *num = currlen;
} else if (cflags == DP_C_LONG) { } else if (cflags == DP_C_LONG) {
long int *num; long int *num;
num = va_arg(args, long int *); num = va_arg (args, long int *);
*num = currlen; *num = (long int)currlen;
} else if (cflags == DP_C_LONG_LONG) { } else if (cflags == DP_C_LLONG) {
long long *num; LLONG *num;
num = va_arg(args, long long *); num = va_arg (args, LLONG *);
*num = currlen; *num = (LLONG)currlen;
} else { } else {
int *num; int *num;
num = va_arg(args, int *); num = va_arg (args, int *);
*num = currlen; *num = currlen;
} }
break; break;
case '%': case '%':
dopr_outch(buffer, &currlen, maxlen, ch); dopr_outch (buffer, &currlen, maxlen, ch);
break; break;
case 'w': /* not supported yet, treat as next char */ case 'w':
/* not supported yet, treat as next char */
ch = *format++; ch = *format++;
break; break;
default: /* Unknown, skip */ default:
break; /* Unknown, skip */
break;
} }
ch = *format++; ch = *format++;
state = DP_S_DEFAULT; state = DP_S_DEFAULT;
@ -350,24 +414,33 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args)
break; break;
case DP_S_DONE: case DP_S_DONE:
break; break;
default: /* hmm? */ default:
/* hmm? */
break; /* some picky compilers need this */ break; /* some picky compilers need this */
} }
} }
if (currlen < maxlen - 1) if (maxlen != 0) {
buffer[currlen] = '\0'; if (currlen < maxlen - 1)
else buffer[currlen] = '\0';
buffer[maxlen - 1] = '\0'; else if (maxlen > 0)
buffer[maxlen - 1] = '\0';
}
return currlen;
} }
static void static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
fmtstr(char *buffer, size_t *currlen, size_t maxlen, char *value, int flags, int min, int max)
char *value, int flags, int min, int max)
{ {
int cnt = 0, padlen, strln; /* amount to pad */ int padlen, strln; /* amount to pad */
int cnt = 0;
if (value == 0)
#ifdef DEBUG_SNPRINTF
printf("fmtstr min=%d max=%d s=[%s]\n", min, max, value);
#endif
if (value == 0) {
value = "<NULL>"; value = "<NULL>";
}
for (strln = 0; strln < max && value[strln]; ++strln); /* strlen */ for (strln = 0; strln < max && value[strln]; ++strln); /* strlen */
padlen = min - strln; padlen = min - strln;
@ -375,18 +448,18 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen,
padlen = 0; padlen = 0;
if (flags & DP_F_MINUS) if (flags & DP_F_MINUS)
padlen = -padlen; /* Left Justify */ padlen = -padlen; /* Left Justify */
while ((padlen > 0) && (cnt < max)) { while ((padlen > 0) && (cnt < max)) {
dopr_outch(buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
--padlen; --padlen;
++cnt; ++cnt;
} }
while (*value && (cnt < max)) { while (*value && (cnt < max)) {
dopr_outch(buffer, currlen, maxlen, *value++); dopr_outch (buffer, currlen, maxlen, *value++);
++cnt; ++cnt;
} }
while ((padlen < 0) && (cnt < max)) { while ((padlen < 0) && (cnt < max)) {
dopr_outch(buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
++padlen; ++padlen;
++cnt; ++cnt;
} }
@ -394,49 +467,49 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen,
/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */ /* Have to handle DP_F_NUM (ie 0x and 0 alternates) */
static void static void fmtint(char *buffer, size_t *currlen, size_t maxlen,
fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base, int min, int max, int flags)
long value, int base, int min, int max, int flags)
{ {
int signvalue = 0;
unsigned long uvalue; unsigned long uvalue;
char convert[20]; char convert[20];
int signvalue = 0, place = 0, caps = 0; int place = 0;
int spadlen = 0; /* amount to space pad */ int spadlen = 0; /* amount to space pad */
int zpadlen = 0; /* amount to zero pad */ int zpadlen = 0; /* amount to zero pad */
int caps = 0;
if (max < 0) if (max < 0)
max = 0; max = 0;
uvalue = value; uvalue = value;
if (!(flags & DP_F_UNSIGNED)) { if(!(flags & DP_F_UNSIGNED)) {
if (value < 0) { if( value < 0 ) {
signvalue = '-'; signvalue = '-';
uvalue = -value; uvalue = -value;
} else if (flags & DP_F_PLUS) /* Do a sign (+/i) */ } else {
signvalue = '+'; if (flags & DP_F_PLUS) /* Do a sign (+/i) */
else if (flags & DP_F_SPACE) signvalue = '+';
signvalue = ' '; else if (flags & DP_F_SPACE)
signvalue = ' ';
}
} }
if (flags & DP_F_UP) if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
caps = 1; /* Should characters be upper case? */
do { do {
convert[place++] = convert[place++] =
(caps ? "0123456789ABCDEF" : "0123456789abcdef") (caps? "0123456789ABCDEF":"0123456789abcdef")
[uvalue % (unsigned)base]; [uvalue % (unsigned)base ];
uvalue = (uvalue / (unsigned)base ); uvalue = (uvalue / (unsigned)base );
} while (uvalue && (place < 20)); } while(uvalue && (place < 20));
if (place == 20) if (place == 20) place--;
place--;
convert[place] = 0; convert[place] = 0;
zpadlen = max - place; zpadlen = max - place;
spadlen = min - MAX (max, place) - (signvalue ? 1 : 0); spadlen = min - MAX (max, place) - (signvalue ? 1 : 0);
if (zpadlen < 0) if (zpadlen < 0) zpadlen = 0;
zpadlen = 0; if (spadlen < 0) spadlen = 0;
if (spadlen < 0)
spadlen = 0;
if (flags & DP_F_ZERO) { if (flags & DP_F_ZERO) {
zpadlen = MAX(zpadlen, spadlen); zpadlen = MAX(zpadlen, spadlen);
spadlen = 0; spadlen = 0;
@ -444,27 +517,32 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen,
if (flags & DP_F_MINUS) if (flags & DP_F_MINUS)
spadlen = -spadlen; /* Left Justifty */ spadlen = -spadlen; /* Left Justifty */
#ifdef DEBUG_SNPRINTF
printf("zpad: %d, spad: %d, min: %d, max: %d, place: %d\n",
zpadlen, spadlen, min, max, place);
#endif
/* Spaces */ /* Spaces */
while (spadlen > 0) { while (spadlen > 0) {
dopr_outch(buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
--spadlen; --spadlen;
} }
/* Sign */ /* Sign */
if (signvalue) if (signvalue)
dopr_outch(buffer, currlen, maxlen, signvalue); dopr_outch (buffer, currlen, maxlen, signvalue);
/* Zeros */ /* Zeros */
if (zpadlen > 0) { if (zpadlen > 0) {
while (zpadlen > 0) { while (zpadlen > 0) {
dopr_outch(buffer, currlen, maxlen, '0'); dopr_outch (buffer, currlen, maxlen, '0');
--zpadlen; --zpadlen;
} }
} }
/* Digits */ /* Digits */
while (place > 0) while (place > 0)
dopr_outch(buffer, currlen, maxlen, convert[--place]); dopr_outch (buffer, currlen, maxlen, convert[--place]);
/* Left Justified spaces */ /* Left Justified spaces */
while (spadlen < 0) { while (spadlen < 0) {
@ -473,11 +551,20 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen,
} }
} }
static long double static LDOUBLE abs_val(LDOUBLE value)
pow10(int exp)
{ {
long double result = 1; LDOUBLE result = value;
if (value < 0)
result = -value;
return result;
}
static LDOUBLE POW10(int exp)
{
LDOUBLE result = 1;
while (exp) { while (exp) {
result *= 10; result *= 10;
exp--; exp--;
@ -486,28 +573,69 @@ pow10(int exp)
return result; return result;
} }
static long static LLONG ROUND(LDOUBLE value)
round(long double value)
{ {
long intpart = value; LLONG intpart;
value -= intpart;
if (value >= 0.5)
intpart++;
intpart = (LLONG)value;
value = value - intpart;
if (value >= 0.5) intpart++;
return intpart; return intpart;
} }
static void /* a replacement for modf that doesn't need the math library. Should
fmtfp(char *buffer, size_t *currlen, size_t maxlen, long double fvalue, be portable, but slow */
int min, int max, int flags) static double my_modf(double x0, double *iptr)
{ {
char iconvert[20], fconvert[20]; int i;
int signvalue = 0, iplace = 0, fplace = 0; long l;
double x = x0;
double f = 1.0;
for (i=0;i<100;i++) {
l = (long)x;
if (l <= (x+1) && l >= (x-1)) break;
x *= 0.1;
f *= 10.0;
}
if (i == 100) {
/* yikes! the number is beyond what we can handle. What do we do? */
(*iptr) = 0;
return 0;
}
if (i != 0) {
double i2;
double ret;
ret = my_modf(x0-l*f, &i2);
(*iptr) = l*f + i2;
return ret;
}
(*iptr) = l;
return x - (*iptr);
}
static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
LDOUBLE fvalue, int min, int max, int flags)
{
int signvalue = 0;
double ufvalue;
char iconvert[311];
char fconvert[311];
int iplace = 0;
int fplace = 0;
int padlen = 0; /* amount to pad */ int padlen = 0; /* amount to pad */
int zpadlen = 0, caps = 0; int zpadlen = 0;
long intpart, fracpart; int caps = 0;
long double ufvalue; int idx;
double intpart;
double fracpart;
double temp;
/* /*
* AIX manpage says the default is 0, but Solaris says the default * AIX manpage says the default is 0, but Solaris says the default
@ -516,137 +644,159 @@ fmtfp(char *buffer, size_t *currlen, size_t maxlen, long double fvalue,
if (max < 0) if (max < 0)
max = 6; max = 6;
ufvalue = abs_val(fvalue); ufvalue = abs_val (fvalue);
if (fvalue < 0) if (fvalue < 0) {
signvalue = '-'; signvalue = '-';
else if (flags & DP_F_PLUS) /* Do a sign (+/i) */ } else {
signvalue = '+'; if (flags & DP_F_PLUS) { /* Do a sign (+/i) */
else if (flags & DP_F_SPACE) signvalue = '+';
signvalue = ' '; } else {
if (flags & DP_F_SPACE)
signvalue = ' ';
}
}
intpart = ufvalue; #if 0
if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
#endif
#if 0
if (max == 0) ufvalue += 0.5; /* if max = 0 we must round */
#endif
/* /*
* Sorry, we only support 9 digits past the decimal because of our * Sorry, we only support 16 digits past the decimal because of our
* conversion method * conversion method
*/ */
if (max > 9) if (max > 16)
max = 9; max = 16;
/* We "cheat" by converting the fractional part to integer by /* We "cheat" by converting the fractional part to integer by
* multiplying by a factor of 10 * multiplying by a factor of 10
*/ */
fracpart = round((pow10 (max)) * (ufvalue - intpart));
if (fracpart >= pow10 (max)) { temp = ufvalue;
my_modf(temp, &intpart);
fracpart = ROUND((POW10(max)) * (ufvalue - intpart));
if (fracpart >= POW10(max)) {
intpart++; intpart++;
fracpart -= pow10 (max); fracpart -= POW10(max);
} }
/* Convert integer part */ /* Convert integer part */
do { do {
temp = intpart*0.1;
my_modf(temp, &intpart);
idx = (int) ((temp -intpart +0.05)* 10.0);
/* idx = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */
/* printf ("%llf, %f, %x\n", temp, intpart, idx); */
iconvert[iplace++] = iconvert[iplace++] =
(caps ? "0123456789ABCDEF" : "0123456789abcdef") (caps? "0123456789ABCDEF":"0123456789abcdef")[idx];
[intpart % 10]; } while (intpart && (iplace < 311));
intpart = (intpart / 10); if (iplace == 311) iplace--;
} while(intpart && (iplace < 20));
if (iplace == 20)
iplace--;
iconvert[iplace] = 0; iconvert[iplace] = 0;
/* Convert fractional part */ /* Convert fractional part */
do { if (fracpart)
fconvert[fplace++] = {
(caps ? "0123456789ABCDEF" : "0123456789abcdef") do {
[fracpart % 10]; temp = fracpart*0.1;
fracpart = (fracpart / 10); my_modf(temp, &fracpart);
} while(fracpart && (fplace < 20)); idx = (int) ((temp -fracpart +0.05)* 10.0);
if (fplace == 20) /* idx = (int) ((((temp/10) -fracpart) +0.05) *10); */
fplace--; /* printf ("%lf, %lf, %ld\n", temp, fracpart, idx ); */
fconvert[fplace++] =
(caps? "0123456789ABCDEF":"0123456789abcdef")[idx];
} while(fracpart && (fplace < 311));
if (fplace == 311) fplace--;
}
fconvert[fplace] = 0; fconvert[fplace] = 0;
/* -1 for decimal point, another -1 if we are printing a sign */ /* -1 for decimal point, another -1 if we are printing a sign */
padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
zpadlen = max - fplace; zpadlen = max - fplace;
if (zpadlen < 0) if (zpadlen < 0) zpadlen = 0;
zpadlen = 0;
if (padlen < 0) if (padlen < 0)
padlen = 0; padlen = 0;
if (flags & DP_F_MINUS) if (flags & DP_F_MINUS)
padlen = -padlen; /* Left Justifty */ padlen = -padlen; /* Left Justifty */
if ((flags & DP_F_ZERO) && (padlen > 0)) { if ((flags & DP_F_ZERO) && (padlen > 0)) {
if (signvalue) { if (signvalue) {
dopr_outch(buffer, currlen, maxlen, signvalue); dopr_outch (buffer, currlen, maxlen, signvalue);
--padlen; --padlen;
signvalue = 0; signvalue = 0;
} }
while (padlen > 0) { while (padlen > 0) {
dopr_outch(buffer, currlen, maxlen, '0'); dopr_outch (buffer, currlen, maxlen, '0');
--padlen; --padlen;
} }
} }
while (padlen > 0) { while (padlen > 0) {
dopr_outch(buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
--padlen; --padlen;
} }
if (signvalue) if (signvalue)
dopr_outch(buffer, currlen, maxlen, signvalue); dopr_outch (buffer, currlen, maxlen, signvalue);
while (iplace > 0) while (iplace > 0)
dopr_outch(buffer, currlen, maxlen, iconvert[--iplace]); dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]);
#ifdef DEBUG_SNPRINTF
printf("fmtfp: fplace=%d zpadlen=%d\n", fplace, zpadlen);
#endif
/* /*
* Decimal point. This should probably use locale to find the * Decimal point. This should probably use locale to find the correct
* correct char to print out. * char to print out.
*/ */
dopr_outch(buffer, currlen, maxlen, '.'); if (max > 0) {
dopr_outch (buffer, currlen, maxlen, '.');
while (zpadlen > 0) {
dopr_outch (buffer, currlen, maxlen, '0');
--zpadlen;
}
while (fplace > 0) while (fplace > 0)
dopr_outch(buffer, currlen, maxlen, fconvert[--fplace]); dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
while (zpadlen > 0) {
dopr_outch(buffer, currlen, maxlen, '0');
--zpadlen;
} }
while (padlen < 0) { while (padlen < 0) {
dopr_outch(buffer, currlen, maxlen, ' '); dopr_outch (buffer, currlen, maxlen, ' ');
++padlen; ++padlen;
} }
} }
static void static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
{ {
if (*currlen < maxlen) if (*currlen < maxlen) {
buffer[(*currlen)++] = c; buffer[(*currlen)] = c;
}
(*currlen)++;
} }
#endif /* !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) */ #endif /* !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) */
#ifndef HAVE_VSNPRINTF #if !defined(HAVE_VSNPRINTF)
int int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
vsnprintf(char *str, size_t count, const char *fmt, va_list args)
{ {
str[0] = 0; return dopr(str, count, fmt, args);
dopr(str, count, fmt, args);
return(strlen(str));
} }
#endif /* !HAVE_VSNPRINTF */ #endif
#ifndef HAVE_SNPRINTF #if !defined(HAVE_SNPRINTF)
int int snprintf(char *str,size_t count,const char *fmt,...)
snprintf(char *str,size_t count,const char *fmt,...)
{ {
size_t ret;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
(void) vsnprintf(str, count, fmt, ap); ret = vsnprintf(str, count, fmt, ap);
va_end(ap); va_end(ap);
return ret;
return(strlen(str));
} }
#endif
#endif /* !HAVE_SNPRINTF */

10
openbsd-compat/openbsd-compat.h
View File

@ -1,4 +1,4 @@
/* $Id: openbsd-compat.h,v 1.31 2005/09/29 23:55:50 dtucker Exp $ */ /* $Id: openbsd-compat.h,v 1.32 2005/11/24 08:58:21 djm Exp $ */
/* /*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved. * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@ -142,6 +142,10 @@ unsigned int arc4random(void);
void arc4random_stir(void); void arc4random_stir(void);
#endif /* !HAVE_ARC4RANDOM */ #endif /* !HAVE_ARC4RANDOM */
#ifndef HAVE_ASPRINTF
int asprintf(char **, const char *, ...);
#endif
#ifndef HAVE_OPENPTY #ifndef HAVE_OPENPTY
int openpty(int *, int *, char *, struct termios *, struct winsize *); int openpty(int *, int *, char *, struct termios *, struct winsize *);
#endif /* HAVE_OPENPTY */ #endif /* HAVE_OPENPTY */
@ -160,6 +164,10 @@ long long strtoll(const char *, char **, int);
long long strtonum(const char *, long long, long long, const char **); long long strtonum(const char *, long long, long long, const char **);
#endif #endif
#ifndef HAVE_VASPRINTF
int vasprintf(char **, const char *, va_list);
#endif
#ifndef HAVE_VSNPRINTF #ifndef HAVE_VSNPRINTF
int vsnprintf(char *, size_t, const char *, va_list); int vsnprintf(char *, size_t, const char *, va_list);
#endif #endif