romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 21:43:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests/server: stop using libcurl's printf functions

Browse source 
Since the test servers are not built with libcurl the *printf code
needed to get built separately, and they are not in the curlx
collection.

snprintf() is provided in all modern systems these days.

Move curlx functions from lib/strerror.c to lib/curlx/winapi.c

Assisted-by: Viktor Szakats

Closes #17294
This commit is contained in:
Daniel Stenberg 2025-05-09 10:46:42 +02:00
parent 2e1040fa5c
commit 8b33704511
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
11 changed files with 107 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/server/Makefile.inc
View file

@ -29,14 +29,12 @@ MEMDEBUG = \
../../lib/memdebug.h
CURLX_SRCS = \
../../lib/mprintf.c \
../../lib/curlx/nonblock.c \
../../lib/curlx/strparse.c \
../../lib/strequal.c \
../../lib/curlx/warnless.c \
../../lib/curlx/timediff.c \
../../lib/curlx/timeval.c \
../../lib/curlx/dynbuf.c \
../../lib/strcase.c \
../../lib/curlx/multibyte.c \
../../lib/curlx/version_win32.c
@ -49,7 +47,6 @@ CURLX_HDRS = \
../../lib/curlx/warnless.h \
../../lib/curlx/timediff.h \
../../lib/curlx/timeval.h \
../../lib/curlx/dynbuf.h \
../../lib/strcase.h \
../../lib/curlx/multibyte.h \
../../lib/curlx/version_win32.h

4
tests/server/dnsd.c
View file

@ -121,7 +121,7 @@ static int store_incoming(const unsigned char *data, size_t size,
*qtype = 0;
*idp = 0;
msnprintf(dumpfile, sizeof(dumpfile), "%s/dnsd.input", logdir);
snprintf(dumpfile, sizeof(dumpfile), "%s/dnsd.input", logdir);
/* Open request dump file. */
server = fopen(dumpfile, "ab");
@ -475,7 +475,7 @@ int main(int argc, char **argv)
}
}
msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/dnsd-%s.lock",
snprintf(loglockfile, sizeof(loglockfile), "%s/%s/dnsd-%s.lock",
logdir, SERVERLOGS_LOCKDIR, ipv_inuse);
#ifdef _WIN32

1
tests/server/getpart.c
View file

@ -24,7 +24,6 @@
#include "server_setup.h"
#include "getpart.h"
#include <curlx.h> /* from the private lib dir */
#include "curl_memory.h"

23
tests/server/mqttd.c
View file

@ -157,13 +157,13 @@ static void logprotocol(mqttdir dir,
int left = sizeof(data);
for(i = 0; i < len && (left >= 0); i++) {
msnprintf(optr, left, "%02x", ptr[i]);
snprintf(optr, left, "%02x", ptr[i]);
optr += 2;
left -= 2;
}
fprintf(output, "%s %s %zx %s\n",
fprintf(output, "%s %s %x %s\n",
dir == FROM_CLIENT ? "client" : "server",
prefix, remlen, data);
prefix, (int)remlen, data);
}
@ -446,7 +446,7 @@ static curl_socket_t mqttit(curl_socket_t fd)
'M','Q','T','T', /* protocol name */
0x04 /* protocol level */
};
msnprintf(dumpfile, sizeof(dumpfile), "%s/%s", logdir, REQUEST_DUMP);
snprintf(dumpfile, sizeof(dumpfile), "%s/%s", logdir, REQUEST_DUMP);
dump = fopen(dumpfile, "ab");
if(!dump)
goto end;
@ -721,12 +721,11 @@ static bool mqttd_incoming(curl_socket_t listenfd)
curl_socket_t newfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == newfd) {
error = SOCKERRNO;
logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) "
"failed with error (%d) %s", sockfd, error, sstrerror(error));
logmsg("accept() failed with error (%d) %s", error, sstrerror(error));
}
else {
logmsg("====> Client connect, fd %" FMT_SOCKET_T ". "
"Read config from %s", newfd, configfile);
logmsg("====> Client connect, fd %ld. "
"Read config from %s", (long)newfd, configfile);
set_advisor_read_lock(loglockfile);
(void)mqttit(newfd); /* until done */
clear_advisor_read_lock(loglockfile);
@ -873,8 +872,8 @@ static curl_socket_t mqttd_sockdaemon(curl_socket_t sock,
rc = listen(sock, 5);
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error (%d) %s",
sock, error, sstrerror(error));
logmsg("listen(%ld, 5) failed with error (%d) %s",
(long)sock, error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
@ -980,8 +979,8 @@ int main(int argc, char *argv[])
}
}
msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/mqtt-%s.lock",
logdir, SERVERLOGS_LOCKDIR, ipv_inuse);
snprintf(loglockfile, sizeof(loglockfile), "%s/%s/mqtt-%s.lock",
logdir, SERVERLOGS_LOCKDIR, ipv_inuse);
#ifdef _WIN32
if(win32_init())

41
tests/server/rtspd.c
View file

@ -191,7 +191,6 @@ static int rtspd_ProcessRequest(struct rtspd_httprequest *req)
&prot_major,
&prot_minor) == 5) {
char *ptr;
char logbuf[256];
if(!strcmp(prot_str, "HTTP")) {
req->protocol = RPROT_HTTP;
@ -214,12 +213,11 @@ static int rtspd_ProcessRequest(struct rtspd_httprequest *req)
if(ptr) {
FILE *stream;
if((strlen(doc) + strlen(request)) < 200)
msnprintf(logbuf, sizeof(logbuf), "Got request: %s %s %s/%d.%d",
request, doc, prot_str, prot_major, prot_minor);
logmsg("Got request: %s %s %s/%d.%d",
request, doc, prot_str, prot_major, prot_minor);
else
msnprintf(logbuf, sizeof(logbuf), "Got a *HUGE* request %s/%d.%d",
prot_str, prot_major, prot_minor);
logmsg("%s", logbuf);
logmsg("Got a *HUGE* request %s/%d.%d",
prot_str, prot_major, prot_minor);
if(!strncmp("/verifiedserver", ptr, 15)) {
logmsg("Are-we-friendly question received");
@ -248,9 +246,7 @@ static int rtspd_ProcessRequest(struct rtspd_httprequest *req)
else
req->partno = 0;
msnprintf(logbuf, sizeof(logbuf), "Requested test number %ld part %ld",
req->testno, req->partno);
logmsg("%s", logbuf);
logmsg("Requested test number %ld part %ld", req->testno, req->partno);
stream = test2fopen(req->testno, logdir);
@ -374,10 +370,8 @@ static int rtspd_ProcessRequest(struct rtspd_httprequest *req)
else {
if(sscanf(req->reqbuf, "CONNECT %" MAXDOCNAMELEN_TXT "s HTTP/%d.%d",
doc, &prot_major, &prot_minor) == 3) {
msnprintf(logbuf, sizeof(logbuf),
"Received a CONNECT %s HTTP/%d.%d request",
doc, prot_major, prot_minor);
logmsg("%s", logbuf);
logmsg("Received a CONNECT %s HTTP/%d.%d request",
doc, prot_major, prot_minor);
if(req->prot_version == 10)
req->open = FALSE; /* HTTP 1.0 closes connection by default */
@ -564,7 +558,7 @@ static void rtspd_storerequest(char *reqbuf, size_t totalsize)
FILE *dump;
char dumpfile[256];
msnprintf(dumpfile, sizeof(dumpfile), "%s/%s", logdir, REQUEST_DUMP);
snprintf(dumpfile, sizeof(dumpfile), "%s/%s", logdir, REQUEST_DUMP);
if(!reqbuf)
return;
@ -739,8 +733,7 @@ static int rtspd_send_doc(curl_socket_t sock, struct rtspd_httprequest *req)
static char weare[256];
char responsedump[256];
msnprintf(responsedump, sizeof(responsedump), "%s/%s",
logdir, RESPONSE_DUMP);
snprintf(responsedump, sizeof(responsedump), "%s/%s", logdir, RESPONSE_DUMP);
logmsg("Send response number %ld part %ld", req->testno, req->partno);
@ -780,12 +773,12 @@ static int rtspd_send_doc(curl_socket_t sock, struct rtspd_httprequest *req)
case DOCNUMBER_WERULEZ:
/* we got a "friends?" question, reply back that we sure are */
logmsg("Identifying ourselves as friends");
msnprintf(msgbuf, sizeof(msgbuf), "RTSP_SERVER WE ROOLZ: %"
CURL_FORMAT_CURL_OFF_T "\r\n", our_getpid());
snprintf(msgbuf, sizeof(msgbuf), "RTSP_SERVER WE ROOLZ: %ld\r\n",
(long)our_getpid());
msglen = strlen(msgbuf);
msnprintf(weare, sizeof(weare),
"HTTP/1.1 200 OK\r\nContent-Length: %zu\r\n\r\n%s",
msglen, msgbuf);
snprintf(weare, sizeof(weare),
"HTTP/1.1 200 OK\r\nContent-Length: %u\r\n\r\n%s",
(unsigned int)msglen, msgbuf);
buffer = weare;
break;
case DOCNUMBER_INTERNAL:
@ -817,7 +810,7 @@ static int rtspd_send_doc(curl_socket_t sock, struct rtspd_httprequest *req)
FILE *stream = test2fopen(req->testno, logdir);
char partbuf[80]="data";
if(0 != req->partno)
msnprintf(partbuf, sizeof(partbuf), "data%ld", req->partno);
snprintf(partbuf, sizeof(partbuf), "data%ld", req->partno);
if(!stream) {
error = errno;
logmsg("fopen() failed with error (%d) %s", error, strerror(error));
@ -1105,8 +1098,8 @@ int main(int argc, char *argv[])
}
}
msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/rtsp-%s.lock",
logdir, SERVERLOGS_LOCKDIR, ipv_inuse);
snprintf(loglockfile, sizeof(loglockfile), "%s/%s/rtsp-%s.lock",
logdir, SERVERLOGS_LOCKDIR, ipv_inuse);
#ifdef _WIN32
if(win32_init())

23
tests/server/sockfilt.c
View file

@ -359,20 +359,20 @@ static void lograw(unsigned char *buffer, ssize_t len)
for(i = 0; i < len; i++) {
switch(ptr[i]) {
case '\n':
msnprintf(optr, left, "\\n");
snprintf(optr, left, "\\n");
width += 2;
optr += 2;
left -= 2;
break;
case '\r':
msnprintf(optr, left, "\\r");
snprintf(optr, left, "\\r");
width += 2;
optr += 2;
left -= 2;
break;
default:
msnprintf(optr, left, "%c", (ISGRAPH(ptr[i]) ||
ptr[i] == 0x20) ? ptr[i] : '.');
snprintf(optr, left, "%c", (ISGRAPH(ptr[i]) ||
ptr[i] == 0x20) ? ptr[i] : '.');
width++;
optr++;
left--;
@ -1125,10 +1125,10 @@ static bool juggle(curl_socket_t *sockfdp,
else if(!memcmp("PORT", buffer, 4)) {
/* Question asking us what PORT number we are listening to.
Replies to PORT with "IPv[num]/[port]" */
msnprintf((char *)buffer, sizeof(buffer), "%s/%hu\n",
ipv_inuse, server_port);
snprintf((char *)buffer, sizeof(buffer), "%s/%hu\n",
ipv_inuse, server_port);
buffer_len = (ssize_t)strlen((char *)buffer);
msnprintf(data, sizeof(data), "PORT\n%04zx\n", buffer_len);
snprintf(data, sizeof(data), "PORT\n%04x\n", (int)buffer_len);
if(!write_stdout(data, 10))
return FALSE;
if(!write_stdout(buffer, buffer_len))
@ -1186,8 +1186,7 @@ static bool juggle(curl_socket_t *sockfdp,
curl_socket_t newfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == newfd) {
error = SOCKERRNO;
logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) "
"failed with error (%d) %s", sockfd, error, sstrerror(error));
logmsg("accept() failed with error (%d) %s", error, sstrerror(error));
}
else {
logmsg("====> Client connect");
@ -1203,7 +1202,7 @@ static bool juggle(curl_socket_t *sockfdp,
nread_socket = sread(sockfd, buffer, sizeof(buffer));
if(nread_socket > 0) {
msnprintf(data, sizeof(data), "DATA\n%04zx\n", nread_socket);
snprintf(data, sizeof(data), "DATA\n%04x\n", (int)nread_socket);
if(!write_stdout(data, 10))
return FALSE;
if(!write_stdout(buffer, nread_socket))
@ -1364,8 +1363,8 @@ static curl_socket_t sockfilt_sockdaemon(curl_socket_t sock,
rc = listen(sock, 5);
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error (%d) %s",
sock, error, sstrerror(error));
logmsg("listen() failed with error (%d) %s",
error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}

16
tests/server/socksd.c
View file

@ -708,14 +708,13 @@ static bool socksd_incoming(curl_socket_t listenfd)
curl_socket_t newfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == newfd) {
error = SOCKERRNO;
logmsg("accept(%" FMT_SOCKET_T ", NULL, NULL) "
"failed with error (%d) %s",
sockfd, error, sstrerror(error));
logmsg("accept() failed with error (%d) %s",
error, sstrerror(error));
}
else {
curl_socket_t remotefd;
logmsg("====> Client connect, fd %" FMT_SOCKET_T ". "
"Read config from %s", newfd, configfile);
logmsg("====> Client connect, "
"Read config from %s", configfile);
remotefd = sockit(newfd); /* SOCKS until done */
if(remotefd == CURL_SOCKET_BAD) {
logmsg("====> Client disconnect");
@ -906,8 +905,7 @@ static curl_socket_t socksd_sockdaemon(curl_socket_t sock,
rc = listen(sock, 5);
if(0 != rc) {
error = SOCKERRNO;
logmsg("listen(%" FMT_SOCKET_T ", 5) failed with error (%d) %s",
sock, error, sstrerror(error));
logmsg("listen() failed with error (%d) %s", error, sstrerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
@ -1004,8 +1002,8 @@ int main(int argc, char *argv[])
unix_socket = argv[arg];
if(strlen(unix_socket) >= sizeof(sau.sun_path)) {
fprintf(stderr,
"socksd: socket path must be shorter than %zu chars: %s\n",
sizeof(sau.sun_path), unix_socket);
"socksd: socket path must be shorter than %u chars: %s\n",
(unsigned int)sizeof(sau.sun_path), unix_socket);
return 0;
}
socket_domain = AF_UNIX;

66
tests/server/sws.c
View file

@ -330,7 +330,6 @@ static int sws_ProcessRequest(struct sws_httprequest *req)
char *line = &req->reqbuf[req->checkindex];
bool chunked = FALSE;
static char request[REQUEST_KEYWORD_SIZE];
char logbuf[456];
int prot_major = 0;
int prot_minor = 0;
char *end = strstr(line, end_of_headers);
@ -398,12 +397,10 @@ static int sws_ProcessRequest(struct sws_httprequest *req)
/* get the number after it */
if(*ptr == '/') {
if((npath + strlen(request)) < 400)
msnprintf(logbuf, sizeof(logbuf), "Got request: %s %.*s HTTP/%d.%d",
request, (int)npath, httppath, prot_major, prot_minor);
logmsg("Got request: %s %.*s HTTP/%d.%d",
request, (int)npath, httppath, prot_major, prot_minor);
else
msnprintf(logbuf, sizeof(logbuf), "Got a *HUGE* request HTTP/%d.%d",
prot_major, prot_minor);
logmsg("%s", logbuf);
logmsg("Got a *HUGE* request HTTP/%d.%d", prot_major, prot_minor);
if(!strncmp("/verifiedserver", ptr, 15)) {
logmsg("Are-we-friendly question received");
@ -429,10 +426,7 @@ static int sws_ProcessRequest(struct sws_httprequest *req)
req->partno = 0;
if(req->testno) {
msnprintf(logbuf, sizeof(logbuf), "Serve test number %ld part %ld",
req->testno, req->partno);
logmsg("%s", logbuf);
logmsg("Serve test number %ld part %ld", req->testno, req->partno);
}
else {
logmsg("No test number in path");
@ -449,10 +443,8 @@ static int sws_ProcessRequest(struct sws_httprequest *req)
doc, &prot_major, &prot_minor) == 3) {
char *portp = NULL;
msnprintf(logbuf, sizeof(logbuf),
"Received a CONNECT %s HTTP/%d.%d request",
doc, prot_major, prot_minor);
logmsg("%s", logbuf);
logmsg("Received a CONNECT %s HTTP/%d.%d request",
doc, prot_major, prot_minor);
req->connect_request = TRUE;
@ -561,10 +553,8 @@ static int sws_ProcessRequest(struct sws_httprequest *req)
else
req->partno = 0;
msnprintf(logbuf, sizeof(logbuf),
"Requested GOPHER test number %ld part %ld",
req->testno, req->partno);
logmsg("%s", logbuf);
logmsg("Requested GOPHER test number %ld part %ld",
req->testno, req->partno);
}
}
@ -751,8 +741,8 @@ static void sws_storerequest(const char *reqbuf, size_t totalsize)
FILE *dump;
char dumpfile[256];
msnprintf(dumpfile, sizeof(dumpfile), "%s/%s",
logdir, is_proxy ? REQUEST_PROXY_DUMP : REQUEST_DUMP);
snprintf(dumpfile, sizeof(dumpfile), "%s/%s",
logdir, is_proxy ? REQUEST_PROXY_DUMP : REQUEST_DUMP);
if(!reqbuf)
return;
@ -989,8 +979,8 @@ static int sws_send_doc(curl_socket_t sock, struct sws_httprequest *req)
static char weare[256];
char responsedump[256];
msnprintf(responsedump, sizeof(responsedump), "%s/%s",
logdir, is_proxy ? RESPONSE_PROXY_DUMP : RESPONSE_DUMP);
snprintf(responsedump, sizeof(responsedump), "%s/%s",
logdir, is_proxy ? RESPONSE_PROXY_DUMP : RESPONSE_DUMP);
switch(req->rcmd) {
default:
@ -1028,15 +1018,15 @@ static int sws_send_doc(curl_socket_t sock, struct sws_httprequest *req)
case DOCNUMBER_WERULEZ:
/* we got a "friends?" question, reply back that we sure are */
logmsg("Identifying ourselves as friends");
msnprintf(msgbuf, sizeof(msgbuf), "WE ROOLZ: %"
CURL_FORMAT_CURL_OFF_T "\r\n", our_getpid());
snprintf(msgbuf, sizeof(msgbuf), "WE ROOLZ: %ld\r\n",
(long)our_getpid());
msglen = strlen(msgbuf);
if(use_gopher)
msnprintf(weare, sizeof(weare), "%s", msgbuf);
snprintf(weare, sizeof(weare), "%s", msgbuf);
else
msnprintf(weare, sizeof(weare),
"HTTP/1.1 200 OK\r\nContent-Length: %zu\r\n\r\n%s",
msglen, msgbuf);
snprintf(weare, sizeof(weare),
"HTTP/1.1 200 OK\r\nContent-Length: %u\r\n\r\n%s",
(unsigned int)msglen, msgbuf);
buffer = weare;
break;
case DOCNUMBER_404:
@ -1056,9 +1046,9 @@ static int sws_send_doc(curl_socket_t sock, struct sws_httprequest *req)
const char *section = req->connect_request ? "connect" : "data";
if(req->partno)
msnprintf(partbuf, sizeof(partbuf), "%s%ld", section, req->partno);
snprintf(partbuf, sizeof(partbuf), "%s%ld", section, req->partno);
else
msnprintf(partbuf, sizeof(partbuf), "%s", section);
snprintf(partbuf, sizeof(partbuf), "%s", section);
logmsg("Send response test%ld section <%s>", req->testno, partbuf);
@ -2094,8 +2084,8 @@ int main(int argc, char *argv[])
unix_socket = argv[arg];
if(strlen(unix_socket) >= sizeof(me.sau.sun_path)) {
fprintf(stderr,
"sws: socket path must be shorter than %zu chars: %s\n",
sizeof(me.sau.sun_path), unix_socket);
"sws: socket path must be shorter than %u chars: %s\n",
(unsigned int)sizeof(me.sau.sun_path), unix_socket);
return 0;
}
socket_type = "unix";
@ -2172,9 +2162,9 @@ int main(int argc, char *argv[])
}
}
msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/sws-%s%s-%s.lock",
logdir, SERVERLOGS_LOCKDIR, protocol_type,
is_proxy ? "-proxy" : "", socket_type);
snprintf(loglockfile, sizeof(loglockfile), "%s/%s/sws-%s%s-%s.lock",
logdir, SERVERLOGS_LOCKDIR, protocol_type,
is_proxy ? "-proxy" : "", socket_type);
#ifdef _WIN32
if(win32_init())
@ -2294,7 +2284,7 @@ int main(int argc, char *argv[])
#ifdef USE_UNIX_SOCKETS
if(socket_domain != AF_UNIX)
#endif
msnprintf(port_str, sizeof(port_str), "port %hu", port);
snprintf(port_str, sizeof(port_str), "port %hu", port);
logmsg("Running %s %s version on %s",
protocol_type, socket_type, location_str);
@ -2399,8 +2389,8 @@ int main(int argc, char *argv[])
curl_socket_t msgsock;
do {
msgsock = accept_connection(sock);
logmsg("accept_connection %" FMT_SOCKET_T
" returned %" FMT_SOCKET_T, sock, msgsock);
logmsg("accept_connection %ld returned %ld",
(long)sock, (long)msgsock);
if(CURL_SOCKET_BAD == msgsock)
goto sws_cleanup;
if(req->delay)

14
tests/server/tftpd.c
View file

@ -435,7 +435,7 @@ static ssize_t write_behind(struct testcase *test, int convert)
if(!test->ofile) {
char outfile[256];
msnprintf(outfile, sizeof(outfile), "%s/upload.%ld", logdir, test->testno);
snprintf(outfile, sizeof(outfile), "%s/upload.%ld", logdir, test->testno);
test->ofile = open(outfile, O_CREAT|O_RDWR|CURL_O_BINARY, 0777);
if(test->ofile == -1) {
logmsg("Couldn't create and/or open file %s for upload!", outfile);
@ -626,8 +626,8 @@ int main(int argc, char **argv)
}
}
msnprintf(loglockfile, sizeof(loglockfile), "%s/%s/tftp-%s.lock",
logdir, SERVERLOGS_LOCKDIR, ipv_inuse);
snprintf(loglockfile, sizeof(loglockfile), "%s/%s/tftp-%s.lock",
logdir, SERVERLOGS_LOCKDIR, ipv_inuse);
#ifdef _WIN32
if(win32_init())
@ -887,7 +887,7 @@ static int do_tftp(struct testcase *test, struct tftphdr *tp, ssize_t size)
FILE *server;
char dumpfile[256];
msnprintf(dumpfile, sizeof(dumpfile), "%s/%s", logdir, REQUEST_DUMP);
snprintf(dumpfile, sizeof(dumpfile), "%s/%s", logdir, REQUEST_DUMP);
/* Open request dump file. */
server = fopen(dumpfile, "ab");
@ -1065,8 +1065,8 @@ static int validate_access(struct testcase *test,
if(!strncmp("verifiedserver", filename, 14)) {
char weare[128];
size_t count = msnprintf(weare, sizeof(weare), "WE ROOLZ: %"
CURL_FORMAT_CURL_OFF_T "\r\n", our_getpid());
size_t count = snprintf(weare, sizeof(weare), "WE ROOLZ: %ld\r\n",
(long)our_getpid());
logmsg("Are-we-friendly question received");
test->buffer = strdup(weare);
@ -1111,7 +1111,7 @@ static int validate_access(struct testcase *test,
stream = test2fopen(testno, logdir);
if(0 != partno)
msnprintf(partbuf, sizeof(partbuf), "data%ld", partno);
snprintf(partbuf, sizeof(partbuf), "data%ld", partno);
if(!stream) {
int error = errno;

29
tests/server/util.c
View file

@ -78,7 +78,7 @@ char *data_to_hex(char *data, size_t len)
if((data[i] >= 0x20) && (data[i] < 0x7f))
*optr++ = *iptr++;
else {
msnprintf(optr, 4, "%%%02x", *iptr++);
snprintf(optr, 4, "%%%02x", (unsigned char)*iptr++);
optr += 3;
}
}
@ -95,7 +95,7 @@ void logmsg(const char *msg, ...)
struct curltime tv;
time_t sec;
struct tm *now;
char timebuf[20];
char timebuf[50];
static time_t epoch_offset;
static int known_offset;
@ -113,12 +113,19 @@ void logmsg(const char *msg, ...)
/* !checksrc! disable BANNEDFUNC 1 */
now = localtime(&sec); /* not thread safe but we don't care */
msnprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld",
(int)now->tm_hour, (int)now->tm_min, (int)now->tm_sec,
(long)tv.tv_usec);
snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d.%06ld",
(int)now->tm_hour, (int)now->tm_min, (int)now->tm_sec,
(long)tv.tv_usec);
va_start(ap, msg);
mvsnprintf(buffer, sizeof(buffer), msg, ap);
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wformat-nonliteral"
#endif
vsnprintf(buffer, sizeof(buffer), msg, ap);
#ifdef __clang__
#pragma clang diagnostic pop
#endif
va_end(ap);
do {
@ -148,7 +155,7 @@ void loghex(unsigned char *buffer, ssize_t len)
int left = sizeof(data);
for(i = 0; i < len && (left >= 0); i++) {
msnprintf(optr, left, "%02x", ptr[i]);
snprintf(optr, left, "%02x", ptr[i]);
width += 2;
optr += 2;
left -= 2;
@ -232,13 +239,13 @@ FILE *test2fopen(long testno, const char *logdir2)
FILE *stream;
char filename[256];
/* first try the alternative, preprocessed, file */
msnprintf(filename, sizeof(filename), "%s/test%ld", logdir2, testno);
snprintf(filename, sizeof(filename), "%s/test%ld", logdir2, testno);
stream = fopen(filename, "rb");
if(stream)
return stream;
/* then try the source version */
msnprintf(filename, sizeof(filename), "%s/data/test%ld", srcpath, testno);
snprintf(filename, sizeof(filename), "%s/data/test%ld", srcpath, testno);
stream = fopen(filename, "rb");
return stream;
@ -325,9 +332,9 @@ int write_pidfile(const char *filename)
logmsg("Couldn't write pid file: %s %s", filename, strerror(errno));
return 0; /* fail */
}
fprintf(pidfile, "%" CURL_FORMAT_CURL_OFF_T "\n", pid);
fprintf(pidfile, "%ld\n", (long)pid);
fclose(pidfile);
logmsg("Wrote pid %" CURL_FORMAT_CURL_OFF_T " to %s", pid, filename);
logmsg("Wrote pid %ld to %s", (long)pid, filename);
return 1; /* success */
}

25
tests/server/util.h
View file

@ -25,25 +25,12 @@
***************************************************************************/
#include "server_setup.h"
#include <curl/mprintf.h>
/* make the test servers use the libcurl *printf family */
# undef printf
# undef fprintf
# undef msnprintf
# undef vprintf
# undef vfprintf
# undef mvsnprintf
# undef aprintf
# undef vaprintf
# define printf curl_mprintf
# define fprintf curl_mfprintf
# define msnprintf curl_msnprintf
# define vprintf curl_mvprintf
# define vfprintf curl_mvfprintf
# define mvsnprintf curl_mvsnprintf
# define aprintf curl_maprintf
# define vaprintf curl_mvaprintf
/* adjust for old MSVC */
#ifdef _MSC_VER
# if _MSC_VER < 1900
# define snprintf _snprintf
# endif
#endif
enum {
DOCNUMBER_NOTHING = -7,