mirror of
https://github.com/curl/curl.git
synced 2024-12-27 06:59:43 +08:00
84338c4de2
Enable more picky compiler warnings. I've found these options in the nghttp3 project when implementing the CMake quick picky warning functionality for it [1]. `-Wunused-macros` was too noisy to keep around, but fixed a few issues it revealed while testing. - autotools: reflect the more precisely-versioned clang warnings. Follow-up to033f8e2a08
#12324 - autotools: sync between clang and gcc the way we set `no-multichar`. - autotools: avoid setting `-Wstrict-aliasing=3` twice. - autotools: disable `-Wmissing-noreturn` for MSYS gcc targets [2]. It triggers in libtool-generated stub code. - lib/timeval: delete a redundant `!MSDOS` guard from a `WIN32` branch. - lib/curl_setup.h: delete duplicate declaration for `fileno`. Added in initial commitae1912cb0d
(1999-12-29). This suggests this may not be needed anymore, but if it does, we may restore this for those specific (non-Windows) systems. - lib: delete unused macro `FTP_BUFFER_ALLOCSIZE` sincec1d6fe2aaa
. - lib: delete unused macro `isxdigit_ascii` sincef65f750742
. - lib/mqtt: delete unused macro `MQTT_HEADER_LEN`. - lib/multi: delete unused macro `SH_READ`/`SH_WRITE`. - lib/hostip: add `noreturn` function attribute via new `CURL_NORETURN` macro. - lib/mprintf: delete duplicate declaration for `Curl_dyn_vprintf`. - lib/rand: fix `-Wunreachable-code` and related fallouts [3]. - lib/setopt: fix `-Wunreachable-code-break`. - lib/system_win32 and lib/timeval: fix double declarations for `Curl_freq` and `Curl_isVistaOrGreater` in CMake UNITY mode [4]. - lib/warnless: fix double declarations in CMake UNITY mode [5]. This was due to force-disabling the header guard of `warnless.h` to to reapply it to source code coming after `warnless.c` in UNITY builds. This reapplied declarations too, causing the warnings. Solved by adding a header guard for the lines that actually need to be reapplied. - lib/vauth/digest: fix `-Wunreachable-code-break` [6]. - lib/vssh/libssh2: fix `-Wunreachable-code-break` and delete redundant block. - lib/vtls/sectransp: fix `-Wunreachable-code-break` [7]. - lib/vtls/sectransp: suppress `-Wunreachable-code`. Detected in `else` branches of dynamic feature checks, with results known at compile-time, e.g. ```c if(SecCertificateCopySubjectSummary) /* -> true */ ``` Likely fixable as a separate micro-project, but given SecureTransport is deprecated anyway, let's just silence these locally. - src/tool_help: delete duplicate declaration for `helptext`. - src/tool_xattr: fix `-Wunreachable-code`. - tests: delete duplicate declaration for `unitfail` [8]. - tests: delete duplicate declaration for `strncasecompare`. - tests/libtest: delete duplicate declaration for `gethostname`. Originally added in687df5c8c3
(2010-08-02). Got complicated later:c49e9683b8
If there are still systems around with warnings, we may restore the prototype, but limited for those systems. - tests/lib2305: delete duplicate declaration for `libtest_debug_config`. - tests/h2-download: fix `-Wunreachable-code-break`. [1]a70edb08e9/cmake/PickyWarningsC.cmake
[2] https://ci.appveyor.com/project/curlorg/curl/builds/48553586/job/3qkgjauiqla5fj45?fullLog=true#L1675 [3] https://github.com/curl/curl/actions/runs/6880886309/job/18716044703?pr=12331#step:7:72 https://github.com/curl/curl/actions/runs/6883016087/job/18722707368?pr=12331#step:7:109 [4] https://ci.appveyor.com/project/curlorg/curl/builds/48555101/job/9g15qkrriklpf1ut#L204 [5] https://ci.appveyor.com/project/curlorg/curl/builds/48555101/job/9g15qkrriklpf1ut#L218 [6] https://github.com/curl/curl/actions/runs/6880886309/job/18716042927?pr=12331#step:7:290 [7] https://github.com/curl/curl/actions/runs/6891484996/job/18746659406?pr=12331#step:9:1193 [8] https://github.com/curl/curl/actions/runs/6882803986/job/18722082562?pr=12331#step:33:1870 Closes #12331
1173 lines
30 KiB
C
1173 lines
30 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
*
|
|
* Purpose:
|
|
* A merge of Bjorn Reese's format() function and Daniel's dsprintf()
|
|
* 1.0. A full blooded printf() clone with full support for <num>$
|
|
* everywhere (parameters, widths and precisions) including variabled
|
|
* sized parameters (like doubles, long longs, long doubles and even
|
|
* void * in 64-bit architectures).
|
|
*
|
|
* Current restrictions:
|
|
* - Max 128 parameters
|
|
* - No 'long double' support.
|
|
*
|
|
* If you ever want truly portable and good *printf() clones, the project that
|
|
* took on from here is named 'Trio' and you find more details on the trio web
|
|
* page at https://daniel.haxx.se/projects/trio/
|
|
*/
|
|
|
|
#include "curl_setup.h"
|
|
#include "dynbuf.h"
|
|
#include <curl/mprintf.h>
|
|
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/*
|
|
* If SIZEOF_SIZE_T has not been defined, default to the size of long.
|
|
*/
|
|
|
|
#ifdef HAVE_LONGLONG
|
|
# define LONG_LONG_TYPE long long
|
|
# define HAVE_LONG_LONG_TYPE
|
|
#else
|
|
# if defined(_MSC_VER) && (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
|
|
# define LONG_LONG_TYPE __int64
|
|
# define HAVE_LONG_LONG_TYPE
|
|
# else
|
|
# undef LONG_LONG_TYPE
|
|
# undef HAVE_LONG_LONG_TYPE
|
|
# endif
|
|
#endif
|
|
|
|
/*
|
|
* Non-ANSI integer extensions
|
|
*/
|
|
|
|
#if (defined(_WIN32_WCE)) || \
|
|
(defined(__MINGW32__)) || \
|
|
(defined(_MSC_VER) && (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64))
|
|
# define MP_HAVE_INT_EXTENSIONS
|
|
#endif
|
|
|
|
/*
|
|
* Max integer data types that mprintf.c is capable
|
|
*/
|
|
|
|
#ifdef HAVE_LONG_LONG_TYPE
|
|
# define mp_intmax_t LONG_LONG_TYPE
|
|
# define mp_uintmax_t unsigned LONG_LONG_TYPE
|
|
#else
|
|
# define mp_intmax_t long
|
|
# define mp_uintmax_t unsigned long
|
|
#endif
|
|
|
|
#define BUFFSIZE 326 /* buffer for long-to-str and float-to-str calcs, should
|
|
fit negative DBL_MAX (317 letters) */
|
|
#define MAX_PARAMETERS 128 /* lame static limit */
|
|
|
|
#ifdef __AMIGA__
|
|
# undef FORMAT_INT
|
|
#endif
|
|
|
|
/* Lower-case digits. */
|
|
static const char lower_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
|
|
|
|
/* Upper-case digits. */
|
|
static const char upper_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
|
|
|
#define OUTCHAR(x) \
|
|
do { \
|
|
if(stream((unsigned char)(x), (FILE *)data) != -1) \
|
|
done++; \
|
|
else \
|
|
return done; /* return immediately on failure */ \
|
|
} while(0)
|
|
|
|
/* Data type to read from the arglist */
|
|
typedef enum {
|
|
FORMAT_UNKNOWN = 0,
|
|
FORMAT_STRING,
|
|
FORMAT_PTR,
|
|
FORMAT_INT,
|
|
FORMAT_INTPTR,
|
|
FORMAT_LONG,
|
|
FORMAT_LONGLONG,
|
|
FORMAT_DOUBLE,
|
|
FORMAT_LONGDOUBLE,
|
|
FORMAT_WIDTH /* For internal use */
|
|
} FormatType;
|
|
|
|
/* conversion and display flags */
|
|
enum {
|
|
FLAGS_NEW = 0,
|
|
FLAGS_SPACE = 1<<0,
|
|
FLAGS_SHOWSIGN = 1<<1,
|
|
FLAGS_LEFT = 1<<2,
|
|
FLAGS_ALT = 1<<3,
|
|
FLAGS_SHORT = 1<<4,
|
|
FLAGS_LONG = 1<<5,
|
|
FLAGS_LONGLONG = 1<<6,
|
|
FLAGS_LONGDOUBLE = 1<<7,
|
|
FLAGS_PAD_NIL = 1<<8,
|
|
FLAGS_UNSIGNED = 1<<9,
|
|
FLAGS_OCTAL = 1<<10,
|
|
FLAGS_HEX = 1<<11,
|
|
FLAGS_UPPER = 1<<12,
|
|
FLAGS_WIDTH = 1<<13, /* '*' or '*<num>$' used */
|
|
FLAGS_WIDTHPARAM = 1<<14, /* width PARAMETER was specified */
|
|
FLAGS_PREC = 1<<15, /* precision was specified */
|
|
FLAGS_PRECPARAM = 1<<16, /* precision PARAMETER was specified */
|
|
FLAGS_CHAR = 1<<17, /* %c story */
|
|
FLAGS_FLOATE = 1<<18, /* %e or %E */
|
|
FLAGS_FLOATG = 1<<19 /* %g or %G */
|
|
};
|
|
|
|
struct va_stack {
|
|
FormatType type;
|
|
int flags;
|
|
long width; /* width OR width parameter number */
|
|
long precision; /* precision OR precision parameter number */
|
|
union {
|
|
char *str;
|
|
void *ptr;
|
|
union {
|
|
mp_intmax_t as_signed;
|
|
mp_uintmax_t as_unsigned;
|
|
} num;
|
|
double dnum;
|
|
} data;
|
|
};
|
|
|
|
struct nsprintf {
|
|
char *buffer;
|
|
size_t length;
|
|
size_t max;
|
|
};
|
|
|
|
struct asprintf {
|
|
struct dynbuf *b;
|
|
bool fail; /* if an alloc has failed and thus the output is not the complete
|
|
data */
|
|
};
|
|
|
|
static long dprintf_DollarString(char *input, char **end)
|
|
{
|
|
int number = 0;
|
|
while(ISDIGIT(*input)) {
|
|
if(number < MAX_PARAMETERS) {
|
|
number *= 10;
|
|
number += *input - '0';
|
|
}
|
|
input++;
|
|
}
|
|
if(number <= MAX_PARAMETERS && ('$' == *input)) {
|
|
*end = ++input;
|
|
return number;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static bool dprintf_IsQualifierNoDollar(const char *fmt)
|
|
{
|
|
#if defined(MP_HAVE_INT_EXTENSIONS)
|
|
if(!strncmp(fmt, "I32", 3) || !strncmp(fmt, "I64", 3)) {
|
|
return TRUE;
|
|
}
|
|
#endif
|
|
|
|
switch(*fmt) {
|
|
case '-': case '+': case ' ': case '#': case '.':
|
|
case '0': case '1': case '2': case '3': case '4':
|
|
case '5': case '6': case '7': case '8': case '9':
|
|
case 'h': case 'l': case 'L': case 'z': case 'q':
|
|
case '*': case 'O':
|
|
#if defined(MP_HAVE_INT_EXTENSIONS)
|
|
case 'I':
|
|
#endif
|
|
return TRUE;
|
|
|
|
default:
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
/******************************************************************
|
|
*
|
|
* Pass 1:
|
|
* Create an index with the type of each parameter entry and its
|
|
* value (may vary in size)
|
|
*
|
|
* Returns zero on success.
|
|
*
|
|
******************************************************************/
|
|
|
|
static int dprintf_Pass1(const char *format, struct va_stack *vto,
|
|
char **endpos, va_list arglist)
|
|
{
|
|
char *fmt = (char *)format;
|
|
int param_num = 0;
|
|
long this_param;
|
|
long width;
|
|
long precision;
|
|
int flags;
|
|
long max_param = 0;
|
|
long i;
|
|
|
|
while(*fmt) {
|
|
if(*fmt++ == '%') {
|
|
if(*fmt == '%') {
|
|
fmt++;
|
|
continue; /* while */
|
|
}
|
|
|
|
flags = FLAGS_NEW;
|
|
|
|
/* Handle the positional case (N$) */
|
|
|
|
param_num++;
|
|
|
|
this_param = dprintf_DollarString(fmt, &fmt);
|
|
if(0 == this_param)
|
|
/* we got no positional, get the next counter */
|
|
this_param = param_num;
|
|
|
|
if(this_param > max_param)
|
|
max_param = this_param;
|
|
|
|
/*
|
|
* The parameter with number 'i' should be used. Next, we need
|
|
* to get SIZE and TYPE of the parameter. Add the information
|
|
* to our array.
|
|
*/
|
|
|
|
width = 0;
|
|
precision = 0;
|
|
|
|
/* Handle the flags */
|
|
|
|
while(dprintf_IsQualifierNoDollar(fmt)) {
|
|
#if defined(MP_HAVE_INT_EXTENSIONS)
|
|
if(!strncmp(fmt, "I32", 3)) {
|
|
flags |= FLAGS_LONG;
|
|
fmt += 3;
|
|
}
|
|
else if(!strncmp(fmt, "I64", 3)) {
|
|
flags |= FLAGS_LONGLONG;
|
|
fmt += 3;
|
|
}
|
|
else
|
|
#endif
|
|
|
|
switch(*fmt++) {
|
|
case ' ':
|
|
flags |= FLAGS_SPACE;
|
|
break;
|
|
case '+':
|
|
flags |= FLAGS_SHOWSIGN;
|
|
break;
|
|
case '-':
|
|
flags |= FLAGS_LEFT;
|
|
flags &= ~FLAGS_PAD_NIL;
|
|
break;
|
|
case '#':
|
|
flags |= FLAGS_ALT;
|
|
break;
|
|
case '.':
|
|
if('*' == *fmt) {
|
|
/* The precision is picked from a specified parameter */
|
|
|
|
flags |= FLAGS_PRECPARAM;
|
|
fmt++;
|
|
param_num++;
|
|
|
|
i = dprintf_DollarString(fmt, &fmt);
|
|
if(i)
|
|
precision = i;
|
|
else
|
|
precision = param_num;
|
|
|
|
if(precision > max_param)
|
|
max_param = precision;
|
|
}
|
|
else {
|
|
flags |= FLAGS_PREC;
|
|
precision = strtol(fmt, &fmt, 10);
|
|
}
|
|
if((flags & (FLAGS_PREC | FLAGS_PRECPARAM)) ==
|
|
(FLAGS_PREC | FLAGS_PRECPARAM))
|
|
/* it is not permitted to use both kinds of precision for the same
|
|
argument */
|
|
return 1;
|
|
break;
|
|
case 'h':
|
|
flags |= FLAGS_SHORT;
|
|
break;
|
|
#if defined(MP_HAVE_INT_EXTENSIONS)
|
|
case 'I':
|
|
#if (SIZEOF_CURL_OFF_T > SIZEOF_LONG)
|
|
flags |= FLAGS_LONGLONG;
|
|
#else
|
|
flags |= FLAGS_LONG;
|
|
#endif
|
|
break;
|
|
#endif
|
|
case 'l':
|
|
if(flags & FLAGS_LONG)
|
|
flags |= FLAGS_LONGLONG;
|
|
else
|
|
flags |= FLAGS_LONG;
|
|
break;
|
|
case 'L':
|
|
flags |= FLAGS_LONGDOUBLE;
|
|
break;
|
|
case 'q':
|
|
flags |= FLAGS_LONGLONG;
|
|
break;
|
|
case 'z':
|
|
/* the code below generates a warning if -Wunreachable-code is
|
|
used */
|
|
#if (SIZEOF_SIZE_T > SIZEOF_LONG)
|
|
flags |= FLAGS_LONGLONG;
|
|
#else
|
|
flags |= FLAGS_LONG;
|
|
#endif
|
|
break;
|
|
case 'O':
|
|
#if (SIZEOF_CURL_OFF_T > SIZEOF_LONG)
|
|
flags |= FLAGS_LONGLONG;
|
|
#else
|
|
flags |= FLAGS_LONG;
|
|
#endif
|
|
break;
|
|
case '0':
|
|
if(!(flags & FLAGS_LEFT))
|
|
flags |= FLAGS_PAD_NIL;
|
|
/* FALLTHROUGH */
|
|
case '1': case '2': case '3': case '4':
|
|
case '5': case '6': case '7': case '8': case '9':
|
|
flags |= FLAGS_WIDTH;
|
|
width = strtol(fmt-1, &fmt, 10);
|
|
break;
|
|
case '*': /* Special case */
|
|
flags |= FLAGS_WIDTHPARAM;
|
|
param_num++;
|
|
|
|
i = dprintf_DollarString(fmt, &fmt);
|
|
if(i)
|
|
width = i;
|
|
else
|
|
width = param_num;
|
|
if(width > max_param)
|
|
max_param = width;
|
|
break;
|
|
case '\0':
|
|
fmt--;
|
|
default:
|
|
break;
|
|
}
|
|
} /* switch */
|
|
|
|
/* Handle the specifier */
|
|
|
|
i = this_param - 1;
|
|
|
|
if((i < 0) || (i >= MAX_PARAMETERS))
|
|
/* out of allowed range */
|
|
return 1;
|
|
|
|
switch(*fmt) {
|
|
case 'S':
|
|
flags |= FLAGS_ALT;
|
|
/* FALLTHROUGH */
|
|
case 's':
|
|
vto[i].type = FORMAT_STRING;
|
|
break;
|
|
case 'n':
|
|
vto[i].type = FORMAT_INTPTR;
|
|
break;
|
|
case 'p':
|
|
vto[i].type = FORMAT_PTR;
|
|
break;
|
|
case 'd': case 'i':
|
|
vto[i].type = FORMAT_INT;
|
|
break;
|
|
case 'u':
|
|
vto[i].type = FORMAT_INT;
|
|
flags |= FLAGS_UNSIGNED;
|
|
break;
|
|
case 'o':
|
|
vto[i].type = FORMAT_INT;
|
|
flags |= FLAGS_OCTAL;
|
|
break;
|
|
case 'x':
|
|
vto[i].type = FORMAT_INT;
|
|
flags |= FLAGS_HEX|FLAGS_UNSIGNED;
|
|
break;
|
|
case 'X':
|
|
vto[i].type = FORMAT_INT;
|
|
flags |= FLAGS_HEX|FLAGS_UPPER|FLAGS_UNSIGNED;
|
|
break;
|
|
case 'c':
|
|
vto[i].type = FORMAT_INT;
|
|
flags |= FLAGS_CHAR;
|
|
break;
|
|
case 'f':
|
|
vto[i].type = FORMAT_DOUBLE;
|
|
break;
|
|
case 'e':
|
|
vto[i].type = FORMAT_DOUBLE;
|
|
flags |= FLAGS_FLOATE;
|
|
break;
|
|
case 'E':
|
|
vto[i].type = FORMAT_DOUBLE;
|
|
flags |= FLAGS_FLOATE|FLAGS_UPPER;
|
|
break;
|
|
case 'g':
|
|
vto[i].type = FORMAT_DOUBLE;
|
|
flags |= FLAGS_FLOATG;
|
|
break;
|
|
case 'G':
|
|
vto[i].type = FORMAT_DOUBLE;
|
|
flags |= FLAGS_FLOATG|FLAGS_UPPER;
|
|
break;
|
|
default:
|
|
vto[i].type = FORMAT_UNKNOWN;
|
|
break;
|
|
} /* switch */
|
|
|
|
vto[i].flags = flags;
|
|
vto[i].width = width;
|
|
vto[i].precision = precision;
|
|
|
|
if(flags & FLAGS_WIDTHPARAM) {
|
|
/* we have the width specified from a parameter, so we make that
|
|
parameter's info setup properly */
|
|
long k = width - 1;
|
|
if((k < 0) || (k >= MAX_PARAMETERS))
|
|
/* out of allowed range */
|
|
return 1;
|
|
vto[i].width = k;
|
|
vto[k].type = FORMAT_WIDTH;
|
|
vto[k].flags = FLAGS_NEW;
|
|
/* can't use width or precision of width! */
|
|
vto[k].width = 0;
|
|
vto[k].precision = 0;
|
|
}
|
|
if(flags & FLAGS_PRECPARAM) {
|
|
/* we have the precision specified from a parameter, so we make that
|
|
parameter's info setup properly */
|
|
long k = precision - 1;
|
|
if((k < 0) || (k >= MAX_PARAMETERS))
|
|
/* out of allowed range */
|
|
return 1;
|
|
vto[i].precision = k;
|
|
vto[k].type = FORMAT_WIDTH;
|
|
vto[k].flags = FLAGS_NEW;
|
|
/* can't use width or precision of width! */
|
|
vto[k].width = 0;
|
|
vto[k].precision = 0;
|
|
}
|
|
*endpos++ = fmt + ((*fmt == '\0') ? 0 : 1); /* end of this sequence */
|
|
}
|
|
}
|
|
|
|
/* Read the arg list parameters into our data list */
|
|
for(i = 0; i<max_param; i++) {
|
|
/* Width/precision arguments must be read before the main argument
|
|
they are attached to */
|
|
if(vto[i].flags & FLAGS_WIDTHPARAM) {
|
|
vto[vto[i].width].data.num.as_signed =
|
|
(mp_intmax_t)va_arg(arglist, int);
|
|
}
|
|
if(vto[i].flags & FLAGS_PRECPARAM) {
|
|
vto[vto[i].precision].data.num.as_signed =
|
|
(mp_intmax_t)va_arg(arglist, int);
|
|
}
|
|
|
|
switch(vto[i].type) {
|
|
case FORMAT_STRING:
|
|
vto[i].data.str = va_arg(arglist, char *);
|
|
break;
|
|
|
|
case FORMAT_INTPTR:
|
|
case FORMAT_UNKNOWN:
|
|
case FORMAT_PTR:
|
|
vto[i].data.ptr = va_arg(arglist, void *);
|
|
break;
|
|
|
|
case FORMAT_INT:
|
|
#ifdef HAVE_LONG_LONG_TYPE
|
|
if((vto[i].flags & FLAGS_LONGLONG) && (vto[i].flags & FLAGS_UNSIGNED))
|
|
vto[i].data.num.as_unsigned =
|
|
(mp_uintmax_t)va_arg(arglist, mp_uintmax_t);
|
|
else if(vto[i].flags & FLAGS_LONGLONG)
|
|
vto[i].data.num.as_signed =
|
|
(mp_intmax_t)va_arg(arglist, mp_intmax_t);
|
|
else
|
|
#endif
|
|
{
|
|
if((vto[i].flags & FLAGS_LONG) && (vto[i].flags & FLAGS_UNSIGNED))
|
|
vto[i].data.num.as_unsigned =
|
|
(mp_uintmax_t)va_arg(arglist, unsigned long);
|
|
else if(vto[i].flags & FLAGS_LONG)
|
|
vto[i].data.num.as_signed =
|
|
(mp_intmax_t)va_arg(arglist, long);
|
|
else if(vto[i].flags & FLAGS_UNSIGNED)
|
|
vto[i].data.num.as_unsigned =
|
|
(mp_uintmax_t)va_arg(arglist, unsigned int);
|
|
else
|
|
vto[i].data.num.as_signed =
|
|
(mp_intmax_t)va_arg(arglist, int);
|
|
}
|
|
break;
|
|
|
|
case FORMAT_DOUBLE:
|
|
vto[i].data.dnum = va_arg(arglist, double);
|
|
break;
|
|
|
|
case FORMAT_WIDTH:
|
|
/* Argument has been read. Silently convert it into an integer
|
|
* for later use
|
|
*/
|
|
vto[i].type = FORMAT_INT;
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
static int dprintf_formatf(
|
|
void *data, /* untouched by format(), just sent to the stream() function in
|
|
the second argument */
|
|
/* function pointer called for each output character */
|
|
int (*stream)(int, FILE *),
|
|
const char *format, /* %-formatted string */
|
|
va_list ap_save) /* list of parameters */
|
|
{
|
|
/* Base-36 digits for numbers. */
|
|
const char *digits = lower_digits;
|
|
|
|
/* Pointer into the format string. */
|
|
char *f;
|
|
|
|
/* Number of characters written. */
|
|
int done = 0;
|
|
|
|
long param; /* current parameter to read */
|
|
long param_num = 0; /* parameter counter */
|
|
|
|
struct va_stack vto[MAX_PARAMETERS];
|
|
char *endpos[MAX_PARAMETERS];
|
|
char **end;
|
|
char work[BUFFSIZE];
|
|
struct va_stack *p;
|
|
|
|
/* 'workend' points to the final buffer byte position, but with an extra
|
|
byte as margin to avoid the (false?) warning Coverity gives us
|
|
otherwise */
|
|
char *workend = &work[sizeof(work) - 2];
|
|
|
|
/* Do the actual %-code parsing */
|
|
if(dprintf_Pass1(format, vto, endpos, ap_save))
|
|
return 0;
|
|
|
|
end = &endpos[0]; /* the initial end-position from the list dprintf_Pass1()
|
|
created for us */
|
|
|
|
f = (char *)format;
|
|
while(*f != '\0') {
|
|
/* Format spec modifiers. */
|
|
int is_alt;
|
|
|
|
/* Width of a field. */
|
|
long width;
|
|
|
|
/* Precision of a field. */
|
|
long prec;
|
|
|
|
/* Decimal integer is negative. */
|
|
int is_neg;
|
|
|
|
/* Base of a number to be written. */
|
|
unsigned long base;
|
|
|
|
/* Integral values to be written. */
|
|
mp_uintmax_t num;
|
|
|
|
/* Used to convert negative in positive. */
|
|
mp_intmax_t signed_num;
|
|
|
|
char *w;
|
|
|
|
if(*f != '%') {
|
|
/* This isn't a format spec, so write everything out until the next one
|
|
OR end of string is reached. */
|
|
do {
|
|
OUTCHAR(*f);
|
|
} while(*++f && ('%' != *f));
|
|
continue;
|
|
}
|
|
|
|
++f;
|
|
|
|
/* Check for "%%". Note that although the ANSI standard lists
|
|
'%' as a conversion specifier, it says "The complete format
|
|
specification shall be `%%'," so we can avoid all the width
|
|
and precision processing. */
|
|
if(*f == '%') {
|
|
++f;
|
|
OUTCHAR('%');
|
|
continue;
|
|
}
|
|
|
|
/* If this is a positional parameter, the position must follow immediately
|
|
after the %, thus create a %<num>$ sequence */
|
|
param = dprintf_DollarString(f, &f);
|
|
|
|
if(!param)
|
|
param = param_num;
|
|
else
|
|
--param;
|
|
|
|
param_num++; /* increase this always to allow "%2$s %1$s %s" and then the
|
|
third %s will pick the 3rd argument */
|
|
|
|
p = &vto[param];
|
|
|
|
/* pick up the specified width */
|
|
if(p->flags & FLAGS_WIDTHPARAM) {
|
|
width = (long)vto[p->width].data.num.as_signed;
|
|
param_num++; /* since the width is extracted from a parameter, we
|
|
must skip that to get to the next one properly */
|
|
if(width < 0) {
|
|
/* "A negative field width is taken as a '-' flag followed by a
|
|
positive field width." */
|
|
width = -width;
|
|
p->flags |= FLAGS_LEFT;
|
|
p->flags &= ~FLAGS_PAD_NIL;
|
|
}
|
|
}
|
|
else
|
|
width = p->width;
|
|
|
|
/* pick up the specified precision */
|
|
if(p->flags & FLAGS_PRECPARAM) {
|
|
prec = (long)vto[p->precision].data.num.as_signed;
|
|
param_num++; /* since the precision is extracted from a parameter, we
|
|
must skip that to get to the next one properly */
|
|
if(prec < 0)
|
|
/* "A negative precision is taken as if the precision were
|
|
omitted." */
|
|
prec = -1;
|
|
}
|
|
else if(p->flags & FLAGS_PREC)
|
|
prec = p->precision;
|
|
else
|
|
prec = -1;
|
|
|
|
is_alt = (p->flags & FLAGS_ALT) ? 1 : 0;
|
|
|
|
switch(p->type) {
|
|
case FORMAT_INT:
|
|
num = p->data.num.as_unsigned;
|
|
if(p->flags & FLAGS_CHAR) {
|
|
/* Character. */
|
|
if(!(p->flags & FLAGS_LEFT))
|
|
while(--width > 0)
|
|
OUTCHAR(' ');
|
|
OUTCHAR((char) num);
|
|
if(p->flags & FLAGS_LEFT)
|
|
while(--width > 0)
|
|
OUTCHAR(' ');
|
|
break;
|
|
}
|
|
if(p->flags & FLAGS_OCTAL) {
|
|
/* Octal unsigned integer. */
|
|
base = 8;
|
|
goto unsigned_number;
|
|
}
|
|
else if(p->flags & FLAGS_HEX) {
|
|
/* Hexadecimal unsigned integer. */
|
|
|
|
digits = (p->flags & FLAGS_UPPER)? upper_digits : lower_digits;
|
|
base = 16;
|
|
goto unsigned_number;
|
|
}
|
|
else if(p->flags & FLAGS_UNSIGNED) {
|
|
/* Decimal unsigned integer. */
|
|
base = 10;
|
|
goto unsigned_number;
|
|
}
|
|
|
|
/* Decimal integer. */
|
|
base = 10;
|
|
|
|
is_neg = (p->data.num.as_signed < (mp_intmax_t)0) ? 1 : 0;
|
|
if(is_neg) {
|
|
/* signed_num might fail to hold absolute negative minimum by 1 */
|
|
signed_num = p->data.num.as_signed + (mp_intmax_t)1;
|
|
signed_num = -signed_num;
|
|
num = (mp_uintmax_t)signed_num;
|
|
num += (mp_uintmax_t)1;
|
|
}
|
|
|
|
goto number;
|
|
|
|
unsigned_number:
|
|
/* Unsigned number of base BASE. */
|
|
is_neg = 0;
|
|
|
|
number:
|
|
/* Number of base BASE. */
|
|
|
|
/* Supply a default precision if none was given. */
|
|
if(prec == -1)
|
|
prec = 1;
|
|
|
|
/* Put the number in WORK. */
|
|
w = workend;
|
|
while(num > 0) {
|
|
*w-- = digits[num % base];
|
|
num /= base;
|
|
}
|
|
width -= (long)(workend - w);
|
|
prec -= (long)(workend - w);
|
|
|
|
if(is_alt && base == 8 && prec <= 0) {
|
|
*w-- = '0';
|
|
--width;
|
|
}
|
|
|
|
if(prec > 0) {
|
|
width -= prec;
|
|
while(prec-- > 0 && w >= work)
|
|
*w-- = '0';
|
|
}
|
|
|
|
if(is_alt && base == 16)
|
|
width -= 2;
|
|
|
|
if(is_neg || (p->flags & FLAGS_SHOWSIGN) || (p->flags & FLAGS_SPACE))
|
|
--width;
|
|
|
|
if(!(p->flags & FLAGS_LEFT) && !(p->flags & FLAGS_PAD_NIL))
|
|
while(width-- > 0)
|
|
OUTCHAR(' ');
|
|
|
|
if(is_neg)
|
|
OUTCHAR('-');
|
|
else if(p->flags & FLAGS_SHOWSIGN)
|
|
OUTCHAR('+');
|
|
else if(p->flags & FLAGS_SPACE)
|
|
OUTCHAR(' ');
|
|
|
|
if(is_alt && base == 16) {
|
|
OUTCHAR('0');
|
|
if(p->flags & FLAGS_UPPER)
|
|
OUTCHAR('X');
|
|
else
|
|
OUTCHAR('x');
|
|
}
|
|
|
|
if(!(p->flags & FLAGS_LEFT) && (p->flags & FLAGS_PAD_NIL))
|
|
while(width-- > 0)
|
|
OUTCHAR('0');
|
|
|
|
/* Write the number. */
|
|
while(++w <= workend) {
|
|
OUTCHAR(*w);
|
|
}
|
|
|
|
if(p->flags & FLAGS_LEFT)
|
|
while(width-- > 0)
|
|
OUTCHAR(' ');
|
|
break;
|
|
|
|
case FORMAT_STRING:
|
|
/* String. */
|
|
{
|
|
static const char null[] = "(nil)";
|
|
const char *str;
|
|
size_t len;
|
|
|
|
str = (char *) p->data.str;
|
|
if(!str) {
|
|
/* Write null[] if there's space. */
|
|
if(prec == -1 || prec >= (long) sizeof(null) - 1) {
|
|
str = null;
|
|
len = sizeof(null) - 1;
|
|
/* Disable quotes around (nil) */
|
|
p->flags &= (~FLAGS_ALT);
|
|
}
|
|
else {
|
|
str = "";
|
|
len = 0;
|
|
}
|
|
}
|
|
else if(prec != -1)
|
|
len = (size_t)prec;
|
|
else if(*str == '\0')
|
|
len = 0;
|
|
else
|
|
len = strlen(str);
|
|
|
|
width -= (len > LONG_MAX) ? LONG_MAX : (long)len;
|
|
|
|
if(p->flags & FLAGS_ALT)
|
|
OUTCHAR('"');
|
|
|
|
if(!(p->flags&FLAGS_LEFT))
|
|
while(width-- > 0)
|
|
OUTCHAR(' ');
|
|
|
|
for(; len && *str; len--)
|
|
OUTCHAR(*str++);
|
|
if(p->flags&FLAGS_LEFT)
|
|
while(width-- > 0)
|
|
OUTCHAR(' ');
|
|
|
|
if(p->flags & FLAGS_ALT)
|
|
OUTCHAR('"');
|
|
}
|
|
break;
|
|
|
|
case FORMAT_PTR:
|
|
/* Generic pointer. */
|
|
{
|
|
void *ptr;
|
|
ptr = (void *) p->data.ptr;
|
|
if(ptr) {
|
|
/* If the pointer is not NULL, write it as a %#x spec. */
|
|
base = 16;
|
|
digits = (p->flags & FLAGS_UPPER)? upper_digits : lower_digits;
|
|
is_alt = 1;
|
|
num = (size_t) ptr;
|
|
is_neg = 0;
|
|
goto number;
|
|
}
|
|
else {
|
|
/* Write "(nil)" for a nil pointer. */
|
|
static const char strnil[] = "(nil)";
|
|
const char *point;
|
|
|
|
width -= (long)(sizeof(strnil) - 1);
|
|
if(p->flags & FLAGS_LEFT)
|
|
while(width-- > 0)
|
|
OUTCHAR(' ');
|
|
for(point = strnil; *point != '\0'; ++point)
|
|
OUTCHAR(*point);
|
|
if(!(p->flags & FLAGS_LEFT))
|
|
while(width-- > 0)
|
|
OUTCHAR(' ');
|
|
}
|
|
}
|
|
break;
|
|
|
|
case FORMAT_DOUBLE:
|
|
{
|
|
char formatbuf[32]="%";
|
|
char *fptr = &formatbuf[1];
|
|
size_t left = sizeof(formatbuf)-strlen(formatbuf);
|
|
int len;
|
|
|
|
width = -1;
|
|
if(p->flags & FLAGS_WIDTH)
|
|
width = p->width;
|
|
else if(p->flags & FLAGS_WIDTHPARAM)
|
|
width = (long)vto[p->width].data.num.as_signed;
|
|
|
|
prec = -1;
|
|
if(p->flags & FLAGS_PREC)
|
|
prec = p->precision;
|
|
else if(p->flags & FLAGS_PRECPARAM)
|
|
prec = (long)vto[p->precision].data.num.as_signed;
|
|
|
|
if(p->flags & FLAGS_LEFT)
|
|
*fptr++ = '-';
|
|
if(p->flags & FLAGS_SHOWSIGN)
|
|
*fptr++ = '+';
|
|
if(p->flags & FLAGS_SPACE)
|
|
*fptr++ = ' ';
|
|
if(p->flags & FLAGS_ALT)
|
|
*fptr++ = '#';
|
|
|
|
*fptr = 0;
|
|
|
|
if(width >= 0) {
|
|
if(width >= (long)sizeof(work))
|
|
width = sizeof(work)-1;
|
|
/* RECURSIVE USAGE */
|
|
len = curl_msnprintf(fptr, left, "%ld", width);
|
|
fptr += len;
|
|
left -= len;
|
|
}
|
|
if(prec >= 0) {
|
|
/* for each digit in the integer part, we can have one less
|
|
precision */
|
|
size_t maxprec = sizeof(work) - 2;
|
|
double val = p->data.dnum;
|
|
if(width > 0 && prec <= width)
|
|
maxprec -= width;
|
|
while(val >= 10.0) {
|
|
val /= 10;
|
|
maxprec--;
|
|
}
|
|
|
|
if(prec > (long)maxprec)
|
|
prec = (long)maxprec-1;
|
|
if(prec < 0)
|
|
prec = 0;
|
|
/* RECURSIVE USAGE */
|
|
len = curl_msnprintf(fptr, left, ".%ld", prec);
|
|
fptr += len;
|
|
}
|
|
if(p->flags & FLAGS_LONG)
|
|
*fptr++ = 'l';
|
|
|
|
if(p->flags & FLAGS_FLOATE)
|
|
*fptr++ = (char)((p->flags & FLAGS_UPPER) ? 'E':'e');
|
|
else if(p->flags & FLAGS_FLOATG)
|
|
*fptr++ = (char)((p->flags & FLAGS_UPPER) ? 'G' : 'g');
|
|
else
|
|
*fptr++ = 'f';
|
|
|
|
*fptr = 0; /* and a final null-termination */
|
|
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wformat-nonliteral"
|
|
#endif
|
|
/* NOTE NOTE NOTE!! Not all sprintf implementations return number of
|
|
output characters */
|
|
#ifdef HAVE_SNPRINTF
|
|
(snprintf)(work, sizeof(work), formatbuf, p->data.dnum);
|
|
#else
|
|
(sprintf)(work, formatbuf, p->data.dnum);
|
|
#endif
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
DEBUGASSERT(strlen(work) <= sizeof(work));
|
|
for(fptr = work; *fptr; fptr++)
|
|
OUTCHAR(*fptr);
|
|
}
|
|
break;
|
|
|
|
case FORMAT_INTPTR:
|
|
/* Answer the count of characters written. */
|
|
#ifdef HAVE_LONG_LONG_TYPE
|
|
if(p->flags & FLAGS_LONGLONG)
|
|
*(LONG_LONG_TYPE *) p->data.ptr = (LONG_LONG_TYPE)done;
|
|
else
|
|
#endif
|
|
if(p->flags & FLAGS_LONG)
|
|
*(long *) p->data.ptr = (long)done;
|
|
else if(!(p->flags & FLAGS_SHORT))
|
|
*(int *) p->data.ptr = (int)done;
|
|
else
|
|
*(short *) p->data.ptr = (short)done;
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
f = *end++; /* goto end of %-code */
|
|
|
|
}
|
|
return done;
|
|
}
|
|
|
|
/* fputc() look-alike */
|
|
static int addbyter(int output, FILE *data)
|
|
{
|
|
struct nsprintf *infop = (struct nsprintf *)data;
|
|
unsigned char outc = (unsigned char)output;
|
|
|
|
if(infop->length < infop->max) {
|
|
/* only do this if we haven't reached max length yet */
|
|
infop->buffer[0] = outc; /* store */
|
|
infop->buffer++; /* increase pointer */
|
|
infop->length++; /* we are now one byte larger */
|
|
return outc; /* fputc() returns like this on success */
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format,
|
|
va_list ap_save)
|
|
{
|
|
int retcode;
|
|
struct nsprintf info;
|
|
|
|
info.buffer = buffer;
|
|
info.length = 0;
|
|
info.max = maxlength;
|
|
|
|
retcode = dprintf_formatf(&info, addbyter, format, ap_save);
|
|
if(info.max) {
|
|
/* we terminate this with a zero byte */
|
|
if(info.max == info.length) {
|
|
/* we're at maximum, scrap the last letter */
|
|
info.buffer[-1] = 0;
|
|
DEBUGASSERT(retcode);
|
|
retcode--; /* don't count the nul byte */
|
|
}
|
|
else
|
|
info.buffer[0] = 0;
|
|
}
|
|
return retcode;
|
|
}
|
|
|
|
int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...)
|
|
{
|
|
int retcode;
|
|
va_list ap_save; /* argument pointer */
|
|
va_start(ap_save, format);
|
|
retcode = curl_mvsnprintf(buffer, maxlength, format, ap_save);
|
|
va_end(ap_save);
|
|
return retcode;
|
|
}
|
|
|
|
/* fputc() look-alike */
|
|
static int alloc_addbyter(int output, FILE *data)
|
|
{
|
|
struct asprintf *infop = (struct asprintf *)data;
|
|
unsigned char outc = (unsigned char)output;
|
|
|
|
if(Curl_dyn_addn(infop->b, &outc, 1)) {
|
|
infop->fail = 1;
|
|
return -1; /* fail */
|
|
}
|
|
return outc; /* fputc() returns like this on success */
|
|
}
|
|
|
|
/* appends the formatted string, returns 0 on success, 1 on error */
|
|
int Curl_dyn_vprintf(struct dynbuf *dyn, const char *format, va_list ap_save)
|
|
{
|
|
struct asprintf info;
|
|
info.b = dyn;
|
|
info.fail = 0;
|
|
|
|
(void)dprintf_formatf(&info, alloc_addbyter, format, ap_save);
|
|
if(info.fail) {
|
|
Curl_dyn_free(info.b);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
char *curl_mvaprintf(const char *format, va_list ap_save)
|
|
{
|
|
struct asprintf info;
|
|
struct dynbuf dyn;
|
|
info.b = &dyn;
|
|
Curl_dyn_init(info.b, DYN_APRINTF);
|
|
info.fail = 0;
|
|
|
|
(void)dprintf_formatf(&info, alloc_addbyter, format, ap_save);
|
|
if(info.fail) {
|
|
Curl_dyn_free(info.b);
|
|
return NULL;
|
|
}
|
|
if(Curl_dyn_len(info.b))
|
|
return Curl_dyn_ptr(info.b);
|
|
return strdup("");
|
|
}
|
|
|
|
char *curl_maprintf(const char *format, ...)
|
|
{
|
|
va_list ap_save;
|
|
char *s;
|
|
va_start(ap_save, format);
|
|
s = curl_mvaprintf(format, ap_save);
|
|
va_end(ap_save);
|
|
return s;
|
|
}
|
|
|
|
static int storebuffer(int output, FILE *data)
|
|
{
|
|
char **buffer = (char **)data;
|
|
unsigned char outc = (unsigned char)output;
|
|
**buffer = outc;
|
|
(*buffer)++;
|
|
return outc; /* act like fputc() ! */
|
|
}
|
|
|
|
int curl_msprintf(char *buffer, const char *format, ...)
|
|
{
|
|
va_list ap_save; /* argument pointer */
|
|
int retcode;
|
|
va_start(ap_save, format);
|
|
retcode = dprintf_formatf(&buffer, storebuffer, format, ap_save);
|
|
va_end(ap_save);
|
|
*buffer = 0; /* we terminate this with a zero byte */
|
|
return retcode;
|
|
}
|
|
|
|
int curl_mprintf(const char *format, ...)
|
|
{
|
|
int retcode;
|
|
va_list ap_save; /* argument pointer */
|
|
va_start(ap_save, format);
|
|
|
|
retcode = dprintf_formatf(stdout, fputc, format, ap_save);
|
|
va_end(ap_save);
|
|
return retcode;
|
|
}
|
|
|
|
int curl_mfprintf(FILE *whereto, const char *format, ...)
|
|
{
|
|
int retcode;
|
|
va_list ap_save; /* argument pointer */
|
|
va_start(ap_save, format);
|
|
retcode = dprintf_formatf(whereto, fputc, format, ap_save);
|
|
va_end(ap_save);
|
|
return retcode;
|
|
}
|
|
|
|
int curl_mvsprintf(char *buffer, const char *format, va_list ap_save)
|
|
{
|
|
int retcode;
|
|
retcode = dprintf_formatf(&buffer, storebuffer, format, ap_save);
|
|
*buffer = 0; /* we terminate this with a zero byte */
|
|
return retcode;
|
|
}
|
|
|
|
int curl_mvprintf(const char *format, va_list ap_save)
|
|
{
|
|
return dprintf_formatf(stdout, fputc, format, ap_save);
|
|
}
|
|
|
|
int curl_mvfprintf(FILE *whereto, const char *format, va_list ap_save)
|
|
{
|
|
return dprintf_formatf(whereto, fputc, format, ap_save);
|
|
}
|