ndk-busybox/coreutils/comm.c
Denis Vlasenko 68404f13d4 *: add -Wunused-parameter; fix resulting breakage
function                                             old     new   delta
procps_scan                                         1265    1298     +33
aliascmd                                             278     283      +5
parse_file_cmd                                       116     120      +4
dname_enc                                            373     377      +4
setcmd                                                90      93      +3
execcmd                                               57      60      +3
count_lines                                           72      74      +2
process_command_subs                                 340     339      -1
test_main                                            409     407      -2
mknod_main                                           179     177      -2
handle_incoming_and_exit                            2653    2651      -2
argstr                                              1312    1310      -2
shiftcmd                                             131     128      -3
exitcmd                                               46      43      -3
dotcmd                                               297     294      -3
breakcmd                                              86      83      -3
evalpipe                                             353     349      -4
evalcommand                                         1180    1176      -4
evalcmd                                              109     105      -4
send_tree                                            374     369      -5
mkfifo_main                                           82      77      -5
evalsubshell                                         152     147      -5
typecmd                                               75      69      -6
letcmd                                                61      55      -6
add_cmd                                             1190    1183      -7
main                                                 891     883      -8
ash_main                                            1415    1407      -8
parse_stream                                        1377    1367     -10
alloc_procps_scan                                     55       -     -55
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 7/21 up/down: 54/-148)          Total: -94 bytes
   text    data     bss     dec     hex filename
 797195     658    7428  805281   c49a1 busybox_old
 797101     658    7428  805187   c4943 busybox_unstripped
2008-03-17 09:00:54 +00:00

114 lines
2.6 KiB
C

/* vi: set sw=4 ts=4: */
/*
* Mini comm implementation for busybox
*
* Copyright (C) 2005 by Robert Sullivan <cogito.ergo.cogito@gmail.com>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
#define COMM_OPT_1 (1 << 0)
#define COMM_OPT_2 (1 << 1)
#define COMM_OPT_3 (1 << 2)
/* writeline outputs the input given, appropriately aligned according to class */
static void writeline(char *line, int class, int flags)
{
if (class == 0) {
if (flags & COMM_OPT_1)
return;
} else if (class == 1) {
if (flags & COMM_OPT_2)
return;
if (!(flags & COMM_OPT_1))
putchar('\t');
} else /*if (class == 2)*/ {
if (flags & COMM_OPT_3)
return;
if (!(flags & COMM_OPT_1))
putchar('\t');
if (!(flags & COMM_OPT_2))
putchar('\t');
}
fputs(line, stdout);
}
int comm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int comm_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
#define LINE_LEN 100
#define BB_EOF_0 0x1
#define BB_EOF_1 0x2
char thisline[2][LINE_LEN];
FILE *streams[2];
int i;
unsigned flags;
opt_complementary = "=2";
flags = getopt32(argv, "123");
argv += optind;
for (i = 0; i < 2; ++i) {
streams[i] = (argv[i][0] == '-' && !argv[i][1]) ? stdin : xfopen(argv[i], "r");
fgets(thisline[i], LINE_LEN, streams[i]);
}
/* This is the real core of the program - lines are compared here */
while (*thisline[0] || *thisline[1]) {
int order = 0;
i = 0;
if (feof(streams[0])) i |= BB_EOF_0;
if (feof(streams[1])) i |= BB_EOF_1;
if (!*thisline[0])
order = 1;
else if (!*thisline[1])
order = -1;
else {
int tl0_len, tl1_len;
tl0_len = strlen(thisline[0]);
tl1_len = strlen(thisline[1]);
order = memcmp(thisline[0], thisline[1], tl0_len < tl1_len ? tl0_len : tl1_len);
if (!order)
order = tl0_len < tl1_len ? -1 : tl0_len != tl1_len;
}
if (order == 0 && !i)
writeline(thisline[1], 2, flags);
else if (order > 0 && !(i & BB_EOF_1))
writeline(thisline[1], 1, flags);
else if (order < 0 && !(i & BB_EOF_0))
writeline(thisline[0], 0, flags);
if (i & BB_EOF_0 & BB_EOF_1) {
break;
} else if (i) {
i = (i & BB_EOF_0 ? 1 : 0);
while (!feof(streams[i])) {
if ((order < 0 && i) || (order > 0 && !i))
writeline(thisline[i], i, flags);
fgets(thisline[i], LINE_LEN, streams[i]);
}
break;
} else {
if (order >= 0)
fgets(thisline[1], LINE_LEN, streams[1]);
if (order <= 0)
fgets(thisline[0], LINE_LEN, streams[0]);
}
}
if (ENABLE_FEATURE_CLEAN_UP) {
fclose(streams[0]);
fclose(streams[1]);
}
return EXIT_SUCCESS;
}