1999-08-13 01:45:20 -04:00
|
|
|
/*-
|
|
|
|
* 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.
|
2005-06-30 23:25:46 -04:00
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
1999-08-13 01:45:20 -04:00
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2000-12-18 04:46:21 -05:00
|
|
|
/*
|
|
|
|
* IMPORTANT NOTE:
|
|
|
|
* --------------
|
|
|
|
* From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
|
|
|
|
* paragraph 3 above is now null and void.
|
|
|
|
*/
|
|
|
|
|
2010-05-29 14:51:39 -04:00
|
|
|
/* SNPRINTF.C
|
1999-08-13 01:45:20 -04:00
|
|
|
* fjc 7-31-97 Modified by Mib Software to be a standalone snprintf.c module.
|
|
|
|
* http://www.mibsoftware.com
|
|
|
|
* Mib Software does not warrant this software any differently than the
|
|
|
|
* University of California, Berkeley as described above. All warranties
|
|
|
|
* are disclaimed. Use this software at your own risk.
|
|
|
|
*
|
|
|
|
* All code referencing FILE * functions was eliminated, since it could
|
|
|
|
* never be called. All header files and necessary files are collapsed
|
|
|
|
* into one file, internal functions are declared static. This should
|
|
|
|
* allow inclusion into libraries with less chance of namespace collisions.
|
|
|
|
*
|
|
|
|
* snprintf should be the only externally visible item.
|
2010-05-29 14:51:39 -04:00
|
|
|
*
|
1999-08-13 01:45:20 -04:00
|
|
|
* As of 7-31-97 FLOATING_POINT is NOT provided. The code is somewhat
|
|
|
|
* non-portable, so it is disabled.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Define FLOATING_POINT to get floating point. */
|
|
|
|
/*
|
|
|
|
#define FLOATING_POINT
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#define u_long unsigned long
|
|
|
|
#define u_short unsigned short
|
|
|
|
#define u_int unsigned int
|
|
|
|
|
2005-07-22 21:02:18 -04:00
|
|
|
#if !defined(HAVE_STDARG_PROTOTYPES)
|
1999-08-13 01:45:20 -04:00
|
|
|
#if defined(__STDC__)
|
2005-07-22 21:02:18 -04:00
|
|
|
#define HAVE_STDARG_PROTOTYPES 1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#undef __P
|
|
|
|
#if defined(HAVE_STDARG_PROTOTYPES)
|
1999-08-13 01:45:20 -04:00
|
|
|
# include <stdarg.h>
|
|
|
|
# if !defined(__P)
|
|
|
|
# define __P(x) x
|
|
|
|
# endif
|
|
|
|
#else
|
|
|
|
# define __P(x) ()
|
|
|
|
# if !defined(const)
|
|
|
|
# define const
|
|
|
|
# endif
|
|
|
|
# include <varargs.h>
|
|
|
|
#endif
|
2010-05-29 14:51:39 -04:00
|
|
|
#ifndef _BSD_VA_LIST_
|
1999-08-13 01:45:20 -04:00
|
|
|
#define _BSD_VA_LIST_ va_list
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef __STDC__
|
|
|
|
# include <limits.h>
|
|
|
|
#else
|
|
|
|
# ifndef LONG_MAX
|
|
|
|
# ifdef HAVE_LIMITS_H
|
|
|
|
# include <limits.h>
|
|
|
|
# else
|
2013-10-13 10:53:40 -04:00
|
|
|
/* assuming 32bit(2's complement) long */
|
1999-08-13 01:45:20 -04:00
|
|
|
# define LONG_MAX 2147483647
|
|
|
|
# endif
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
2005-09-06 19:23:04 -04:00
|
|
|
#if defined(__hpux) && !defined(__GNUC__) && !defined(__STDC__)
|
1999-08-13 01:45:20 -04:00
|
|
|
#define const
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(sgi)
|
|
|
|
#undef __const
|
|
|
|
#define __const
|
|
|
|
#endif /* People who don't like const sys_error */
|
|
|
|
|
2001-01-15 02:01:00 -05:00
|
|
|
#include <stddef.h>
|
2005-11-23 00:11:18 -05:00
|
|
|
#if defined(__hpux) && !defined(__GNUC__) || defined(__DECC)
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if !defined(__CYGWIN32__) && defined(__hpux) && !defined(__GNUC__)
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
#ifndef NULL
|
|
|
|
#define NULL 0
|
|
|
|
#endif
|
|
|
|
|
2009-05-22 11:22:36 -04:00
|
|
|
#if SIZEOF_LONG > SIZEOF_INT
|
|
|
|
# include <errno.h>
|
|
|
|
#endif
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
/*
|
|
|
|
* NB: to fit things in six character monocase externals, the stdio
|
|
|
|
* code uses the prefix `__s' for stdio objects, typically followed
|
|
|
|
* by a three-character attempt at a mnemonic.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* stdio buffers */
|
|
|
|
struct __sbuf {
|
|
|
|
unsigned char *_base;
|
2008-07-21 02:29:35 -04:00
|
|
|
size_t _size;
|
1999-08-13 01:45:20 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* stdio state variables.
|
|
|
|
*
|
|
|
|
* The following always hold:
|
|
|
|
*
|
|
|
|
* if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
|
|
|
|
* _lbfsize is -_bf._size, else _lbfsize is 0
|
|
|
|
* if _flags&__SRD, _w is 0
|
|
|
|
* if _flags&__SWR, _r is 0
|
|
|
|
*
|
|
|
|
* This ensures that the getc and putc macros (or inline functions) never
|
|
|
|
* try to write or read from a file that is in `read' or `write' mode.
|
|
|
|
* (Moreover, they can, and do, automatically switch from read mode to
|
|
|
|
* write mode, and back, on "r+" and "w+" files.)
|
|
|
|
*
|
|
|
|
* _lbfsize is used only to make the inline line-buffered output stream
|
|
|
|
* code as compact as possible.
|
|
|
|
*
|
|
|
|
* _ub, _up, and _ur are used when ungetc() pushes back more characters
|
|
|
|
* than fit in the current _bf, or when ungetc() pushes back a character
|
|
|
|
* that does not match the previous one in _bf. When this happens,
|
|
|
|
* _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
|
|
|
|
* _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
|
|
|
|
*
|
|
|
|
* NB: see WARNING above before changing the layout of this structure!
|
|
|
|
*/
|
|
|
|
typedef struct __sFILE {
|
|
|
|
unsigned char *_p; /* current position in (some) buffer */
|
2005-07-22 21:02:18 -04:00
|
|
|
#if 0
|
2008-07-21 02:29:35 -04:00
|
|
|
size_t _r; /* read space left for getc() */
|
2005-07-22 21:02:18 -04:00
|
|
|
#endif
|
2008-07-21 02:29:35 -04:00
|
|
|
size_t _w; /* write space left for putc() */
|
1999-08-13 01:45:20 -04:00
|
|
|
short _flags; /* flags, below; this FILE is free if 0 */
|
|
|
|
short _file; /* fileno, if Unix descriptor, else -1 */
|
|
|
|
struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */
|
2017-05-23 07:35:54 -04:00
|
|
|
#if 0
|
2008-07-21 02:29:35 -04:00
|
|
|
size_t _lbfsize; /* 0 or -_bf._size, for inline putc */
|
2017-05-23 07:35:54 -04:00
|
|
|
#endif
|
2005-07-22 21:02:18 -04:00
|
|
|
int (*vwrite)(/* struct __sFILE*, struct __suio * */);
|
2015-09-28 12:11:41 -04:00
|
|
|
const char *(*vextra)(/* struct __sFILE*, size_t, void*, long*, int */);
|
1999-08-13 01:45:20 -04:00
|
|
|
} FILE;
|
|
|
|
|
|
|
|
|
|
|
|
#define __SLBF 0x0001 /* line buffered */
|
|
|
|
#define __SNBF 0x0002 /* unbuffered */
|
|
|
|
#define __SRD 0x0004 /* OK to read */
|
|
|
|
#define __SWR 0x0008 /* OK to write */
|
|
|
|
/* RD and WR are never simultaneously asserted */
|
|
|
|
#define __SRW 0x0010 /* open for reading & writing */
|
|
|
|
#define __SEOF 0x0020 /* found EOF */
|
|
|
|
#define __SERR 0x0040 /* found error */
|
|
|
|
#define __SMBF 0x0080 /* _buf is from malloc */
|
|
|
|
#define __SAPP 0x0100 /* fdopen()ed in append mode */
|
|
|
|
#define __SSTR 0x0200 /* this is an sprintf/snprintf string */
|
|
|
|
#define __SOPT 0x0400 /* do fseek() optimisation */
|
|
|
|
#define __SNPT 0x0800 /* do not do fseek() optimisation */
|
|
|
|
#define __SOFF 0x1000 /* set iff _offset is in fact correct */
|
|
|
|
#define __SMOD 0x2000 /* true => fgetln modified _p text */
|
|
|
|
|
|
|
|
|
|
|
|
#define EOF (-1)
|
|
|
|
|
|
|
|
|
2011-11-01 00:31:52 -04:00
|
|
|
#define BSD__sfeof(p) (((p)->_flags & __SEOF) != 0)
|
|
|
|
#define BSD__sferror(p) (((p)->_flags & __SERR) != 0)
|
|
|
|
#define BSD__sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF)))
|
|
|
|
#define BSD__sfileno(p) ((p)->_file)
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2005-11-23 00:11:18 -05:00
|
|
|
#undef feof
|
|
|
|
#undef ferror
|
|
|
|
#undef clearerr
|
2011-11-01 00:31:52 -04:00
|
|
|
#define feof(p) BSD__sfeof(p)
|
|
|
|
#define ferror(p) BSD__sferror(p)
|
|
|
|
#define clearerr(p) BSD__sclearerr(p)
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
#ifndef _ANSI_SOURCE
|
2011-11-01 00:31:52 -04:00
|
|
|
#define fileno(p) BSD__sfileno(p)
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* I/O descriptors for __sfvwrite().
|
|
|
|
*/
|
|
|
|
struct __siov {
|
2008-05-31 05:28:20 -04:00
|
|
|
const void *iov_base;
|
1999-08-13 01:45:20 -04:00
|
|
|
size_t iov_len;
|
|
|
|
};
|
|
|
|
struct __suio {
|
|
|
|
struct __siov *uio_iov;
|
|
|
|
int uio_iovcnt;
|
2009-05-21 08:07:25 -04:00
|
|
|
size_t uio_resid;
|
1999-08-13 01:45:20 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Write some memory regions. Return zero on success, EOF on error.
|
|
|
|
*
|
|
|
|
* This routine is large and unsightly, but most of the ugliness due
|
|
|
|
* to the three different kinds of output buffering is handled here.
|
|
|
|
*/
|
2012-08-15 20:46:12 -04:00
|
|
|
static int
|
|
|
|
BSD__sfvwrite(register FILE *fp, register struct __suio *uio)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
register size_t len;
|
2008-10-26 02:05:21 -04:00
|
|
|
register const char *p;
|
1999-08-13 01:45:20 -04:00
|
|
|
register struct __siov *iov;
|
* array.c, bignum.c, dln.c, error.c, gc.c, io.c, marshal.c,
numeric.c, pack.c, strftime.c, string.c, thread.c, transcode.c,
transcode_data.h, util.c, variable.c, vm_dump.c,
include/ruby/encoding.h, missing/crypt.c, missing/vsnprintf.c:
suppress VC type warnings. [ruby-core:22726]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-12 05:16:15 -04:00
|
|
|
register size_t w;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
if ((len = uio->uio_resid) == 0)
|
|
|
|
return (0);
|
|
|
|
#ifndef __hpux
|
|
|
|
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
|
|
|
#endif
|
|
|
|
#define COPY(n) (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n))
|
|
|
|
|
|
|
|
iov = uio->uio_iov;
|
|
|
|
p = iov->iov_base;
|
|
|
|
len = iov->iov_len;
|
|
|
|
iov++;
|
|
|
|
#define GETIOV(extra_work) \
|
|
|
|
while (len == 0) { \
|
|
|
|
extra_work; \
|
|
|
|
p = iov->iov_base; \
|
|
|
|
len = iov->iov_len; \
|
|
|
|
iov++; \
|
|
|
|
}
|
|
|
|
if (fp->_flags & __SNBF) {
|
|
|
|
/* fjc 7-31-97 Will never happen. We are working with
|
|
|
|
strings only
|
|
|
|
*/
|
|
|
|
} else if ((fp->_flags & __SLBF) == 0) {
|
|
|
|
/*
|
|
|
|
* Fully buffered: fill partially full buffer, if any,
|
|
|
|
* and then flush. If there is no partial buffer, write
|
|
|
|
* one _bf._size byte chunk directly (without copying).
|
|
|
|
*
|
|
|
|
* String output is a special case: write as many bytes
|
|
|
|
* as fit, but pretend we wrote everything. This makes
|
|
|
|
* snprintf() return the number of bytes needed, rather
|
|
|
|
* than the number used, and avoids its write function
|
|
|
|
* (so that the write function can be invalid).
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
GETIOV(;);
|
|
|
|
w = fp->_w;
|
|
|
|
if (fp->_flags & __SSTR) {
|
|
|
|
if (len < w)
|
|
|
|
w = len;
|
|
|
|
COPY(w); /* copy MIN(fp->_w,len), */
|
|
|
|
fp->_w -= w;
|
|
|
|
fp->_p += w;
|
|
|
|
w = len; /* but pretend copied all */
|
|
|
|
} else {
|
|
|
|
/* fjc 7-31-97 Will never happen. We are working with
|
|
|
|
strings only
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
p += w;
|
|
|
|
len -= w;
|
|
|
|
} while ((uio->uio_resid -= w) != 0);
|
|
|
|
} else {
|
|
|
|
/* fjc 7-31-97 Will never happen. We are working with
|
|
|
|
strings only
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Actual printf innards.
|
|
|
|
*
|
|
|
|
* This code is large and complicated...
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Flush out all the vectors defined by the given uio,
|
|
|
|
* then reset it so that it can be reused.
|
|
|
|
*/
|
|
|
|
static int
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
BSD__sprint(FILE *fp, register struct __suio *uio)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
register int err;
|
|
|
|
|
|
|
|
if (uio->uio_resid == 0) {
|
|
|
|
uio->uio_iovcnt = 0;
|
|
|
|
return (0);
|
|
|
|
}
|
2005-08-22 07:12:10 -04:00
|
|
|
err = (*fp->vwrite)(fp, uio);
|
1999-08-13 01:45:20 -04:00
|
|
|
uio->uio_resid = 0;
|
|
|
|
uio->uio_iovcnt = 0;
|
|
|
|
return (err);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper function for `fprintf to unbuffered unix file': creates a
|
|
|
|
* temporary buffer. We only work on write-only files; this avoids
|
|
|
|
* worries about ungetc buffers and so forth.
|
|
|
|
*/
|
|
|
|
static int
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
BSD__sbprintf(register FILE *fp, const char *fmt, va_list ap)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
/* We don't support files. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Macros for converting digits to letters and vice versa
|
|
|
|
*/
|
|
|
|
#define to_digit(c) ((c) - '0')
|
|
|
|
#define is_digit(c) ((unsigned)to_digit(c) <= 9)
|
* array.c, bignum.c, dln.c, error.c, gc.c, io.c, marshal.c,
numeric.c, pack.c, strftime.c, string.c, thread.c, transcode.c,
transcode_data.h, util.c, variable.c, vm_dump.c,
include/ruby/encoding.h, missing/crypt.c, missing/vsnprintf.c:
suppress VC type warnings. [ruby-core:22726]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-12 05:16:15 -04:00
|
|
|
#define to_char(n) (char)((n) + '0')
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2006-07-18 02:22:28 -04:00
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
/*
|
|
|
|
* Convert an unsigned long long to ASCII for printf purposes, returning
|
|
|
|
* a pointer to the first character of the string representation.
|
|
|
|
* Octal numbers can be forced to have a leading zero; hex numbers
|
|
|
|
* use the given digits.
|
|
|
|
*/
|
|
|
|
static char *
|
2008-07-01 04:56:37 -04:00
|
|
|
BSD__uqtoa(register u_quad_t val, char *endp, int base, int octzero, const char *xdigs)
|
2006-07-18 02:22:28 -04:00
|
|
|
{
|
|
|
|
register char *cp = endp;
|
2010-12-30 13:53:41 -05:00
|
|
|
register quad_t sval;
|
2006-07-18 02:22:28 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle the three cases separately, in the hope of getting
|
|
|
|
* better/faster code.
|
|
|
|
*/
|
|
|
|
switch (base) {
|
|
|
|
case 10:
|
|
|
|
if (val < 10) { /* many numbers are 1 digit */
|
|
|
|
*--cp = to_char(val);
|
|
|
|
return (cp);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* On many machines, unsigned arithmetic is harder than
|
|
|
|
* signed arithmetic, so we do at most one unsigned mod and
|
|
|
|
* divide; this is sufficient to reduce the range of
|
|
|
|
* the incoming value to where signed arithmetic works.
|
|
|
|
*/
|
|
|
|
if (val > LLONG_MAX) {
|
|
|
|
*--cp = to_char(val % 10);
|
|
|
|
sval = val / 10;
|
|
|
|
} else
|
|
|
|
sval = val;
|
|
|
|
do {
|
|
|
|
*--cp = to_char(sval % 10);
|
|
|
|
sval /= 10;
|
|
|
|
} while (sval != 0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 8:
|
|
|
|
do {
|
|
|
|
*--cp = to_char(val & 7);
|
|
|
|
val >>= 3;
|
|
|
|
} while (val);
|
|
|
|
if (octzero && *cp != '0')
|
|
|
|
*--cp = '0';
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 16:
|
|
|
|
do {
|
|
|
|
*--cp = xdigs[val & 15];
|
|
|
|
val >>= 4;
|
|
|
|
} while (val);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default: /* oops */
|
2010-05-29 14:51:39 -04:00
|
|
|
/*
|
2006-07-18 02:22:28 -04:00
|
|
|
abort();
|
|
|
|
*/
|
|
|
|
break; /* fjc 7-31-97. Don't reference abort() here */
|
|
|
|
}
|
|
|
|
return (cp);
|
|
|
|
}
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
/*
|
|
|
|
* Convert an unsigned long to ASCII for printf purposes, returning
|
|
|
|
* a pointer to the first character of the string representation.
|
|
|
|
* Octal numbers can be forced to have a leading zero; hex numbers
|
|
|
|
* use the given digits.
|
|
|
|
*/
|
|
|
|
static char *
|
2008-05-31 05:28:20 -04:00
|
|
|
BSD__ultoa(register u_long val, char *endp, int base, int octzero, const char *xdigs)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
register char *cp = endp;
|
|
|
|
register long sval;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle the three cases separately, in the hope of getting
|
|
|
|
* better/faster code.
|
|
|
|
*/
|
|
|
|
switch (base) {
|
|
|
|
case 10:
|
|
|
|
if (val < 10) { /* many numbers are 1 digit */
|
|
|
|
*--cp = to_char(val);
|
|
|
|
return (cp);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* On many machines, unsigned arithmetic is harder than
|
|
|
|
* signed arithmetic, so we do at most one unsigned mod and
|
|
|
|
* divide; this is sufficient to reduce the range of
|
|
|
|
* the incoming value to where signed arithmetic works.
|
|
|
|
*/
|
|
|
|
if (val > LONG_MAX) {
|
|
|
|
*--cp = to_char(val % 10);
|
|
|
|
sval = val / 10;
|
|
|
|
} else
|
|
|
|
sval = val;
|
|
|
|
do {
|
|
|
|
*--cp = to_char(sval % 10);
|
|
|
|
sval /= 10;
|
|
|
|
} while (sval != 0);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 8:
|
|
|
|
do {
|
|
|
|
*--cp = to_char(val & 7);
|
|
|
|
val >>= 3;
|
|
|
|
} while (val);
|
|
|
|
if (octzero && *cp != '0')
|
|
|
|
*--cp = '0';
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 16:
|
|
|
|
do {
|
|
|
|
*--cp = xdigs[val & 15];
|
|
|
|
val >>= 4;
|
|
|
|
} while (val);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default: /* oops */
|
2010-05-29 14:51:39 -04:00
|
|
|
/*
|
1999-08-13 01:45:20 -04:00
|
|
|
abort();
|
|
|
|
*/
|
|
|
|
break; /* fjc 7-31-97. Don't reference abort() here */
|
|
|
|
}
|
|
|
|
return (cp);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
#include <math.h>
|
2013-09-12 07:07:30 -04:00
|
|
|
#include <float.h>
|
1999-08-13 01:45:20 -04:00
|
|
|
/* #include "floatio.h" */
|
|
|
|
|
|
|
|
#ifndef MAXEXP
|
2013-09-12 07:07:30 -04:00
|
|
|
# if DBL_MAX_10_EXP > -DBL_MIN_10_EXP
|
|
|
|
# define MAXEXP (DBL_MAX_10_EXP)
|
|
|
|
# else
|
|
|
|
# define MAXEXP (-DBL_MIN_10_EXP)
|
|
|
|
# endif
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef MAXFRACT
|
2013-09-12 07:07:30 -04:00
|
|
|
# define MAXFRACT (MAXEXP*10/3)
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#define BUF (MAXEXP+MAXFRACT+1) /* + decimal point */
|
|
|
|
#define DEFPREC 6
|
|
|
|
|
2012-08-15 20:46:12 -04:00
|
|
|
static char *cvt(double, int, int, char *, int *, int, int *, char *);
|
|
|
|
static int exponent(char *, int, int);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
#else /* no FLOATING_POINT */
|
|
|
|
|
|
|
|
#define BUF 68
|
|
|
|
|
|
|
|
#endif /* FLOATING_POINT */
|
|
|
|
|
2015-02-13 02:07:39 -05:00
|
|
|
#ifndef lower_hexdigits
|
|
|
|
# define lower_hexdigits "0123456789abcdef"
|
|
|
|
#endif
|
|
|
|
#ifndef upper_hexdigits
|
|
|
|
# define upper_hexdigits "0123456789ABCDEF"
|
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Flags used during conversion.
|
|
|
|
*/
|
|
|
|
#define ALT 0x001 /* alternate form */
|
|
|
|
#define HEXPREFIX 0x002 /* add 0x or 0X prefix */
|
|
|
|
#define LADJUST 0x004 /* left adjustment */
|
|
|
|
#define LONGDBL 0x008 /* long double; unimplemented */
|
|
|
|
#define LONGINT 0x010 /* long integer */
|
|
|
|
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
#define QUADINT 0x020 /* quad integer */
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
|
|
|
|
|
|
|
#define SHORTINT 0x040 /* short integer */
|
|
|
|
#define ZEROPAD 0x080 /* zero (as opposed to blank) pad */
|
|
|
|
#define FPT 0x100 /* Floating point number */
|
2019-04-24 01:53:47 -04:00
|
|
|
ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS(static ssize_t BSD_vfprintf(FILE *fp, const char *fmt0, va_list ap));
|
2009-05-21 08:07:25 -04:00
|
|
|
static ssize_t
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-09 17:20:17 -04:00
|
|
|
BSD_vfprintf(FILE *fp, const char *fmt0, va_list ap)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2016-06-17 22:25:27 -04:00
|
|
|
#ifdef PRI_EXTRA_MARK
|
|
|
|
const int PRI_EXTRA_MARK_LEN = rb_strlen_lit(PRI_EXTRA_MARK);
|
|
|
|
#endif
|
2008-05-31 05:28:20 -04:00
|
|
|
register const char *fmt; /* format string */
|
1999-08-13 01:45:20 -04:00
|
|
|
register int ch; /* character from fmt */
|
|
|
|
register int n; /* handy integer (short term usage) */
|
2008-05-31 05:28:20 -04:00
|
|
|
register const char *cp;/* handy char pointer (short term usage) */
|
1999-08-13 01:45:20 -04:00
|
|
|
register struct __siov *iovp;/* for PRINT macro */
|
|
|
|
register int flags; /* flags as above */
|
2009-05-21 08:07:25 -04:00
|
|
|
ssize_t ret; /* return value accumulator */
|
1999-08-13 01:45:20 -04:00
|
|
|
int width; /* width from format (%8d), or 0 */
|
|
|
|
int prec; /* precision from format (%.3d), or -1 */
|
|
|
|
char sign; /* sign prefix (' ', '+', '-', or \0) */
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
char softsign; /* temporary negative sign for floats */
|
2008-08-13 23:20:38 -04:00
|
|
|
double _double = 0; /* double precision arguments %[eEfgG] */
|
1999-08-13 01:45:20 -04:00
|
|
|
int expt; /* integer value of exponent */
|
2008-08-13 23:20:38 -04:00
|
|
|
int expsize = 0; /* character count for expstr */
|
|
|
|
int ndig = 0; /* actual number of digits returned by cvt */
|
2013-09-12 07:07:30 -04:00
|
|
|
int fprec = 0; /* floating point precision */
|
1999-08-13 01:45:20 -04:00
|
|
|
char expstr[7]; /* buffer for exponent string */
|
|
|
|
#endif
|
2016-09-16 02:15:55 -04:00
|
|
|
u_long MAYBE_UNUSED(ulval); /* integer arguments %[diouxX] */
|
1999-08-13 01:45:20 -04:00
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
2016-09-16 02:15:55 -04:00
|
|
|
u_quad_t MAYBE_UNUSED(uqval); /* %q integers */
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
|
|
|
int base; /* base for [diouxX] conversion */
|
|
|
|
int dprec; /* a copy of prec if [diouxX], 0 otherwise */
|
2009-05-21 08:07:25 -04:00
|
|
|
long fieldsz; /* field size expanded by sign, etc */
|
|
|
|
long realsz; /* field size expanded by dprec */
|
1999-08-13 01:45:20 -04:00
|
|
|
int size; /* size of converted field or string */
|
2008-05-31 05:28:20 -04:00
|
|
|
const char *xdigs = 0; /* digits for [xX] conversion */
|
1999-08-13 01:45:20 -04:00
|
|
|
#define NIOV 8
|
|
|
|
struct __suio uio; /* output information: summary */
|
|
|
|
struct __siov iov[NIOV];/* ... and individual io vectors */
|
|
|
|
char buf[BUF]; /* space for %c, %[diouxX], %[eEfgG] */
|
2010-04-01 00:32:57 -04:00
|
|
|
char ox[4]; /* space for 0x hex-prefix, hexadecimal's 1. */
|
2008-05-31 05:28:20 -04:00
|
|
|
char *const ebuf = buf + sizeof(buf);
|
2009-05-21 08:07:25 -04:00
|
|
|
#if SIZEOF_LONG > SIZEOF_INT
|
|
|
|
long ln;
|
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Choose PADSIZE to trade efficiency vs. size. If larger printf
|
2008-06-04 05:37:38 -04:00
|
|
|
* fields occur frequently, increase PADSIZE and make the initializers
|
1999-08-13 01:45:20 -04:00
|
|
|
* below longer.
|
|
|
|
*/
|
|
|
|
#define PADSIZE 16 /* pad chunk size */
|
2008-07-01 04:44:32 -04:00
|
|
|
static const char blanks[PADSIZE] =
|
1999-08-13 01:45:20 -04:00
|
|
|
{' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
|
2008-07-01 04:44:32 -04:00
|
|
|
static const char zeroes[PADSIZE] =
|
1999-08-13 01:45:20 -04:00
|
|
|
{'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* BEWARE, these `goto error' on error, and PAD uses `n'.
|
|
|
|
*/
|
|
|
|
#define PRINT(ptr, len) { \
|
|
|
|
iovp->iov_base = (ptr); \
|
|
|
|
iovp->iov_len = (len); \
|
|
|
|
uio.uio_resid += (len); \
|
|
|
|
iovp++; \
|
|
|
|
if (++uio.uio_iovcnt >= NIOV) { \
|
|
|
|
if (BSD__sprint(fp, &uio)) \
|
|
|
|
goto error; \
|
|
|
|
iovp = iov; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
#define PAD(howmany, with) { \
|
|
|
|
if ((n = (howmany)) > 0) { \
|
|
|
|
while (n > PADSIZE) { \
|
2011-01-16 06:56:18 -05:00
|
|
|
PRINT((with), PADSIZE); \
|
1999-08-13 01:45:20 -04:00
|
|
|
n -= PADSIZE; \
|
|
|
|
} \
|
2011-01-16 06:56:18 -05:00
|
|
|
PRINT((with), n); \
|
1999-08-13 01:45:20 -04:00
|
|
|
} \
|
|
|
|
}
|
2009-05-21 08:07:25 -04:00
|
|
|
#if SIZEOF_LONG > SIZEOF_INT
|
|
|
|
/* abandon if too larger padding */
|
|
|
|
#define PAD_L(howmany, with) { \
|
2009-05-22 11:22:36 -04:00
|
|
|
ln = (howmany); \
|
2009-05-21 08:07:25 -04:00
|
|
|
if ((long)((int)ln) != ln) { \
|
|
|
|
errno = ENOMEM; \
|
|
|
|
goto error; \
|
|
|
|
} \
|
2011-01-16 06:56:18 -05:00
|
|
|
if (ln > 0) PAD((int)ln, (with)); \
|
2009-05-21 08:07:25 -04:00
|
|
|
}
|
|
|
|
#else
|
2011-01-16 06:56:18 -05:00
|
|
|
#define PAD_L(howmany, with) PAD((howmany), (with))
|
2009-05-21 08:07:25 -04:00
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
#define FLUSH() { \
|
|
|
|
if (uio.uio_resid && BSD__sprint(fp, &uio)) \
|
|
|
|
goto error; \
|
|
|
|
uio.uio_iovcnt = 0; \
|
|
|
|
iovp = iov; \
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* To extend shorts properly, we need both signed and unsigned
|
|
|
|
* argument extraction methods.
|
|
|
|
*/
|
|
|
|
#define SARG() \
|
|
|
|
(flags&LONGINT ? va_arg(ap, long) : \
|
|
|
|
flags&SHORTINT ? (long)(short)va_arg(ap, int) : \
|
|
|
|
(long)va_arg(ap, int))
|
|
|
|
#define UARG() \
|
|
|
|
(flags&LONGINT ? va_arg(ap, u_long) : \
|
|
|
|
flags&SHORTINT ? (u_long)(u_short)va_arg(ap, int) : \
|
|
|
|
(u_long)va_arg(ap, u_int))
|
|
|
|
|
2015-12-13 21:51:13 -05:00
|
|
|
/* optimize fprintf(stderr) (and other unbuffered Unix files) */
|
1999-08-13 01:45:20 -04:00
|
|
|
if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
|
|
|
|
fp->_file >= 0)
|
|
|
|
return (BSD__sbprintf(fp, fmt0, ap));
|
|
|
|
|
2008-05-31 05:28:20 -04:00
|
|
|
fmt = fmt0;
|
1999-08-13 01:45:20 -04:00
|
|
|
uio.uio_iov = iovp = iov;
|
|
|
|
uio.uio_resid = 0;
|
|
|
|
uio.uio_iovcnt = 0;
|
|
|
|
ret = 0;
|
2008-07-21 02:29:35 -04:00
|
|
|
xdigs = 0;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Scan the format for conversions (`%' character).
|
|
|
|
*/
|
|
|
|
for (;;) {
|
2009-05-21 08:07:25 -04:00
|
|
|
size_t nc;
|
1999-08-13 01:45:20 -04:00
|
|
|
for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
|
|
|
|
/* void */;
|
2009-05-21 08:07:25 -04:00
|
|
|
if ((nc = fmt - cp) != 0) {
|
|
|
|
PRINT(cp, nc);
|
|
|
|
ret += nc;
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
if (ch == '\0')
|
|
|
|
goto done;
|
|
|
|
fmt++; /* skip over '%' */
|
|
|
|
|
|
|
|
flags = 0;
|
|
|
|
dprec = 0;
|
|
|
|
width = 0;
|
|
|
|
prec = -1;
|
|
|
|
sign = '\0';
|
|
|
|
|
|
|
|
rflag: ch = *fmt++;
|
|
|
|
reswitch: switch (ch) {
|
|
|
|
case ' ':
|
|
|
|
/*
|
|
|
|
* ``If the space and + flags both appear, the space
|
|
|
|
* flag will be ignored.''
|
|
|
|
* -- ANSI X3J11
|
|
|
|
*/
|
|
|
|
if (!sign)
|
|
|
|
sign = ' ';
|
|
|
|
goto rflag;
|
|
|
|
case '#':
|
|
|
|
flags |= ALT;
|
|
|
|
goto rflag;
|
|
|
|
case '*':
|
|
|
|
/*
|
|
|
|
* ``A negative field width argument is taken as a
|
|
|
|
* - flag followed by a positive field width.''
|
|
|
|
* -- ANSI X3J11
|
|
|
|
* They don't exclude field widths read from args.
|
|
|
|
*/
|
|
|
|
if ((width = va_arg(ap, int)) >= 0)
|
|
|
|
goto rflag;
|
|
|
|
width = -width;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case '-':
|
|
|
|
flags |= LADJUST;
|
|
|
|
goto rflag;
|
|
|
|
case '+':
|
|
|
|
sign = '+';
|
|
|
|
goto rflag;
|
|
|
|
case '.':
|
|
|
|
if ((ch = *fmt++) == '*') {
|
|
|
|
n = va_arg(ap, int);
|
|
|
|
prec = n < 0 ? -1 : n;
|
|
|
|
goto rflag;
|
|
|
|
}
|
|
|
|
n = 0;
|
|
|
|
while (is_digit(ch)) {
|
|
|
|
n = 10 * n + to_digit(ch);
|
|
|
|
ch = *fmt++;
|
|
|
|
}
|
|
|
|
prec = n < 0 ? -1 : n;
|
|
|
|
goto reswitch;
|
|
|
|
case '0':
|
|
|
|
/*
|
|
|
|
* ``Note that 0 is taken as a flag, not as the
|
|
|
|
* beginning of a field width.''
|
|
|
|
* -- ANSI X3J11
|
|
|
|
*/
|
|
|
|
flags |= ZEROPAD;
|
|
|
|
goto rflag;
|
|
|
|
case '1': case '2': case '3': case '4':
|
|
|
|
case '5': case '6': case '7': case '8': case '9':
|
|
|
|
n = 0;
|
|
|
|
do {
|
|
|
|
n = 10 * n + to_digit(ch);
|
|
|
|
ch = *fmt++;
|
|
|
|
} while (is_digit(ch));
|
|
|
|
width = n;
|
|
|
|
goto reswitch;
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
case 'L':
|
|
|
|
flags |= LONGDBL;
|
|
|
|
goto rflag;
|
|
|
|
#endif
|
|
|
|
case 'h':
|
|
|
|
flags |= SHORTINT;
|
|
|
|
goto rflag;
|
2009-02-23 23:13:53 -05:00
|
|
|
#if SIZEOF_PTRDIFF_T == SIZEOF_LONG
|
2009-02-03 20:16:14 -05:00
|
|
|
case 't':
|
2009-05-21 08:07:25 -04:00
|
|
|
#endif
|
|
|
|
#if SIZEOF_SIZE_T == SIZEOF_LONG
|
|
|
|
case 'z':
|
2009-02-23 23:13:53 -05:00
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
case 'l':
|
2011-11-01 00:31:52 -04:00
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
if (*fmt == 'l') {
|
|
|
|
fmt++;
|
|
|
|
flags |= QUADINT;
|
|
|
|
} else {
|
|
|
|
flags |= LONGINT;
|
|
|
|
}
|
|
|
|
#else
|
1999-08-13 01:45:20 -04:00
|
|
|
flags |= LONGINT;
|
2011-11-01 00:31:52 -04:00
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
goto rflag;
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
2009-02-23 23:13:53 -05:00
|
|
|
#if SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
|
|
|
|
case 't':
|
2009-05-21 08:07:25 -04:00
|
|
|
#endif
|
|
|
|
#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
|
|
|
|
case 'z':
|
2009-02-23 23:13:53 -05:00
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
case 'q':
|
|
|
|
flags |= QUADINT;
|
|
|
|
goto rflag;
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
2010-12-18 07:55:06 -05:00
|
|
|
#ifdef _WIN32
|
2010-11-23 22:50:03 -05:00
|
|
|
case 'I':
|
|
|
|
if (*fmt == '3' && *(fmt + 1) == '2') {
|
|
|
|
fmt += 2;
|
|
|
|
flags |= LONGINT;
|
|
|
|
}
|
2010-11-24 01:18:43 -05:00
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
2010-11-23 22:50:03 -05:00
|
|
|
else if (*fmt == '6' && *(fmt + 1) == '4') {
|
|
|
|
fmt += 2;
|
|
|
|
flags |= QUADINT;
|
|
|
|
}
|
2010-11-24 01:18:43 -05:00
|
|
|
#endif
|
2010-11-23 22:50:03 -05:00
|
|
|
else
|
2010-11-24 01:18:43 -05:00
|
|
|
#if defined(_HAVE_SANE_QUAD_) && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
|
2010-11-23 22:50:03 -05:00
|
|
|
flags |= QUADINT;
|
|
|
|
#else
|
|
|
|
flags |= LONGINT;
|
|
|
|
#endif
|
|
|
|
goto rflag;
|
|
|
|
#endif
|
1999-08-13 01:45:20 -04:00
|
|
|
case 'c':
|
2008-05-31 05:28:20 -04:00
|
|
|
cp = buf;
|
|
|
|
*buf = (char)va_arg(ap, int);
|
1999-08-13 01:45:20 -04:00
|
|
|
size = 1;
|
|
|
|
sign = '\0';
|
|
|
|
break;
|
2012-05-24 10:36:54 -04:00
|
|
|
case 'i':
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
# define INTPTR_MASK (QUADINT|LONGINT|SHORTINT)
|
|
|
|
#else
|
|
|
|
# define INTPTR_MASK (LONGINT|SHORTINT)
|
|
|
|
#endif
|
|
|
|
#if defined _HAVE_SANE_QUAD_ && SIZEOF_VOIDP == SIZEOF_LONG_LONG
|
|
|
|
# define INTPTR_FLAG QUADINT
|
|
|
|
#elif SIZEOF_VOIDP == SIZEOF_LONG
|
|
|
|
# define INTPTR_FLAG LONGINT
|
|
|
|
#else
|
|
|
|
# define INTPTR_FLAG 0
|
|
|
|
#endif
|
2014-11-03 22:51:33 -05:00
|
|
|
#ifdef PRI_EXTRA_MARK
|
|
|
|
# define IS_PRI_EXTRA_MARK(s) \
|
|
|
|
(PRI_EXTRA_MARK_LEN < 1 || \
|
|
|
|
(*(s) == PRI_EXTRA_MARK[0] && \
|
|
|
|
(PRI_EXTRA_MARK_LEN == 1 || \
|
|
|
|
strncmp((s)+1, PRI_EXTRA_MARK+1, \
|
|
|
|
PRI_EXTRA_MARK_LEN-1) == 0)))
|
|
|
|
#else
|
|
|
|
# define PRI_EXTRA_MARK_LEN 0
|
|
|
|
# define IS_PRI_EXTRA_MARK(s) 1
|
|
|
|
#endif
|
|
|
|
if (fp->vextra && (flags & INTPTR_MASK) == INTPTR_FLAG &&
|
|
|
|
IS_PRI_EXTRA_MARK(fmt)) {
|
|
|
|
fmt += PRI_EXTRA_MARK_LEN;
|
2012-05-24 10:36:54 -04:00
|
|
|
FLUSH();
|
|
|
|
#if defined _HAVE_SANE_QUAD_ && SIZEOF_VOIDP == SIZEOF_LONG_LONG
|
|
|
|
uqval = va_arg(ap, u_quad_t);
|
2012-05-24 12:15:42 -04:00
|
|
|
cp = (*fp->vextra)(fp, sizeof(uqval), &uqval, &fieldsz, sign);
|
2012-05-24 10:36:54 -04:00
|
|
|
#else
|
|
|
|
ulval = va_arg(ap, u_long);
|
2012-05-24 12:15:42 -04:00
|
|
|
cp = (*fp->vextra)(fp, sizeof(ulval), &ulval, &fieldsz, sign);
|
2012-05-24 10:36:54 -04:00
|
|
|
#endif
|
2012-05-24 12:15:42 -04:00
|
|
|
sign = '\0';
|
2012-05-24 10:36:54 -04:00
|
|
|
if (!cp) goto error;
|
|
|
|
if (prec < 0) goto long_len;
|
|
|
|
size = fieldsz < prec ? (int)fieldsz : prec;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
goto decimal;
|
1999-08-13 01:45:20 -04:00
|
|
|
case 'D':
|
|
|
|
flags |= LONGINT;
|
|
|
|
/*FALLTHROUGH*/
|
|
|
|
case 'd':
|
2012-05-24 10:36:54 -04:00
|
|
|
decimal:
|
1999-08-13 01:45:20 -04:00
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
if (flags & QUADINT) {
|
|
|
|
uqval = va_arg(ap, quad_t);
|
|
|
|
if ((quad_t)uqval < 0) {
|
2010-01-09 00:03:26 -05:00
|
|
|
uqval = -(quad_t)uqval;
|
1999-08-13 01:45:20 -04:00
|
|
|
sign = '-';
|
|
|
|
}
|
2005-07-22 21:02:18 -04:00
|
|
|
} else
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
2005-07-22 21:02:18 -04:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
ulval = SARG();
|
|
|
|
if ((long)ulval < 0) {
|
2009-03-10 01:43:14 -04:00
|
|
|
ulval = (u_long)(-(long)ulval);
|
1999-08-13 01:45:20 -04:00
|
|
|
sign = '-';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
base = 10;
|
|
|
|
goto number;
|
|
|
|
#ifdef FLOATING_POINT
|
2010-04-01 00:32:57 -04:00
|
|
|
case 'a':
|
|
|
|
case 'A':
|
2010-11-22 11:06:38 -05:00
|
|
|
if (prec > 0) {
|
2010-10-24 17:21:40 -04:00
|
|
|
flags |= ALT;
|
2010-04-01 00:32:57 -04:00
|
|
|
prec++;
|
2013-09-12 07:07:30 -04:00
|
|
|
fprec = prec;
|
2010-10-24 17:21:40 -04:00
|
|
|
}
|
2010-04-01 00:32:57 -04:00
|
|
|
goto fp_begin;
|
1999-08-13 01:45:20 -04:00
|
|
|
case 'e': /* anomalous precision */
|
|
|
|
case 'E':
|
2008-12-21 22:25:14 -05:00
|
|
|
if (prec != 0)
|
|
|
|
flags |= ALT;
|
1999-08-13 01:45:20 -04:00
|
|
|
prec = (prec == -1) ?
|
2013-09-12 07:07:30 -04:00
|
|
|
DEFPREC + 1 : (fprec = prec + 1);
|
1999-08-13 01:45:20 -04:00
|
|
|
/* FALLTHROUGH */
|
|
|
|
goto fp_begin;
|
|
|
|
case 'f': /* always print trailing zeroes */
|
|
|
|
if (prec != 0)
|
|
|
|
flags |= ALT;
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
if (prec == -1)
|
|
|
|
prec = DEFPREC;
|
2013-09-12 07:07:30 -04:00
|
|
|
else
|
|
|
|
fprec = prec;
|
1999-08-13 01:45:20 -04:00
|
|
|
fp_begin: _double = va_arg(ap, double);
|
|
|
|
/* do this before tricky precision changes */
|
|
|
|
if (isinf(_double)) {
|
|
|
|
if (_double < 0)
|
|
|
|
sign = '-';
|
|
|
|
cp = "Inf";
|
|
|
|
size = 3;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (isnan(_double)) {
|
|
|
|
cp = "NaN";
|
|
|
|
size = 3;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
flags |= FPT;
|
2013-09-12 07:07:30 -04:00
|
|
|
cp = cvt(_double, (prec < MAXFRACT ? prec : MAXFRACT), flags, &softsign,
|
2009-02-20 09:29:00 -05:00
|
|
|
&expt, ch, &ndig, buf);
|
1999-08-13 01:45:20 -04:00
|
|
|
if (ch == 'g' || ch == 'G') {
|
2008-12-21 22:25:14 -05:00
|
|
|
if (expt <= -4 || (expt > prec && expt > 1))
|
1999-08-13 01:45:20 -04:00
|
|
|
ch = (ch == 'g') ? 'e' : 'E';
|
|
|
|
else
|
|
|
|
ch = 'g';
|
2010-05-29 14:51:39 -04:00
|
|
|
}
|
2010-04-01 00:32:57 -04:00
|
|
|
if (ch == 'a' || ch == 'A') {
|
2010-10-18 14:08:58 -04:00
|
|
|
flags |= HEXPREFIX;
|
2010-04-01 00:32:57 -04:00
|
|
|
--expt;
|
|
|
|
expsize = exponent(expstr, expt, ch + 'p' - 'a');
|
2010-10-18 14:08:58 -04:00
|
|
|
ch += 'x' - 'a';
|
2010-04-01 00:32:57 -04:00
|
|
|
size = expsize + ndig;
|
2010-10-19 21:03:18 -04:00
|
|
|
if (ndig > 1 || flags & ALT)
|
2010-10-17 20:59:31 -04:00
|
|
|
++size; /* floating point */
|
2010-04-01 00:32:57 -04:00
|
|
|
}
|
|
|
|
else if (ch <= 'e') { /* 'e' or 'E' fmt */
|
1999-08-13 01:45:20 -04:00
|
|
|
--expt;
|
|
|
|
expsize = exponent(expstr, expt, ch);
|
|
|
|
size = expsize + ndig;
|
|
|
|
if (ndig > 1 || flags & ALT)
|
2013-09-12 07:07:30 -04:00
|
|
|
++fprec, ++size;
|
1999-08-13 01:45:20 -04:00
|
|
|
} else if (ch == 'f') { /* f fmt */
|
|
|
|
if (expt > 0) {
|
|
|
|
size = expt;
|
|
|
|
if (prec || flags & ALT)
|
|
|
|
size += prec + 1;
|
2008-12-21 22:25:14 -05:00
|
|
|
} else if (!prec) { /* "0" */
|
|
|
|
size = 1;
|
2010-11-08 01:44:39 -05:00
|
|
|
if (flags & ALT)
|
|
|
|
size += 1;
|
1999-08-13 01:45:20 -04:00
|
|
|
} else /* "0.X" */
|
|
|
|
size = prec + 2;
|
|
|
|
} else if (expt >= ndig) { /* fixed g fmt */
|
|
|
|
size = expt;
|
|
|
|
if (flags & ALT)
|
|
|
|
++size;
|
|
|
|
} else
|
|
|
|
size = ndig + (expt > 0 ?
|
|
|
|
1 : 2 - expt);
|
|
|
|
|
|
|
|
if (softsign)
|
|
|
|
sign = '-';
|
|
|
|
break;
|
|
|
|
#endif /* FLOATING_POINT */
|
|
|
|
case 'n':
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
if (flags & QUADINT)
|
|
|
|
*va_arg(ap, quad_t *) = ret;
|
|
|
|
else if (flags & LONGINT)
|
|
|
|
#else /* _HAVE_SANE_QUAD_ */
|
|
|
|
if (flags & LONGINT)
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
|
|
|
*va_arg(ap, long *) = ret;
|
|
|
|
else if (flags & SHORTINT)
|
2009-05-21 08:07:25 -04:00
|
|
|
*va_arg(ap, short *) = (short)ret;
|
1999-08-13 01:45:20 -04:00
|
|
|
else
|
2009-05-21 08:07:25 -04:00
|
|
|
*va_arg(ap, int *) = (int)ret;
|
1999-08-13 01:45:20 -04:00
|
|
|
continue; /* no output */
|
|
|
|
case 'O':
|
|
|
|
flags |= LONGINT;
|
|
|
|
/*FALLTHROUGH*/
|
|
|
|
case 'o':
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
if (flags & QUADINT)
|
|
|
|
uqval = va_arg(ap, u_quad_t);
|
|
|
|
else
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
|
|
|
ulval = UARG();
|
|
|
|
base = 8;
|
|
|
|
goto nosign;
|
|
|
|
case 'p':
|
|
|
|
/*
|
|
|
|
* ``The argument shall be a pointer to void. The
|
|
|
|
* value of the pointer is converted to a sequence
|
|
|
|
* of printable characters, in an implementation-
|
|
|
|
* defined manner.''
|
|
|
|
* -- ANSI X3J11
|
|
|
|
*/
|
2009-05-21 08:07:25 -04:00
|
|
|
prec = (int)(sizeof(void*)*CHAR_BIT/4);
|
2005-07-27 03:27:19 -04:00
|
|
|
#ifdef _HAVE_LLP64_
|
2010-10-12 10:55:14 -04:00
|
|
|
uqval = (u_quad_t)va_arg(ap, void *);
|
2005-07-27 03:27:19 -04:00
|
|
|
flags = (flags) | QUADINT | HEXPREFIX;
|
|
|
|
#else
|
1999-08-13 01:45:20 -04:00
|
|
|
ulval = (u_long)va_arg(ap, void *);
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
flags = (flags & ~QUADINT) | HEXPREFIX;
|
|
|
|
#else /* _HAVE_SANE_QUAD_ */
|
|
|
|
flags = (flags) | HEXPREFIX;
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
2005-07-27 03:27:19 -04:00
|
|
|
#endif
|
|
|
|
base = 16;
|
2015-02-13 02:07:39 -05:00
|
|
|
xdigs = lower_hexdigits;
|
1999-08-13 01:45:20 -04:00
|
|
|
ch = 'x';
|
|
|
|
goto nosign;
|
|
|
|
case 's':
|
|
|
|
if ((cp = va_arg(ap, char *)) == NULL)
|
|
|
|
cp = "(null)";
|
|
|
|
if (prec >= 0) {
|
|
|
|
/*
|
|
|
|
* can't use strlen; can only look for the
|
|
|
|
* NUL in the first `prec' characters, and
|
|
|
|
* strlen() will go further.
|
|
|
|
*/
|
2008-05-31 05:28:20 -04:00
|
|
|
const char *p = (char *)memchr(cp, 0, prec);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2014-05-24 22:56:36 -04:00
|
|
|
if (p != NULL && (p - cp) < prec)
|
2009-05-21 08:07:25 -04:00
|
|
|
size = (int)(p - cp);
|
|
|
|
else
|
1999-08-13 01:45:20 -04:00
|
|
|
size = prec;
|
2009-05-21 08:07:25 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
fieldsz = strlen(cp);
|
|
|
|
goto long_len;
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
sign = '\0';
|
|
|
|
break;
|
|
|
|
case 'U':
|
|
|
|
flags |= LONGINT;
|
|
|
|
/*FALLTHROUGH*/
|
|
|
|
case 'u':
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
if (flags & QUADINT)
|
|
|
|
uqval = va_arg(ap, u_quad_t);
|
|
|
|
else
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
|
|
|
ulval = UARG();
|
|
|
|
base = 10;
|
|
|
|
goto nosign;
|
|
|
|
case 'X':
|
2015-02-13 02:07:39 -05:00
|
|
|
xdigs = upper_hexdigits;
|
1999-08-13 01:45:20 -04:00
|
|
|
goto hex;
|
|
|
|
case 'x':
|
2015-02-13 02:07:39 -05:00
|
|
|
xdigs = lower_hexdigits;
|
1999-08-13 01:45:20 -04:00
|
|
|
hex:
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
if (flags & QUADINT)
|
|
|
|
uqval = va_arg(ap, u_quad_t);
|
|
|
|
else
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
|
|
|
ulval = UARG();
|
|
|
|
base = 16;
|
|
|
|
/* leading 0x/X only if non-zero */
|
|
|
|
if (flags & ALT &&
|
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
2008-04-22 09:49:43 -04:00
|
|
|
(flags & QUADINT ? uqval != 0 : ulval != 0)
|
1999-08-13 01:45:20 -04:00
|
|
|
#else /* _HAVE_SANE_QUAD_ */
|
2008-04-22 09:49:43 -04:00
|
|
|
ulval != 0
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
2008-04-22 09:49:43 -04:00
|
|
|
)
|
1999-08-13 01:45:20 -04:00
|
|
|
flags |= HEXPREFIX;
|
|
|
|
|
|
|
|
/* unsigned conversions */
|
|
|
|
nosign: sign = '\0';
|
|
|
|
/*
|
|
|
|
* ``... diouXx conversions ... if a precision is
|
|
|
|
* specified, the 0 flag will be ignored.''
|
|
|
|
* -- ANSI X3J11
|
|
|
|
*/
|
|
|
|
number: if ((dprec = prec) >= 0)
|
|
|
|
flags &= ~ZEROPAD;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ``The result of converting a zero value with an
|
|
|
|
* explicit precision of zero is no characters.''
|
|
|
|
* -- ANSI X3J11
|
|
|
|
*/
|
2013-09-19 03:25:09 -04:00
|
|
|
cp = ebuf;
|
1999-08-13 01:45:20 -04:00
|
|
|
#ifdef _HAVE_SANE_QUAD_
|
|
|
|
if (flags & QUADINT) {
|
|
|
|
if (uqval != 0 || prec != 0)
|
2008-05-31 05:28:20 -04:00
|
|
|
cp = BSD__uqtoa(uqval, ebuf, base,
|
1999-08-13 01:45:20 -04:00
|
|
|
flags & ALT, xdigs);
|
2008-04-22 09:49:43 -04:00
|
|
|
} else
|
1999-08-13 01:45:20 -04:00
|
|
|
#else /* _HAVE_SANE_QUAD_ */
|
|
|
|
#endif /* _HAVE_SANE_QUAD_ */
|
2008-04-22 09:49:43 -04:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
if (ulval != 0 || prec != 0)
|
2008-05-31 05:28:20 -04:00
|
|
|
cp = BSD__ultoa(ulval, ebuf, base,
|
1999-08-13 01:45:20 -04:00
|
|
|
flags & ALT, xdigs);
|
|
|
|
}
|
2009-05-21 08:07:25 -04:00
|
|
|
size = (int)(ebuf - cp);
|
1999-08-13 01:45:20 -04:00
|
|
|
break;
|
|
|
|
default: /* "%?" prints ?, unless ? is NUL */
|
|
|
|
if (ch == '\0')
|
|
|
|
goto done;
|
|
|
|
/* pretend it was %c with argument ch */
|
|
|
|
cp = buf;
|
2008-05-31 05:28:20 -04:00
|
|
|
*buf = ch;
|
1999-08-13 01:45:20 -04:00
|
|
|
size = 1;
|
|
|
|
sign = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* All reasonable formats wind up here. At this point, `cp'
|
|
|
|
* points to a string which (if not flags&LADJUST) should be
|
|
|
|
* padded out to `width' places. If flags&ZEROPAD, it should
|
|
|
|
* first be prefixed by any sign or other prefix; otherwise,
|
|
|
|
* it should be blank padded before the prefix is emitted.
|
|
|
|
* After any left-hand padding and prefixing, emit zeroes
|
|
|
|
* required by a decimal [diouxX] precision, then print the
|
|
|
|
* string proper, then emit zeroes required by any leftover
|
|
|
|
* floating precision; finally, if LADJUST, pad with blanks.
|
|
|
|
*
|
|
|
|
* Compute actual size, so we know how much to pad.
|
|
|
|
* fieldsz excludes decimal prec; realsz includes it.
|
|
|
|
*/
|
|
|
|
fieldsz = size;
|
2009-05-21 08:07:25 -04:00
|
|
|
long_len:
|
2017-03-29 05:47:42 -04:00
|
|
|
realsz = dprec > fieldsz ? dprec : fieldsz;
|
1999-08-13 01:45:20 -04:00
|
|
|
if (sign)
|
2017-03-29 05:47:42 -04:00
|
|
|
realsz++;
|
2010-10-18 23:19:30 -04:00
|
|
|
if (flags & HEXPREFIX)
|
2017-03-29 05:47:42 -04:00
|
|
|
realsz += 2;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/* right-adjusting blank padding */
|
|
|
|
if ((flags & (LADJUST|ZEROPAD)) == 0)
|
2009-05-21 08:07:25 -04:00
|
|
|
PAD_L(width - realsz, blanks);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/* prefix */
|
|
|
|
if (sign) {
|
|
|
|
PRINT(&sign, 1);
|
2010-10-18 14:08:58 -04:00
|
|
|
}
|
|
|
|
if (flags & HEXPREFIX) {
|
1999-08-13 01:45:20 -04:00
|
|
|
ox[0] = '0';
|
|
|
|
ox[1] = ch;
|
|
|
|
PRINT(ox, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* right-adjusting zero padding */
|
|
|
|
if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
|
2009-05-21 08:07:25 -04:00
|
|
|
PAD_L(width - realsz, zeroes);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/* leading zeroes from decimal precision */
|
2009-05-21 08:07:25 -04:00
|
|
|
PAD_L(dprec - fieldsz, zeroes);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/* the string or number proper */
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
if ((flags & FPT) == 0) {
|
2009-05-21 08:07:25 -04:00
|
|
|
PRINT(cp, fieldsz);
|
1999-08-13 01:45:20 -04:00
|
|
|
} else { /* glue together f_p fragments */
|
2010-10-18 14:08:58 -04:00
|
|
|
if (flags & HEXPREFIX) {
|
2010-04-01 00:32:57 -04:00
|
|
|
if (ndig > 1 || flags & ALT) {
|
|
|
|
ox[2] = *cp++;
|
|
|
|
ox[3] = '.';
|
|
|
|
PRINT(ox+2, 2);
|
2010-10-19 21:03:18 -04:00
|
|
|
if (ndig > 0) PRINT(cp, ndig-1);
|
2010-04-01 00:32:57 -04:00
|
|
|
} else /* XpYYY */
|
|
|
|
PRINT(cp, 1);
|
2013-09-12 07:07:30 -04:00
|
|
|
PAD(fprec-ndig, zeroes);
|
2010-04-01 00:32:57 -04:00
|
|
|
PRINT(expstr, expsize);
|
|
|
|
}
|
|
|
|
else if (ch >= 'f') { /* 'f' or 'g' */
|
1999-08-13 01:45:20 -04:00
|
|
|
if (_double == 0) {
|
|
|
|
/* kludge for __dtoa irregularity */
|
2008-12-21 22:25:14 -05:00
|
|
|
if (ndig <= 1 &&
|
1999-08-13 01:45:20 -04:00
|
|
|
(flags & ALT) == 0) {
|
|
|
|
PRINT("0", 1);
|
|
|
|
} else {
|
|
|
|
PRINT("0.", 2);
|
2013-09-12 07:07:30 -04:00
|
|
|
PAD((ndig >= fprec ? ndig - 1 : fprec - (ch != 'f')),
|
|
|
|
zeroes);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
2008-12-21 22:25:14 -05:00
|
|
|
} else if (expt == 0 && ndig == 0 && (flags & ALT) == 0) {
|
|
|
|
PRINT("0", 1);
|
1999-08-13 01:45:20 -04:00
|
|
|
} else if (expt <= 0) {
|
|
|
|
PRINT("0.", 2);
|
|
|
|
PAD(-expt, zeroes);
|
|
|
|
PRINT(cp, ndig);
|
2013-09-12 07:07:30 -04:00
|
|
|
if (flags & ALT)
|
|
|
|
PAD(fprec - ndig + (ch == 'f' ? expt : 0), zeroes);
|
1999-08-13 01:45:20 -04:00
|
|
|
} else if (expt >= ndig) {
|
|
|
|
PRINT(cp, ndig);
|
|
|
|
PAD(expt - ndig, zeroes);
|
|
|
|
if (flags & ALT)
|
|
|
|
PRINT(".", 1);
|
|
|
|
} else {
|
|
|
|
PRINT(cp, expt);
|
|
|
|
cp += expt;
|
|
|
|
PRINT(".", 1);
|
|
|
|
PRINT(cp, ndig-expt);
|
2013-09-12 07:07:30 -04:00
|
|
|
if (flags & ALT)
|
|
|
|
PAD(fprec - ndig + (ch == 'f' ? expt : 0), zeroes);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
} else { /* 'e' or 'E' */
|
|
|
|
if (ndig > 1 || flags & ALT) {
|
|
|
|
ox[0] = *cp++;
|
|
|
|
ox[1] = '.';
|
|
|
|
PRINT(ox, 2);
|
2009-03-11 16:09:58 -04:00
|
|
|
if (_double /*|| flags & ALT == 0*/) {
|
1999-08-13 01:45:20 -04:00
|
|
|
PRINT(cp, ndig-1);
|
|
|
|
} else /* 0.[0..] */
|
|
|
|
/* __dtoa irregularity */
|
|
|
|
PAD(ndig - 1, zeroes);
|
2013-09-12 07:07:30 -04:00
|
|
|
if (flags & ALT) PAD(fprec - ndig - 1, zeroes);
|
1999-08-13 01:45:20 -04:00
|
|
|
} else /* XeYYY */
|
|
|
|
PRINT(cp, 1);
|
|
|
|
PRINT(expstr, expsize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
2009-05-21 08:07:25 -04:00
|
|
|
PRINT(cp, fieldsz);
|
1999-08-13 01:45:20 -04:00
|
|
|
#endif
|
|
|
|
/* left-adjusting padding (always blank) */
|
|
|
|
if (flags & LADJUST)
|
2009-05-21 08:07:25 -04:00
|
|
|
PAD_L(width - realsz, blanks);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
/* finally, adjust ret */
|
|
|
|
ret += width > realsz ? width : realsz;
|
|
|
|
|
|
|
|
FLUSH(); /* copy out the I/O vectors */
|
|
|
|
}
|
|
|
|
done:
|
|
|
|
FLUSH();
|
|
|
|
error:
|
2011-11-01 00:31:52 -04:00
|
|
|
return (BSD__sferror(fp) ? EOF : ret);
|
1999-08-13 01:45:20 -04:00
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
|
2012-08-15 20:46:12 -04:00
|
|
|
extern char *BSD__dtoa(double, int, int, int *, int *, char **);
|
2010-04-01 00:32:57 -04:00
|
|
|
extern char *BSD__hdtoa(double, const char *, int, int *, int *, char **);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
static char *
|
2012-08-15 20:46:12 -04:00
|
|
|
cvt(double value, int ndigits, int flags, char *sign, int *decpt, int ch, int *length, char *buf)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
int mode, dsgn;
|
|
|
|
char *digits, *bp, *rve;
|
|
|
|
|
|
|
|
if (ch == 'f')
|
|
|
|
mode = 3;
|
|
|
|
else {
|
|
|
|
mode = 2;
|
|
|
|
}
|
|
|
|
if (value < 0) {
|
|
|
|
value = -value;
|
|
|
|
*sign = '-';
|
2018-11-15 20:52:39 -05:00
|
|
|
} else if (value == 0.0 && signbit(value)) {
|
2002-09-06 04:59:41 -04:00
|
|
|
*sign = '-';
|
|
|
|
} else {
|
|
|
|
*sign = '\000';
|
|
|
|
}
|
2010-04-01 00:32:57 -04:00
|
|
|
if (ch == 'a' || ch =='A') {
|
|
|
|
digits = BSD__hdtoa(value,
|
2015-02-13 02:07:39 -05:00
|
|
|
ch == 'a' ? lower_hexdigits : upper_hexdigits,
|
2010-04-01 00:32:57 -04:00
|
|
|
ndigits, decpt, &dsgn, &rve);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
digits = BSD__dtoa(value, mode, ndigits, decpt, &dsgn, &rve);
|
|
|
|
}
|
2011-01-18 12:56:10 -05:00
|
|
|
buf[0] = 0; /* rve - digits may be 0 */
|
2009-02-20 09:29:00 -05:00
|
|
|
memcpy(buf, digits, rve - digits);
|
|
|
|
xfree(digits);
|
|
|
|
rve = buf + (rve - digits);
|
|
|
|
digits = buf;
|
1999-08-13 01:45:20 -04:00
|
|
|
if (flags & ALT) { /* Print trailing zeros */
|
|
|
|
bp = digits + ndigits;
|
|
|
|
if (ch == 'f') {
|
|
|
|
if (*digits == '0' && value)
|
|
|
|
*decpt = -ndigits + 1;
|
|
|
|
bp += *decpt;
|
|
|
|
}
|
|
|
|
while (rve < bp)
|
|
|
|
*rve++ = '0';
|
|
|
|
}
|
2009-05-21 08:07:25 -04:00
|
|
|
*length = (int)(rve - digits);
|
1999-08-13 01:45:20 -04:00
|
|
|
return (digits);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-08-15 20:46:12 -04:00
|
|
|
exponent(char *p0, int exp, int fmtch)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
register char *p, *t;
|
2013-09-12 07:07:30 -04:00
|
|
|
char expbuf[2 + (MAXEXP < 1000 ? 3 : MAXEXP < 10000 ? 4 : 5)]; /* >= 2 + ceil(log10(MAXEXP)) */
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
p = p0;
|
|
|
|
*p++ = fmtch;
|
|
|
|
if (exp < 0) {
|
|
|
|
exp = -exp;
|
|
|
|
*p++ = '-';
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*p++ = '+';
|
2013-09-12 07:07:30 -04:00
|
|
|
t = expbuf + sizeof(expbuf);
|
1999-08-13 01:45:20 -04:00
|
|
|
if (exp > 9) {
|
|
|
|
do {
|
|
|
|
*--t = to_char(exp % 10);
|
|
|
|
} while ((exp /= 10) > 9);
|
|
|
|
*--t = to_char(exp);
|
2013-09-12 07:07:30 -04:00
|
|
|
for (; t < expbuf + sizeof(expbuf); *p++ = *t++);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
else {
|
2010-04-01 00:32:57 -04:00
|
|
|
if (fmtch & 15) *p++ = '0'; /* other than p or P */
|
1999-08-13 01:45:20 -04:00
|
|
|
*p++ = to_char(exp);
|
|
|
|
}
|
2009-05-21 08:07:25 -04:00
|
|
|
return (int)(p - p0);
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
#endif /* FLOATING_POINT */
|