[un]expand: account for different character widths. +16 bytes.

[oweals/busybox.git] / coreutils / realpath.c

diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index 7ef935ee078fabd9214e6c665e15685f24f0fa03..28906ba55493b48ce128b3d97a6c3e535b7dcca8 100644 (file)
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -1,44 +1,46 @@
-/*
- *  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.
+/* vi: set sw=4 ts=4: */
+
+/* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */
+
+/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
- *  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.
+ * Now does proper error checking on output and returns a failure exit code
+ * if one or more paths cannot be resolved.
  *
- *  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 GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <limits.h>
-#include <stdlib.h>
+#include "libbb.h"
 
-#include "busybox.h"
-
-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)
 {
-       char *resolved_path;
-       int count;
+       int retval = EXIT_SUCCESS;
 
-       if (argc == 1) {
-               show_usage();
-       }
+#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
 
-       resolved_path = malloc(PATH_MAX);
+       if (!*++argv) {
+               bb_show_usage();
+       }
 
-       for (count = 1; count < argc; count++) {
-               resolved_path = realpath(argv[count], resolved_path);
-               if (resolved_path) {
+       do {
+               if (realpath(*argv, resolved_path) != NULL) {
                        puts(resolved_path);
                } else {
-                       perror_msg("%s", argv[count]);
+                       retval = EXIT_FAILURE;
+                       bb_simple_perror_msg(*argv);
                }
-       }
-       free(resolved_path);
+       } while (*++argv);
+
+#if ENABLE_FEATURE_CLEAN_UP && resolved_path_MUST_FREE
+       RELEASE_CONFIG_BUFFER(resolved_path);
+#endif
 
-       return(EXIT_SUCCESS);
-}
\ No newline at end of file
+       fflush_stdout_and_exit(retval);
+}