From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 17 Mar 2000 05:09:31 +0000 (-0000)
Subject: Many files:
X-Git-Tag: NTP_4_0_99_J~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=655eeb3bb8c206206fbcbc59d4fabc9557fe9ec8;p=thirdparty%2Fntp.git

Many files:
  Added snprintf stuff

bk: 38d1be0bKi8trKCnzdhYFkdscL7kRA
---

diff --git a/ChangeLog b/ChangeLog
index e1bd360120..9f5322bf4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-03-16  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* libntp/Makefile.am (EXTRA_DIST): Added snprintf.c
+
+	* configure.in: Look for (and provide if it's missing) snprintf()
+
 	* ntpd/ntp_request.c (dns_a): Call crypto_public with the resolved
 	name and the peer pointer.
 	(dns_a): crypto_public() is only available if PUBKEY is #defined.
diff --git a/config.h.in b/config.h.in
index a25caa4cf2..8dad8e80bb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -648,6 +648,9 @@
 /* Define if you have the `sigvec' function. */
 #undef HAVE_SIGVEC
 
+/* Define if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
 /* Define if you have the `srand48' function. */
 #undef HAVE_SRAND48
 
diff --git a/configure b/configure
index 5d22f13a58..34c6051acd 100755
--- a/configure
+++ b/configure
@@ -6510,7 +6510,7 @@ EOF
 fi
 done
 
-for ac_func in strerror
+for ac_func in snprintf strerror
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
 echo $ac_n "checking for $ac_func... $ac_c" 1>&6
diff --git a/configure.in b/configure.in
index b639aa9270..c3a8ef616c 100644
--- a/configure.in
+++ b/configure.in
@@ -612,7 +612,7 @@ esac
 AC_CHECK_FUNCS(setlinebuf)
 AC_CHECK_FUNCS(setpgid setpriority setsid settimeofday setvbuf sigaction)
 AC_CHECK_FUNCS(sigvec sigset sigsuspend stime strchr sysconf sysctl)
-AC_REPLACE_FUNCS(strerror)
+AC_REPLACE_FUNCS(snprintf strerror)
 case "$target" in
  *-*-aix4*)
     # Just stubs.  Idiots.
diff --git a/libntp/Makefile.am b/libntp/Makefile.am
index 51271afdd1..96735f5c93 100644
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@ -23,7 +23,7 @@ noinst_HEADERS = lib_strbuf.h log.h
 ../include/des.h:
 	touch ../include/des.h
 
-EXTRA_DIST = README $(HEADERS) adjtimex.c log.c strerror.c mktime.c random.c
+EXTRA_DIST = README $(HEADERS) adjtimex.c log.c mktime.c random.c snprintf.c strerror.c
 
 #mktime_.c: mktime.c $(ANSI2KNR)
 #	$(ANSI2KNR) $< mktime_.c
diff --git a/libntp/Makefile.in b/libntp/Makefile.in
index c69becec61..c566613f38 100644
--- a/libntp/Makefile.in
+++ b/libntp/Makefile.in
@@ -125,7 +125,7 @@ ETAGS_ARGS = Makefile.am
 
 noinst_HEADERS = lib_strbuf.h log.h
 
-EXTRA_DIST = README $(HEADERS) adjtimex.c log.c strerror.c mktime.c random.c
+EXTRA_DIST = README $(HEADERS) adjtimex.c log.c mktime.c random.c snprintf.c strerror.c
 subdir = libntp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -187,7 +187,7 @@ $(DEPDIR)/mfptoms$U.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modetoa$U.Po \
 $(DEPDIR)/mstolfp$U.Po $(DEPDIR)/msutotsf$U.Po $(DEPDIR)/msyslog$U.Po \
 $(DEPDIR)/netof$U.Po $(DEPDIR)/numtoa$U.Po $(DEPDIR)/numtohost$U.Po \
 $(DEPDIR)/octtoint$U.Po $(DEPDIR)/prettydate$U.Po $(DEPDIR)/ranny$U.Po \
-$(DEPDIR)/recvbuff$U.Po $(DEPDIR)/refnumtoa$U.Po \
+$(DEPDIR)/recvbuff$U.Po $(DEPDIR)/refnumtoa$U.Po $(DEPDIR)/snprintf.Po \
 $(DEPDIR)/statestr$U.Po $(DEPDIR)/strerror.Po $(DEPDIR)/syssignal$U.Po \
 $(DEPDIR)/systime$U.Po $(DEPDIR)/tsftomsu$U.Po $(DEPDIR)/tstotv$U.Po \
 $(DEPDIR)/tvtoa$U.Po $(DEPDIR)/tvtots$U.Po $(DEPDIR)/uglydate$U.Po \
@@ -494,6 +494,7 @@ distdir: $(DISTFILES)
 @AMDEP@include $(DEPDIR)/ranny$U.Po
 @AMDEP@include $(DEPDIR)/recvbuff$U.Po
 @AMDEP@include $(DEPDIR)/refnumtoa$U.Po
+@AMDEP@include $(DEPDIR)/snprintf.Po
 @AMDEP@include $(DEPDIR)/statestr$U.Po
 @AMDEP@include $(DEPDIR)/strerror.Po
 @AMDEP@include $(DEPDIR)/syssignal$U.Po
diff --git a/libntp/snprintf.c b/libntp/snprintf.c
new file mode 100644
index 0000000000..d4f7f4ab04
--- /dev/null
+++ b/libntp/snprintf.c
@@ -0,0 +1,50 @@
+#include <sys/types.h>
+
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+#ifdef __STDC__
+int snprintf(char *str, size_t n, const char *fmt, ...)
+#else
+int snprintf(str, n, fmt, va_alist)
+	char *str;
+	size_t n;
+	const char *fmt;
+	va_dcl
+#endif
+{
+	va_list ap;
+	char *rp;
+	int rval;
+#ifdef __STDC__
+	va_start(ap, fmt);
+#else
+	va_start(ap);
+#endif
+#ifdef VSPRINTF_CHARSTAR
+	rp = vsprintf(str, fmt, ap);
+	va_end(ap);
+	return (strlen(rp));
+#else
+	rval = vsprintf(str, fmt, ap);
+	va_end(ap);
+	return (rval);
+#endif
+}
+
+int
+vsnprintf(str, n, fmt, ap)
+	char *str;
+	size_t n;
+	const char *fmt;
+	va_list ap;
+{
+#ifdef VSPRINTF_CHARSTAR
+	return (strlen(vsprintf(str, fmt, ap)));
+#else
+	return (vsprintf(str, fmt, ap));
+#endif
+}