build: drop unused `getpart` tool

Drop the `getpart` test tool from standard builds. This tool was not
used by tests.

Also:
- make it easier to build it standalone for testing `getpart.c` on
  the command-line.
- reduce local var scopes in source.

Closes #16460

diff --git a/tests/server/.gitignore b/tests/server/.gitignore
index b1f12bdf8b6d50cc5231b8f25c9a6378c136e2b9..034fe9c5f7595afcb12a4324dadf9e16f5e7062c 100644 (file)
--- a/tests/server/.gitignore
+++ b/tests/server/.gitignore
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: curl
 
 disabled
-getpart
 mqttd
 resolve
 rtspd

diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index edf317710764a5c457778d1c713ade796e1f9456..f0b20b6a245adc1ad0616f51ffecbb15e73385a5 100644 (file)
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -22,8 +22,7 @@
 #
 ###########################################################################
 
-noinst_PROGRAMS = getpart 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
 
-getpart_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) \
- testpart.c
-getpart_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
-getpart_CFLAGS = $(AM_CFLAGS)
-
 resolve_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
  resolve.c
 resolve_LDADD = @CURL_NETWORK_AND_TIME_LIBS@

diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index 3cc5d368089024490ac7a9405a0ced24f33d9fb1..b48db7f0d035a00978735511ccc3dc8b62119e1e 100644 (file)
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -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

diff --git a/tests/server/testpart.c b/tests/server/testpart.c
deleted file mode 100644 (file)
index b102f3e..0000000
--- a/tests/server/testpart.c
+++ /dev/null
@@ -1,51 +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)
-{
-  char  *part;
-  size_t partlen;
-
-  if(argc < 3) {
-    printf("./testpart main sub\n");
-  }
-  else {
-    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;
-}