X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcomm.c;h=221cbfbcc844320258aeac7f5b149b9931e3d581;hb=5b492ee87614632e7bf5cd68fe0ce87dad30002a;hp=d3ca9c1b7ad7f91231f79516cd60f7f3ff15b70c;hpb=0fb397e6176bebd31d27f8b2105b808091207366;p=oweals%2Fbusybox.git diff --git a/coreutils/comm.c b/coreutils/comm.c index d3ca9c1b7..221cbfbcc 100644 --- a/coreutils/comm.c +++ b/coreutils/comm.c @@ -4,141 +4,97 @@ * * Copyright (C) 2005 by Robert Sullivan * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" -#define COMM_OPT_1 0x01 -#define COMM_OPT_2 0x02 -#define COMM_OPT_3 0x04 - -/* These three variables control behaviour if non-zero */ - -static int only_file_1; -static int only_file_2; -static int both; +#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 = option_mask32; if (class == 0) { - if (!only_file_1) + if (flags & COMM_OPT_1) return; } else if (class == 1) { - if (!only_file_2) + if (flags & COMM_OPT_2) return; - if (only_file_1) + if (!(flags & COMM_OPT_1)) putchar('\t'); - } - else /*if (class == 2)*/ { - if (!both) + } else /*if (class == 2)*/ { + if (flags & COMM_OPT_3) return; - if (only_file_1) + if (!(flags & COMM_OPT_1)) putchar('\t'); - if (only_file_2) + if (!(flags & COMM_OPT_2)) putchar('\t'); } - fputs(line, stdout); + puts(line); } -/* This is the real core of the program - lines are compared here */ -static void cmp_files(char **infiles) +int comm_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int comm_main(int argc UNUSED_PARAM, char **argv) { -#define LINE_LEN 100 -#define BB_EOF_0 0x1 -#define BB_EOF_1 0x2 - char thisline[2][LINE_LEN]; - FILE *streams[2]; + char *thisline[2]; + FILE *stream[2]; int i; + int order; + + opt_complementary = "=2"; + getopt32(argv, "123"); + argv += optind; for (i = 0; i < 2; ++i) { - streams[i] = ((infiles[i][0] == '=' && infiles[1][1]) ? stdin : bb_xfopen(infiles[i], "r")); - fgets(thisline[i], LINE_LEN, streams[i]); + stream[i] = xfopen_stdin(argv[i]); } - 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; + order = 0; + thisline[1] = thisline[0] = NULL; + while (1) { + if (order <= 0) { + free(thisline[0]); + thisline[0] = xmalloc_fgetline(stream[0]); + } + if (order >= 0) { + free(thisline[1]); + thisline[1] = xmalloc_fgetline(stream[1]); } - if (order == 0 && !i) - writeline(thisline[1], 2); - else if (order > 0 && !(i & BB_EOF_1)) - writeline(thisline[1], 1); - else if (order < 0 && !(i & BB_EOF_0)) - writeline(thisline[0], 0); - - if (i & BB_EOF_0 & BB_EOF_1) { + i = !thisline[0] + (!thisline[1] << 1); + if (i) break; + order = strcmp(thisline[0], thisline[1]); - } 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); - fgets(thisline[i], LINE_LEN, streams[i]); - } - break; + if (order >= 0) + writeline(thisline[1], order ? 1 : 2); + else + writeline(thisline[0], 0); + } - } else { - if (order >= 0) - fgets(thisline[1], LINE_LEN, streams[1]); - if (order <= 0) - fgets(thisline[0], LINE_LEN, streams[0]); + /* EOF at least on one of the streams */ + i &= 1; + if (thisline[i]) { + /* stream[i] is not at EOF yet */ + /* we did not print thisline[i] yet */ + char *p = thisline[i]; + writeline(p, i); + while (1) { + free(p); + p = xmalloc_fgetline(stream[i]); + if (!p) + break; + writeline(p, i); } } - fclose(streams[0]); - fclose(streams[1]); -} - -int comm_main(int argc, char **argv) -{ - unsigned long flags; - - flags = bb_getopt_ulflags(argc, argv, "123"); - - if (optind + 2 != argc) - bb_show_usage(); - - only_file_1 = !(flags & COMM_OPT_1); - only_file_2 = !(flags & COMM_OPT_2); - both = !(flags & COMM_OPT_3); + if (ENABLE_FEATURE_CLEAN_UP) { + fclose(stream[0]); + fclose(stream[1]); + } - cmp_files(argv + optind); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; }