From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 19 May 2006 10:57:02 +0000 (-0000)
Subject: The gnu extension to have realpath() malloc its buffer when handed a NULL
X-Git-Tag: 1_1_3~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1ee8b638cff70823f1648e050282db49bc23d0bd;p=oweals%2Fbusybox.git

The gnu extension to have realpath() malloc its buffer when handed a NULL
isn't implemented in uClibc, so we can't use it.
(r15092 from trunk plus coding-style fix for the patch)
---

diff --git a/debianutils/readlink.c b/debianutils/readlink.c
index 83abdbfa6..8495ee532 100644
--- a/debianutils/readlink.c
+++ b/debianutils/readlink.c
@@ -25,7 +25,7 @@ int readlink_main(int argc, char **argv)
 			bb_show_usage();
 
 	if (opt & READLINK_FLAG_f)
-		buf = realpath(argv[optind], NULL);
+		buf = realpath(argv[optind], bb_common_bufsiz1);
 	else
 		buf = xreadlink(argv[ENABLE_FEATURE_READLINK_FOLLOW ? optind : 1]);
 
@@ -33,7 +33,8 @@ int readlink_main(int argc, char **argv)
 		return EXIT_FAILURE;
 	puts(buf);
 
-	if (ENABLE_FEATURE_CLEAN_UP) free(buf);
+	if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1)
+		free(buf);
 
 	return EXIT_SUCCESS;
 }