aboutsummaryrefslogtreecommitdiff
path: root/editors/cmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'editors/cmp.c')
-rw-r--r--editors/cmp.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/editors/cmp.c b/editors/cmp.c
index 9189b3150..b211adf9f 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -23,16 +23,6 @@
23 23
24#include "libbb.h" 24#include "libbb.h"
25 25
26static FILE *cmp_xfopen_input(const char *filename)
27{
28 FILE *fp;
29
30 fp = fopen_or_warn_stdin(filename);
31 if (fp)
32 return fp;
33 xfunc_die(); /* We already output an error message. */
34}
35
36static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n"; 26static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
37static const char fmt_differ[] ALIGN1 = "%s %s differ: char %"OFF_FMT"d, line %d\n"; 27static const char fmt_differ[] ALIGN1 = "%s %s differ: char %"OFF_FMT"d, line %d\n";
38// This fmt_l_opt uses gnu-isms. SUSv3 would be "%.0s%.0s%"OFF_FMT"d %o %o\n" 28// This fmt_l_opt uses gnu-isms. SUSv3 would be "%.0s%.0s%"OFF_FMT"d %o %o\n"
@@ -65,7 +55,7 @@ int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv)
65 argv += optind; 55 argv += optind;
66 56
67 filename1 = *argv; 57 filename1 = *argv;
68 fp1 = cmp_xfopen_input(filename1); 58 fp1 = xfopen_stdin(filename1);
69 59
70 if (*++argv) { 60 if (*++argv) {
71 filename2 = *argv; 61 filename2 = *argv;
@@ -79,7 +69,7 @@ int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv)
79#endif 69#endif
80 } 70 }
81 71
82 fp2 = cmp_xfopen_input(filename2); 72 fp2 = xfopen_stdin(filename2);
83 if (fp1 == fp2) { /* Paranoia check... stdin == stdin? */ 73 if (fp1 == fp2) { /* Paranoia check... stdin == stdin? */
84 /* Note that we don't bother reading stdin. Neither does gnu wc. 74 /* Note that we don't bother reading stdin. Neither does gnu wc.
85 * But perhaps we should, so that other apps down the chain don't 75 * But perhaps we should, so that other apps down the chain don't