aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2005-09-11 23:45:28 +0000
committerGravatar Rob Landley <rob@landley.net>2005-09-11 23:45:28 +0000
commitba50217281e9265aa5935d184f698204143e765f (patch)
tree35a1e3986f566e87e18ec097a44ba9e165c15aa2 /debianutils
parenta7e14db495389371add9d2529adeaaf5566a5b36 (diff)
downloadbusybox-ba50217281e9265aa5935d184f698204143e765f.tar.gz
busybox-ba50217281e9265aa5935d184f698204143e765f.tar.bz2
Clean up memory allocation.
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/readlink.c40
1 files changed, 8 insertions, 32 deletions
diff --git a/debianutils/readlink.c b/debianutils/readlink.c
index dd5612052..3042b83ec 100644
--- a/debianutils/readlink.c
+++ b/debianutils/readlink.c
@@ -4,20 +4,7 @@
*
* Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPL v2, see file LICENSE in this tarball for details.
*/
#include <errno.h>
@@ -26,31 +13,20 @@
#include <getopt.h>
#include "busybox.h"
-#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-# define READLINK_FOLLOW "f"
-# define READLINK_FLAG_f (1 << 0)
-#else
-# define READLINK_FOLLOW ""
-#endif
-
-static const char readlink_options[] = READLINK_FOLLOW;
+#define READLINK_FLAG_f (1 << 0)
int readlink_main(int argc, char **argv)
{
- char *buf = NULL;
- unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options);
-#ifdef CONFIG_FEATURE_READLINK_FOLLOW
- RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
-#endif
+ char *buf;
+ unsigned long opt = bb_getopt_ulflags(argc, argv,
+ ENABLE_FEATURE_READLINK_FOLLOW ? "f" : "");
if (optind + 1 != argc)
bb_show_usage();
-#ifdef CONFIG_FEATURE_READLINK_FOLLOW
- if (opt & READLINK_FLAG_f) {
- buf = realpath(argv[optind], resolved_path);
- } else
-#endif
+ if (ENABLE_FEATURE_READLINK_FOLLOW && (opt & READLINK_FLAG_f))
+ buf = realpath(argv[optind], NULL);
+ else
buf = xreadlink(argv[optind]);
if (!buf)