Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/realpath.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/realpath.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/coreutils/realpath.c

@@ -8 +8 @@
  * if one or more paths cannot be resolved.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
-int realpath_main(int argc, char **argv);
-int realpath_main(int argc, char **argv)
+int realpath_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int realpath_main(int argc UNUSED_PARAM, char **argv)
 {
     int retval = EXIT_SUCCESS;
 
-#if PATH_MAX > (BUFSIZ+1)
-    RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
-# define resolved_path_MUST_FREE 1
-#else
-#define resolved_path bb_common_bufsiz1
-# define resolved_path_MUST_FREE 0
-#endif
-
-    if (--argc == 0) {
+    if (!*++argv) {
         bb_show_usage();
     }
 
     do {
-        argv++;
-        if (realpath(*argv, resolved_path) != NULL) {
+        char *resolved_path = xmalloc_realpath(*argv);
+        if (resolved_path != NULL) {
             puts(resolved_path);
+            free(resolved_path);
         } else {
             retval = EXIT_FAILURE;
-            bb_perror_msg("%s", *argv);
+            bb_simple_perror_msg(*argv);
         }
-    } while (--argc);
-
-#if ENABLE_FEATURE_CLEAN_UP && resolved_path_MUST_FREE
-    RELEASE_CONFIG_BUFFER(resolved_path);
-#endif
+    } while (*++argv);
 
     fflush_stdout_and_exit(retval);