Copy string copy/concat/format changes from libcups v3.

Remove all unnecessary string function checks.

Remove old snprintf emulation functions (now require C99 which always has it)

Author: michaelrsweet

config-scripts/cups-common.m4

@@ -155,11 +155,6 @@ AC_CHECK_HEADER([sys/statvfs.h], AC_DEFINE([HAVE_SYS_STATVFS_H], [1], [Have <sys
 AC_CHECK_HEADER([sys/vfs.h], AC_DEFINE([HAVE_SYS_VFS_H], [1], [Have <sys/vfs.h> header?]))
 AC_CHECK_FUNCS([statfs statvfs])
 
-dnl Checks for string functions.
-dnl TODO: Remove strdup, snprintf, and vsnprintf checks since they are C99?
-AC_CHECK_FUNCS([strdup snprintf vsnprintf])
-AC_CHECK_FUNCS([cupsConcatString cupsCopyString])
-
 dnl Check for random number functions...
 AC_CHECK_FUNCS([random lrand48 arc4random])
 

config.h.in

@@ -1,7 +1,7 @@
 /*
  * Configuration file for CUPS.
  *
- * Copyright © 2020-2023 by OpenPrinting
+ * Copyright © 2020-2024 by OpenPrinting
  * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products.
  *
@@ -177,15 +177,6 @@
 #endif /* !HAVE_STRTOLL */
 
 
-/*
- * Do we have the strXXX() functions?
- */
-
-#undef HAVE_STRDUP
-#undef HAVE_STRLCAT
-#undef HAVE_STRLCPY
-
-
 /*
  * Do we have the geteuid() function?
  */
@@ -214,14 +205,6 @@
 #undef HAVE_SYSTEMD_SD_JOURNAL_H
 
 
-/*
- * Do we have the (v)snprintf() functions?
- */
-
-#undef HAVE_SNPRINTF
-#undef HAVE_VSNPRINTF
-
-
 /*
  * What wait functions to use?
  */

configure

@@ -6235,39 +6235,6 @@ then :
 fi
 
 
-ac_fn_c_check_func "$LINENO" "strdup" "ac_cv_func_strdup"
-if test "x$ac_cv_func_strdup" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRDUP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf"
-if test "x$ac_cv_func_snprintf" = xyes
-then :
-  printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
-if test "x$ac_cv_func_vsnprintf" = xyes
-then :
-  printf "%s\n" "#define HAVE_VSNPRINTF 1" >>confdefs.h
-
-fi
-
-ac_fn_c_check_func "$LINENO" "cupsConcatString" "ac_cv_func_cupsConcatString"
-if test "x$ac_cv_func_cupsConcatString" = xyes
-then :
-  printf "%s\n" "#define HAVE_CUPSCONCATSTRING 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "cupsCopyString" "ac_cv_func_cupsCopyString"
-if test "x$ac_cv_func_cupsCopyString" = xyes
-then :
-  printf "%s\n" "#define HAVE_CUPSCOPYSTRING 1" >>confdefs.h
-
-fi
-
-
 ac_fn_c_check_func "$LINENO" "random" "ac_cv_func_random"
 if test "x$ac_cv_func_random" = xyes
 then :

cups/Dependencies

@@ -816,7 +816,6 @@ request.o: request.c cups-private.h string-private.h ../config.h \
   \
   language-private.h ../cups/transcode.h pwg-private.h ../cups/pwg.h \
   thread.h cups.h
-snprintf.o: snprintf.c string-private.h ../config.h ../cups/base.h
 string.o: string.c cups-private.h string-private.h ../config.h \
   ../cups/base.h debug-internal.h debug-private.h ipp-private.h \
   ../cups/cups.h file.h base.h ipp.h http.h array.h language.h pwg.h \
@@ -1505,7 +1504,8 @@ testdest.o: testdest.c cups.h file.h base.h ipp.h http.h array.h \
 testdnssd.o: testdnssd.c test-internal.h dnssd.h cups.h file.h base.h \
   ipp.h http.h array.h language.h pwg.h thread.h
 testfile.o: testfile.c string-private.h ../config.h ../cups/base.h \
-  debug-private.h file.h base.h dir.h
+  debug-private.h cups.h file.h base.h ipp.h http.h array.h language.h \
+  pwg.h dir.h test-internal.h
 testform.o: testform.c form.h cups.h file.h base.h ipp.h http.h array.h \
   language.h pwg.h test-internal.h
 testgetdests.o: testgetdests.c cups.h file.h base.h ipp.h http.h array.h \

cups/Makefile

@@ -53,7 +53,6 @@ COREOBJS	=	\
 		raster-stream.o \
 		raster-stubs.o \
 		request.o \
-		snprintf.o \
 		string.o \
 		tempfile.o \
 		thread.o \
@@ -474,8 +473,7 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
 	echo "VERSION 2.15" >>libcups2.def
 	echo "EXPORTS" >>libcups2.def
 	(nm $(LIBOBJS) $(IMAGEOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
-	 echo __cups_strcpy; echo __cups_cupsConcatString; echo __cups_cupsCopyString; \
-	 echo __cups_snprintf; echo __cups_vsnprintf; echo __cups_gettimeofday) | \
+	 echo __cups_strcpy; echo __cups_gettimeofday) | \
 		grep -v -E \
 		    -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel|SNMP' \
 		    -e 'Block$$' | \

cups/cups.h

@@ -419,6 +419,8 @@ extern ipp_attribute_t	*cupsFindDestReady(http_t *http, cups_dest_t *dest, cups_
 extern ipp_attribute_t	*cupsFindDestSupported(http_t *http, cups_dest_t *dest, cups_dinfo_t *dinfo, const char *option) _CUPS_PUBLIC;
 extern ipp_status_t	cupsFinishDestDocument(http_t *http, cups_dest_t *dest, cups_dinfo_t *info) _CUPS_PUBLIC;
 extern ipp_status_t	cupsFinishDocument(http_t *http, const char *name) _CUPS_PUBLIC;
+extern ssize_t		cupsFormatString(char *buffer, size_t bufsize, const char *format, ...) _CUPS_FORMAT(3,4) _CUPS_PUBLIC;
+extern ssize_t		cupsFormatStringv(char *buffer, size_t bufsize, const char *format, va_list ap) _CUPS_PUBLIC;
 extern void		cupsFreeDestInfo(cups_dinfo_t *dinfo) _CUPS_PUBLIC;
 extern void		cupsFreeDests(int num_dests, cups_dest_t *dests) _CUPS_PUBLIC;
 extern void		cupsFreeJobs(int num_jobs, cups_job_t *jobs) _CUPS_PUBLIC;