ba5021728
Rob Landley
2005-09-11
Subject
Clean up memory allocation.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
debianutils/readlink.c+8 -32
| @@ -4,20 +4,7 @@ | |
| * | |
| * Copyright (C) 2000,2001 Matt Kraai <[email protected]> | |
| * | |
| - | * 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) | |