svn commit: trunk/busybox/debianutils

landley at busybox.net landley at busybox.net
Sun Sep 11 23:45:29 UTC 2005


Author: landley
Date: 2005-09-11 16:45:28 -0700 (Sun, 11 Sep 2005)
New Revision: 11424

Log:
Clean up memory allocation.


Modified:
   trunk/busybox/debianutils/readlink.c


Changeset:
Modified: trunk/busybox/debianutils/readlink.c
===================================================================
--- trunk/busybox/debianutils/readlink.c	2005-09-11 01:16:47 UTC (rev 11423)
+++ trunk/busybox/debianutils/readlink.c	2005-09-11 23:45:28 UTC (rev 11424)
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2000,2001 Matt Kraai <kraai at 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
+#define READLINK_FLAG_f	(1 << 0)
 
-static const char readlink_options[] = READLINK_FOLLOW;
-
 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)




More information about the busybox-cvs mailing list