diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-14 02:23:43 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-14 02:23:43 +0000 |
commit | 9e617927e057d79ceb2ac4869b18b1e84567dc68 (patch) | |
tree | 37b7584ae40b99edb5583fbc4392b62ffdadf278 /coreutils/diff.c | |
parent | 6147e0907e5b5e3a07a4c8976097a585faaa3895 (diff) | |
download | busybox-w32-9e617927e057d79ceb2ac4869b18b1e84567dc68.tar.gz busybox-w32-9e617927e057d79ceb2ac4869b18b1e84567dc68.tar.bz2 busybox-w32-9e617927e057d79ceb2ac4869b18b1e84567dc68.zip |
add open_read_close() and similar stuff
git-svn-id: svn://busybox.net/trunk/busybox@16377 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/diff.c')
-rw-r--r-- | coreutils/diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/diff.c b/coreutils/diff.c index 65757d7d1..2915d4009 100644 --- a/coreutils/diff.c +++ b/coreutils/diff.c | |||
@@ -1202,7 +1202,7 @@ int diff_main(int argc, char **argv) | |||
1202 | * driver routine. Both drivers use the contents of stb1 and stb2. | 1202 | * driver routine. Both drivers use the contents of stb1 and stb2. |
1203 | */ | 1203 | */ |
1204 | if (argc < 2) { | 1204 | if (argc < 2) { |
1205 | bb_error_msg("Missing filename"); | 1205 | bb_error_msg("missing filename"); |
1206 | bb_show_usage(); | 1206 | bb_show_usage(); |
1207 | } | 1207 | } |
1208 | if (strcmp(argv[0], "-") == 0) { | 1208 | if (strcmp(argv[0], "-") == 0) { |
@@ -1216,12 +1216,12 @@ int diff_main(int argc, char **argv) | |||
1216 | } else | 1216 | } else |
1217 | xstat(argv[1], &stb2); | 1217 | xstat(argv[1], &stb2); |
1218 | if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) | 1218 | if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode))) |
1219 | bb_error_msg_and_die("Can't compare - to a directory"); | 1219 | bb_error_msg_and_die("can't compare - to a directory"); |
1220 | if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { | 1220 | if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) { |
1221 | #if ENABLE_FEATURE_DIFF_DIR | 1221 | #if ENABLE_FEATURE_DIFF_DIR |
1222 | diffdir(argv[0], argv[1]); | 1222 | diffdir(argv[0], argv[1]); |
1223 | #else | 1223 | #else |
1224 | bb_error_msg_and_die("Directory comparison not supported"); | 1224 | bb_error_msg_and_die("directory comparison not supported"); |
1225 | #endif | 1225 | #endif |
1226 | } else { | 1226 | } else { |
1227 | if (S_ISDIR(stb1.st_mode)) { | 1227 | if (S_ISDIR(stb1.st_mode)) { |