[git commit] diff: tiny compat tweak

Denys Vlasenko vda.linux at googlemail.com
Tue Jun 9 10:55:13 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=38d9072b2c9490e67c3423e09b081754095d8c49
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master


Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 editors/diff.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/editors/diff.c b/editors/diff.c
index 00ecdd8..e3933e7 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -1298,6 +1298,8 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
 	 */
 	f1 = argv[0];
 	f2 = argv[1];
+	/* Compat: "diff file name_which_doesnt_exist" exits with 2 */
+	xfunc_error_retval = 2;
 	if (LONE_DASH(f1)) {
 		fstat(STDIN_FILENO, &stb1);
 		gotstdin++;
@@ -1308,6 +1310,7 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
 		gotstdin++;
 	} else
 		xstat(f2, &stb2);
+	xfunc_error_retval = 1;
 
 	if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
 		bb_error_msg_and_die("can't compare stdin to a directory");
-- 
1.6.0.6


More information about the busybox-cvs mailing list