aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 10:57:02 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 10:57:02 +0000
commit1ee8b638cff70823f1648e050282db49bc23d0bd (patch)
treea36f54697664eb400a7ba2ce7426697751cd3c11
parent0c4b9fdda1cdc6b68f6cf531cb88f438228fcd3c (diff)
downloadbusybox-w32-1ee8b638cff70823f1648e050282db49bc23d0bd.tar.gz
busybox-w32-1ee8b638cff70823f1648e050282db49bc23d0bd.tar.bz2
busybox-w32-1ee8b638cff70823f1648e050282db49bc23d0bd.zip
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)
-rw-r--r--debianutils/readlink.c5
1 files changed, 3 insertions, 2 deletions
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)
25 bb_show_usage(); 25 bb_show_usage();
26 26
27 if (opt & READLINK_FLAG_f) 27 if (opt & READLINK_FLAG_f)
28 buf = realpath(argv[optind], NULL); 28 buf = realpath(argv[optind], bb_common_bufsiz1);
29 else 29 else
30 buf = xreadlink(argv[ENABLE_FEATURE_READLINK_FOLLOW ? optind : 1]); 30 buf = xreadlink(argv[ENABLE_FEATURE_READLINK_FOLLOW ? optind : 1]);
31 31
@@ -33,7 +33,8 @@ int readlink_main(int argc, char **argv)
33 return EXIT_FAILURE; 33 return EXIT_FAILURE;
34 puts(buf); 34 puts(buf);
35 35
36 if (ENABLE_FEATURE_CLEAN_UP) free(buf); 36 if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1)
37 free(buf);
37 38
38 return EXIT_SUCCESS; 39 return EXIT_SUCCESS;
39} 40}