60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
|
From 31909696c4620c431dd55f6cd15db65c4e9b98da Mon Sep 17 00:00:00 2001
|
||
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
||
|
|
Date: Fri, 1 May 2020 06:28:52 +0000
|
||
|
|
Subject: [PATCH] upstream: expose vasnmprintf(); ok (as part of other commit)
|
||
|
|
markus
|
||
|
|
|
||
|
|
deraadt
|
||
|
|
|
||
|
|
OpenBSD-Commit-ID: 2e80cea441c599631a870fd40307d2ade5a7f9b5
|
||
|
|
---
|
||
|
|
utf8.c | 5 ++---
|
||
|
|
utf8.h | 3 ++-
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/utf8.c b/utf8.c
|
||
|
|
index f83401996..7f63b25ae 100644
|
||
|
|
--- a/utf8.c
|
||
|
|
+++ b/utf8.c
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* $OpenBSD: utf8.c,v 1.8 2018/08/21 13:56:27 schwarze Exp $ */
|
||
|
|
+/* $OpenBSD: utf8.c,v 1.11 2020/05/01 06:28:52 djm Exp $ */
|
||
|
|
/*
|
||
|
|
* Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
|
||
|
|
*
|
||
|
|
@@ -43,7 +43,6 @@
|
||
|
|
|
||
|
|
static int dangerous_locale(void);
|
||
|
|
static int grow_dst(char **, size_t *, size_t, char **, size_t);
|
||
|
|
-static int vasnmprintf(char **, size_t, int *, const char *, va_list);
|
||
|
|
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -101,7 +100,7 @@ grow_dst(char **dst, size_t *sz, size_t maxsz, char **dp, size_t need)
|
||
|
|
* written is returned in *wp.
|
||
|
|
*/
|
||
|
|
|
||
|
|
-static int
|
||
|
|
+int
|
||
|
|
vasnmprintf(char **str, size_t maxsz, int *wp, const char *fmt, va_list ap)
|
||
|
|
{
|
||
|
|
char *src; /* Source string returned from vasprintf. */
|
||
|
|
diff --git a/utf8.h b/utf8.h
|
||
|
|
index 20a11dc59..9d6d9a32c 100644
|
||
|
|
--- a/utf8.h
|
||
|
|
+++ b/utf8.h
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-/* $OpenBSD: utf8.h,v 1.1 2016/05/25 23:48:45 schwarze Exp $ */
|
||
|
|
+/* $OpenBSD: utf8.h,v 1.3 2020/05/01 06:28:52 djm Exp $ */
|
||
|
|
/*
|
||
|
|
* Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
|
||
|
|
*
|
||
|
|
@@ -15,6 +15,7 @@
|
||
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||
|
|
*/
|
||
|
|
|
||
|
|
+int vasnmprintf(char **, size_t, int *, const char *, va_list);
|
||
|
|
int mprintf(const char *, ...)
|
||
|
|
__attribute__((format(printf, 1, 2)));
|
||
|
|
int fmprintf(FILE *, const char *, ...)
|