Clean up memory allocation.

This commit is contained in:
Rob Landley 2005-09-11 23:45:28 +00:00
parent a7e14db495
commit ba50217281

View File

@ -4,20 +4,7 @@
* *
* Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu> * Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
* *
* This program is free software; you can redistribute it and/or modify * Licensed under GPL v2, see file LICENSE in this tarball for details.
* 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
*
*/ */
#include <errno.h> #include <errno.h>
@ -26,31 +13,20 @@
#include <getopt.h> #include <getopt.h>
#include "busybox.h" #include "busybox.h"
#ifdef CONFIG_FEATURE_READLINK_FOLLOW #define READLINK_FLAG_f (1 << 0)
# define READLINK_FOLLOW "f"
# define READLINK_FLAG_f (1 << 0)
#else
# define READLINK_FOLLOW ""
#endif
static const char readlink_options[] = READLINK_FOLLOW;
int readlink_main(int argc, char **argv) int readlink_main(int argc, char **argv)
{ {
char *buf = NULL; char *buf;
unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options); unsigned long opt = bb_getopt_ulflags(argc, argv,
#ifdef CONFIG_FEATURE_READLINK_FOLLOW ENABLE_FEATURE_READLINK_FOLLOW ? "f" : "");
RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
#endif
if (optind + 1 != argc) if (optind + 1 != argc)
bb_show_usage(); bb_show_usage();
#ifdef CONFIG_FEATURE_READLINK_FOLLOW if (ENABLE_FEATURE_READLINK_FOLLOW && (opt & READLINK_FLAG_f))
if (opt & READLINK_FLAG_f) { buf = realpath(argv[optind], NULL);
buf = realpath(argv[optind], resolved_path); else
} else
#endif
buf = xreadlink(argv[optind]); buf = xreadlink(argv[optind]);
if (!buf) if (!buf)