From: CSRG <csrg@ucbvax.Berkeley.EDU>
Date: Fri, 4 Jun 1993 08:13:56 +0000 (-0800)
Subject: BSD 4_4_Lite2 development
X-Git-Tag: BSD-4_4_Lite2~668
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/821740eef8b9c4b671dd4e7e61fdda335e904259

BSD 4_4_Lite2 development
Work on file usr/src/contrib/nvi.1.43/PORT/db.1.85/PORT/clib/snprintf.c
Work on file usr/src/lib/libc/db/PORT/clib/snprintf.c

Synthesized-from: CSRG/cd3/4.4BSD-Lite2
---

diff --git a/usr/src/contrib/nvi.1.43/PORT/db.1.85/PORT/clib/snprintf.c b/usr/src/contrib/nvi.1.43/PORT/db.1.85/PORT/clib/snprintf.c
new file mode 100644
index 0000000000..2863fa28d6
--- /dev/null
+++ b/usr/src/contrib/nvi.1.43/PORT/db.1.85/PORT/clib/snprintf.c
@@ -0,0 +1,54 @@
+#include <sys/types.h>
+#include <sys/cdefs.h>
+
+#include <compat.h>
+
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+int
+#ifdef __STDC__
+snprintf(char *str, size_t n, const char *fmt, ...)
+#else
+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
+}
diff --git a/usr/src/lib/libc/db/PORT/clib/snprintf.c b/usr/src/lib/libc/db/PORT/clib/snprintf.c
new file mode 100644
index 0000000000..2863fa28d6
--- /dev/null
+++ b/usr/src/lib/libc/db/PORT/clib/snprintf.c
@@ -0,0 +1,54 @@
+#include <sys/types.h>
+#include <sys/cdefs.h>
+
+#include <compat.h>
+
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+int
+#ifdef __STDC__
+snprintf(char *str, size_t n, const char *fmt, ...)
+#else
+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
+}