summaryrefslogtreecommitdiff
path: root/coreutils/cmp.c
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-28 23:31:54 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-08-28 23:31:54 +0000
commit73561cc75ac31e63bcab4b4ebfaf738e4ca225e6 (patch)
tree2a57564b8917a983365c765d4daa83032d9f0a17 /coreutils/cmp.c
parent6ce8dae1d5a201156a83201de6c49cdcc4c8df3e (diff)
downloadbusybox-w32-73561cc75ac31e63bcab4b4ebfaf738e4ca225e6.tar.gz
busybox-w32-73561cc75ac31e63bcab4b4ebfaf738e4ca225e6.tar.bz2
busybox-w32-73561cc75ac31e63bcab4b4ebfaf738e4ca225e6.zip
- pull from busybox_scratch: r15829:15850
Various fixes, cleanups and shrinkage: saves 952 Bytes: text data bss dec hex filename 1087742 15853 790632 1894227 1ce753 ../busybox/busybox.old 1086790 15853 790632 1893275 1ce39b busybox via: # scripts/bloat-o-meter ../busybox/busybox_unstripped.old busybox_unstripped function old new delta ipcrm_main 756 822 +66 getval - 61 +61 maybe_set_utc - 40 +40 udhcpc_main 2896 2912 +16 md5_hash_block 428 437 +9 opt 8 16 +8 qgravechar 106 110 +4 make_bitmap 292 295 +3 inflate_unzip 2056 2059 +3 add_partition 1412 1414 +2 __parsespent 156 158 +2 qrealloc 41 42 +1 format - 1 +1 catv_main 313 314 +1 watch_main 293 292 -1 varunset 81 80 -1 part 1 - -1 check_if_skip 837 836 -1 start_stop_daemon_main 840 837 -3 create_lost_and_found 175 172 -3 supress_non_delimited_lines 4 - -4 static.l 4 - -4 static.c 5 1 -4 bsd_sum_file 237 233 -4 eval2 338 332 -6 arithmetic_common 166 158 -8 cmpfunc 22 5 -17 cksum_main 294 275 -19 cmp_main 465 439 -26 dd_main 1535 1508 -27 rmmod_main 376 333 -43 cut_file 727 644 -83 ipcs_main 3809 3721 -88 cut_main 722 614 -108 date_main 1443 1263 -180 remove_ids 222 - -222 ------------------------------------------------------------------------------ (add/remove: 3/4 grow/shrink: 11/18 up/down: 217/-853) Total: -636 bytes
Diffstat (limited to 'coreutils/cmp.c')
-rw-r--r--coreutils/cmp.c47
1 files changed, 21 insertions, 26 deletions
diff --git a/coreutils/cmp.c b/coreutils/cmp.c
index a569eb3fe..ae3f50279 100644
--- a/coreutils/cmp.c
+++ b/coreutils/cmp.c
@@ -23,7 +23,7 @@
23 23
24#include "busybox.h" 24#include "busybox.h"
25 25
26static FILE *cmp_xfopen_input(const char *filename) 26static FILE *cmp_xfopen_input(const char * const filename)
27{ 27{
28 FILE *fp; 28 FILE *fp;
29 29
@@ -40,32 +40,28 @@ static const char fmt_differ[] = "%s %s differ: char %d, line %d\n";
40static const char fmt_l_opt[] = "%.0s%.0s%d %3o %3o\n"; 40static const char fmt_l_opt[] = "%.0s%.0s%d %3o %3o\n";
41 41
42static const char opt_chars[] = "sl"; 42static const char opt_chars[] = "sl";
43 43#define CMP_OPT_s (1<<0)
44enum { 44#define CMP_OPT_l (1<<1)
45 OPT_s = 1,
46 OPT_l = 2
47};
48 45
49int cmp_main(int argc, char **argv) 46int cmp_main(int argc, char **argv)
50{ 47{
51 FILE *fp1, *fp2, *outfile = stdout; 48 FILE *fp1, *fp2, *outfile = stdout;
52 const char *filename1, *filename2; 49 const char *filename1, *filename2 = "-";
53 const char *fmt; 50 const char *fmt;
54 int c1, c2, char_pos, line_pos; 51 int c1, c2, char_pos = 0, line_pos = 1;
55 int opt_flags; 52 unsigned opt;
56 int exit_val = 0; 53 int retval = 0;
57 54
58 bb_default_error_retval = 2; /* 1 is returned if files are different. */ 55 bb_default_error_retval = 2; /* 1 is returned if files are different. */
59 56
60 opt_flags = bb_getopt_ulflags(argc, argv, opt_chars); 57 opt = bb_getopt_ulflags(argc, argv, opt_chars);
61 58
62 if ((opt_flags == 3) || (((unsigned int)(--argc - optind)) > 1)) { 59 if ((opt & (CMP_OPT_s|CMP_OPT_l))
60 || (((unsigned int)(--argc - optind)) > 1))
63 bb_show_usage(); 61 bb_show_usage();
64 }
65 62
66 fp1 = cmp_xfopen_input(filename1 = *(argv += optind)); 63 fp1 = cmp_xfopen_input(filename1 = *(argv += optind));
67 64
68 filename2 = "-";
69 if (*++argv) { 65 if (*++argv) {
70 filename2 = *argv; 66 filename2 = *argv;
71 } 67 }
@@ -79,19 +75,17 @@ int cmp_main(int argc, char **argv)
79 return 0; 75 return 0;
80 } 76 }
81 77
82 fmt = fmt_differ; 78 if (opt & CMP_OPT_l)
83 if (opt_flags == OPT_l) {
84 fmt = fmt_l_opt; 79 fmt = fmt_l_opt;
85 } 80 else
81 fmt = fmt_differ;
86 82
87 char_pos = 0;
88 line_pos = 1;
89 do { 83 do {
90 c1 = getc(fp1); 84 c1 = getc(fp1);
91 c2 = getc(fp2); 85 c2 = getc(fp2);
92 ++char_pos; 86 ++char_pos;
93 if (c1 != c2) { /* Remember -- a read error may have occurred. */ 87 if (c1 != c2) { /* Remember: a read error may have occurred. */
94 exit_val = 1; /* But assume the files are different for now. */ 88 retval = 1; /* But assume the files are different for now. */
95 if (c2 == EOF) { 89 if (c2 == EOF) {
96 /* We know that fp1 isn't at EOF or in an error state. But to 90 /* We know that fp1 isn't at EOF or in an error state. But to
97 * save space below, things are setup to expect an EOF in fp1 91 * save space below, things are setup to expect an EOF in fp1
@@ -109,13 +103,14 @@ int cmp_main(int argc, char **argv)
109 * make sure we fflush before writing to stderr. */ 103 * make sure we fflush before writing to stderr. */
110 xfflush_stdout(); 104 xfflush_stdout();
111 } 105 }
112 if (opt_flags != OPT_s) { 106 if (!opt & CMP_OPT_s) {
113 if (opt_flags == OPT_l) { 107 if (opt & CMP_OPT_l) {
114 line_pos = c1; /* line_pos is unused in the -l case. */ 108 line_pos = c1; /* line_pos is unused in the -l case. */
115 } 109 }
116 bb_fprintf(outfile, fmt, filename1, filename2, char_pos, line_pos, c2); 110 bb_fprintf(outfile, fmt, filename1, filename2, char_pos, line_pos, c2);
117 if (opt_flags) { /* This must be -l since not -s. */ 111 if (opt) { /* This must be -l since not -s. */
118 /* If we encountered and EOF, the while check will catch it. */ 112 /* If we encountered an EOF,
113 * the while check will catch it. */
119 continue; 114 continue;
120 } 115 }
121 } 116 }
@@ -129,5 +124,5 @@ int cmp_main(int argc, char **argv)
129 xferror(fp1, filename1); 124 xferror(fp1, filename1);
130 xferror(fp2, filename2); 125 xferror(fp2, filename2);
131 126
132 bb_fflush_stdout_and_exit(exit_val); 127 bb_fflush_stdout_and_exit(retval);
133} 128}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-15 11:59:01 +0000