From 1252d7ae6a4c7e516d2775c1f6361f53b742947c Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 8 Sep 2017 19:53:52 -0500
Subject: [PATCH] libpkgconf: dependency: make dependency_to_str() private, use
 a caller-supplied buffer for reentrancy

---
 doc/libpkgconf-dependency.rst |  8 --------
 libpkgconf/dependency.c       | 32 ++++++++++----------------------
 libpkgconf/libpkgconf.h       |  1 -
 3 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/doc/libpkgconf-dependency.rst b/doc/libpkgconf-dependency.rst
index 759d60a..1ee3e09 100644
--- a/doc/libpkgconf-dependency.rst
+++ b/doc/libpkgconf-dependency.rst
@@ -5,14 +5,6 @@ libpkgconf `dependency` module
 The `dependency` module provides support for building `dependency lists` (the basic component of the overall `dependency graph`) and
 `dependency nodes` which store dependency information.
 
-.. c:function:: const char *pkgconf_dependency_to_str(const pkgconf_dependency_t *dep)
-
-   Renders a dependency to a string.
-
-   :param pkgconf_dependency_t* dep: The dependency to render.
-   :return: The dependency rendered as a string.
-   :rtype: const char *
-
 .. c:function:: pkgconf_dependency_t *pkgconf_dependency_add(pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare)
 
    Adds a parsed dependency to a dependency list as a dependency node.
diff --git a/libpkgconf/dependency.c b/libpkgconf/dependency.c
index 3b1503c..1e32226 100644
--- a/libpkgconf/dependency.c
+++ b/libpkgconf/dependency.c
@@ -36,38 +36,26 @@ typedef enum {
 
 #define DEBUG_PARSE 0
 
-/*
- * !doc
- *
- * .. c:function:: const char *pkgconf_dependency_to_str(const pkgconf_dependency_t *dep)
- *
- *    Renders a dependency to a string.
- *
- *    :param pkgconf_dependency_t* dep: The dependency to render.
- *    :return: The dependency rendered as a string.
- *    :rtype: const char *
- */
-const char *
-pkgconf_dependency_to_str(const pkgconf_dependency_t *dep)
+static const char *
+dependency_to_str(const pkgconf_dependency_t *dep, char *buf, size_t buflen)
 {
-	static char outbuf[PKGCONF_BUFSIZE];
-
-	pkgconf_strlcpy(outbuf, dep->package, sizeof outbuf);
+	pkgconf_strlcpy(buf, dep->package, buflen);
 	if (dep->version != NULL)
 	{
-		pkgconf_strlcat(outbuf, " ", sizeof outbuf);
-		pkgconf_strlcat(outbuf, pkgconf_pkg_get_comparator(dep), sizeof outbuf);
-		pkgconf_strlcat(outbuf, " ", sizeof outbuf);
-		pkgconf_strlcat(outbuf, dep->version, sizeof outbuf);
+		pkgconf_strlcat(buf, " ", buflen);
+		pkgconf_strlcat(buf, pkgconf_pkg_get_comparator(dep), buflen);
+		pkgconf_strlcat(buf, " ", buflen);
+		pkgconf_strlcat(buf, dep->version, buflen);
 	}
 
-	return outbuf;
+	return buf;
 }
 
 static inline pkgconf_dependency_t *
 pkgconf_dependency_addraw(const pkgconf_client_t *client, pkgconf_list_t *list, const char *package, size_t package_sz, const char *version, size_t version_sz, pkgconf_pkg_comparator_t compare)
 {
 	pkgconf_dependency_t *dep;
+	char depbuf[PKGCONF_BUFSIZE];
 
 	dep = calloc(sizeof(pkgconf_dependency_t), 1);
 	dep->package = pkgconf_strndup(package, package_sz);
@@ -77,7 +65,7 @@ pkgconf_dependency_addraw(const pkgconf_client_t *client, pkgconf_list_t *list,
 
 	dep->compare = compare;
 
-	PKGCONF_TRACE(client, "added dependency [%s] to list @%p", pkgconf_dependency_to_str(dep), list);
+	PKGCONF_TRACE(client, "added dependency [%s] to list @%p", dependency_to_str(dep, depbuf, sizeof depbuf), list);
 	pkgconf_node_insert_tail(&dep->iter, dep, list);
 
 	return dep;
diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
index ba67141..1a3ca8c 100644
--- a/libpkgconf/libpkgconf.h
+++ b/libpkgconf/libpkgconf.h
@@ -258,7 +258,6 @@ PKGCONF_API void pkgconf_dependency_parse_str(const pkgconf_client_t *client, pk
 PKGCONF_API void pkgconf_dependency_parse(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, pkgconf_list_t *deplist_head, const char *depends);
 PKGCONF_API void pkgconf_dependency_append(pkgconf_list_t *list, pkgconf_dependency_t *tail);
 PKGCONF_API void pkgconf_dependency_free(pkgconf_list_t *list);
-PKGCONF_API const char *pkgconf_dependency_to_str(const pkgconf_dependency_t *dep);
 PKGCONF_API pkgconf_dependency_t *pkgconf_dependency_add(const pkgconf_client_t *client, pkgconf_list_t *list, const char *package, const char *version, pkgconf_pkg_comparator_t compare);
 
 /* argvsplit.c */