X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Frealpath.c;h=28906ba55493b48ce128b3d97a6c3e535b7dcca8;hb=e40e76f3cd3702b1891231f585e5f38867a52b29;hp=f89e0a27460c1b5858a0bfcfd468fa37bde46d2b;hpb=7b4e89b9e3acfee4295dc88fcda5605907d17651;p=oweals%2Fbusybox.git

diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index f89e0a274..28906ba55 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -1,42 +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)
 {
+	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) {
-		show_usage();
+	if (!*++argv) {
+		bb_show_usage();
 	}
 
 	do {
-		argv++;
 		if (realpath(*argv, resolved_path) != NULL) {
 			puts(resolved_path);
 		} else {
-			perror_msg("%s", *argv);
+			retval = EXIT_FAILURE;
+			bb_simple_perror_msg(*argv);
 		}
-	} while (--argc);
+	} while (*++argv);
 
+#if ENABLE_FEATURE_CLEAN_UP && resolved_path_MUST_FREE
 	RELEASE_CONFIG_BUFFER(resolved_path);
+#endif
 
-	return(EXIT_SUCCESS);
+	fflush_stdout_and_exit(retval);
 }