aboutsummaryrefslogtreecommitdiff
path: root/editors/diff.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2019-08-16 09:42:39 +0100
committerRon Yorston <rmy@pobox.com>2019-08-16 09:45:21 +0100
commit517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch)
treebe9337069b60ca1bb03565d8575bacfc71181003 /editors/diff.c
parentae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff)
parentac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff)
downloadbusybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz
busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2
busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'editors/diff.c')
-rw-r--r--editors/diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/diff.c b/editors/diff.c
index cf531460f..093e7b498 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -1027,7 +1027,7 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
1027 xfunc_error_retval = 1; 1027 xfunc_error_retval = 1;
1028 1028
1029 if (gotstdin && (S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode))) 1029 if (gotstdin && (S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode)))
1030 bb_error_msg_and_die("can't compare stdin to a directory"); 1030 bb_simple_error_msg_and_die("can't compare stdin to a directory");
1031 1031
1032 /* Compare metadata to check if the files are the same physical file. 1032 /* Compare metadata to check if the files are the same physical file.
1033 * 1033 *
@@ -1063,7 +1063,7 @@ int diff_main(int argc UNUSED_PARAM, char **argv)
1063#if ENABLE_FEATURE_DIFF_DIR 1063#if ENABLE_FEATURE_DIFF_DIR
1064 diffdir(file, s_start); 1064 diffdir(file, s_start);
1065#else 1065#else
1066 bb_error_msg_and_die("no support for directory comparison"); 1066 bb_simple_error_msg_and_die("no support for directory comparison");
1067#endif 1067#endif
1068 } else { 1068 } else {
1069 bool dirfile = S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode); 1069 bool dirfile = S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode);