From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 6 Nov 2019 13:11:14 +0000 (-0600)
Subject: Revert "Use _r variant of basename and dirname"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58cd2fd6cb83d16bccf1ef9cc5329b105b6f5d63;p=thirdparty%2Ffreeradius-server.git

Revert "Use _r variant of basename and dirname"

This reverts commit 22599fd332eb13f82923f3401a1780370ac12532.
---

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index ac39726c280..d79f6762e40 100644
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -2195,9 +2195,6 @@ int main(int argc, char *argv[])
 	bool			do_commands = false;
 	bool			do_usage = false;
 
-	char			dir_buff[PATH_MAX];
-	char			file_buff[PATH_MAX];
-
 #ifndef NDEBUG
 	if (fr_fault_setup(autofree, getenv("PANIC_ACTION"), argv[0]) < 0) {
 		fr_perror("unit_test_attribute");
@@ -2322,7 +2319,7 @@ int main(int argc, char *argv[])
 	 *	Read tests from stdin
 	 */
 	if (argc < 2) {
-		ret = process_file(&exit_now, autofree, features, dict, dirname_r(name, dir_buff), "-");
+		ret = process_file(&exit_now, autofree, features, dict, name, "-");
 
 	/*
 	 *	...or process each file in turn.
@@ -2331,8 +2328,19 @@ int main(int argc, char *argv[])
 		int i;
 
 		for (i = 1; i < argc; i++) {
-			ret = process_file(&exit_now, autofree, features, dict,
-					   dirname_r(argv[i], dir_buff), basename_r(argv[i], file_buff));
+			char *dir, *file;
+			char *p = strrchr(argv[i], '/');
+
+			if (p) {
+				*p = '\0'; /* we are allowed to modify our arguments.  No one cares. */
+				dir = argv[i];
+				file = p + 1;
+			} else {
+				dir = NULL;
+				file = argv[i];
+			}
+
+			ret = process_file(&exit_now, autofree, features, dict, dir, file);
 			if ((ret != 0) || exit_now) break;
 		}
 	}