luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop testpart/getpart tool, simplify building standalone

Browse Source
This commit is contained in:
Viktor Szakats 2025-02-24 23:38:01 +01:00
parent 16979542e8
commit 3b7aaaf045
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 34 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/server/.gitignore vendored
View File

@ -9,5 +9,4 @@ rtspd
sockfilt
socksd
sws
testpart
tftpd

8
tests/server/Makefile.inc
View File

@ -22,8 +22,7 @@
#
###########################################################################
noinst_PROGRAMS = testpart resolve rtspd sockfilt sws tftpd \
socksd disabled mqttd
noinst_PROGRAMS = resolve rtspd sockfilt sws tftpd socksd disabled mqttd
CURLX_SRCS = \
../../lib/mprintf.c \
@ -68,11 +67,6 @@ UTIL = \
../../lib/strerror.c \
../../lib/strerror.h
testpart_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) \
testpart.c
testpart_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
testpart_CFLAGS = $(AM_CFLAGS)
resolve_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
resolve.c
resolve_LDADD = @CURL_NETWORK_AND_TIME_LIBS@

33
tests/server/getpart.c
View File

@ -25,13 +25,20 @@
#include "getpart.h"
#ifdef TEST
#include "curl/curl.h"
#include "warnless.h"
#else
#include "curlx.h" /* from the private lib dir */
#endif
#include "curl_base64.h"
#include "curl_memory.h"
#ifndef TEST
/* include memdebug.h last */
#include "memdebug.h"
#endif
#define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++
@ -477,3 +484,29 @@ int getpart(char **outbuf, size_t *outlen,
return error;
}
#ifdef TEST
#include "../../lib/base64.c"
#include "../../lib/warnless.c"
/* Build with:
* $ gcc getpart.c -DTEST -I../../include -I../../lib -DHAVE_CONFIG_H
*/
int main(int argc, char **argv)
{
if(argc < 3) {
printf("./getpart main sub\n");
}
else {
char *part;
size_t partlen;
int rc = getpart(&part, &partlen, argv[1], argv[2], stdin);
size_t i;
if(rc)
return rc;
for(i = 0; i < partlen; i++)
printf("%c", part[i]);
free(part);
}
return 0;
}
#endif

50
tests/server/testpart.c
View File

@ -1,50 +0,0 @@
/***************************************************************************
* _ _ ____ _
* 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
*
***************************************************************************/
#include "server_setup.h"
#include "getpart.h"
#include "curl_printf.h"
/* include memdebug.h last */
#include "memdebug.h"
int main(int argc, char **argv)
{
if(argc < 3) {
printf("./testpart main sub\n");
}
else {
char *part;
size_t partlen;
int rc = getpart(&part, &partlen, argv[1], argv[2], stdin);
size_t i;
if(rc)
return rc;
for(i = 0; i < partlen; i++)
printf("%c", part[i]);
free(part);
}
return 0;
}