emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: tiny compat tweak

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-06-09 12:55:13 +02:00
parent 764b2f0ec0
commit 38d9072b2c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/diff.c
View File

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