svn commit: trunk/busybox: coreutils include

[vda at busybox.net]

Author: vda
Date: 2007-03-21 15:30:14 -0700 (Wed, 21 Mar 2007)
New Revision: 18199

Log:
cmp: support 3rd and 4th arguments if DESKTOP=y (needed for gcc build)


Modified:
   trunk/busybox/coreutils/cmp.c
   trunk/busybox/include/usage.h


Changeset:
Modified: trunk/busybox/coreutils/cmp.c
===================================================================
--- trunk/busybox/coreutils/cmp.c	2007-03-21 20:17:27 UTC (rev 18198)
+++ trunk/busybox/coreutils/cmp.c	2007-03-21 22:30:14 UTC (rev 18199)
@@ -34,9 +34,9 @@
 }
 
 static const char fmt_eof[] = "cmp: EOF on %s\n";
-static const char fmt_differ[] = "%s %s differ: char %d, line %d\n";
-// This fmt_l_opt uses gnu-isms.  SUSv3 would be "%.0s%.0s%d %o %o\n"
-static const char fmt_l_opt[] = "%.0s%.0s%d %3o %3o\n";
+static const char fmt_differ[] = "%s %s differ: char %"OFF_FMT"d, line %d\n";
+// This fmt_l_opt uses gnu-isms.  SUSv3 would be "%.0s%.0s%"OFF_FMT"d %o %o\n"
+static const char fmt_l_opt[] = "%.0s%.0s%"OFF_FMT"d %3o %3o\n";
 
 static const char opt_chars[] = "sl";
 #define CMP_OPT_s (1<<0)
@@ -47,27 +47,40 @@
 {
 	FILE *fp1, *fp2, *outfile = stdout;
 	const char *filename1, *filename2 = "-";
+	USE_DESKTOP(off_t skip1 = 0, skip2 = 0;)
+	off_t char_pos = 0;
+	int line_pos = 1; /* Hopefully won't overflow... */
 	const char *fmt;
-	int c1, c2, char_pos = 0, line_pos = 1;
+	int c1, c2;
 	unsigned opt;
 	int retval = 0;
 
 	xfunc_error_retval = 2;	/* 1 is returned if files are different. */
 
+	opt_complementary = "?:-1"
+			USE_DESKTOP(":?4")
+			SKIP_DESKTOP(":?2")
+			":l--s:s--l";
 	opt = getopt32(argc, argv, opt_chars);
+	argv += optind;
 
-	if (((opt & (CMP_OPT_s|CMP_OPT_l)) == (CMP_OPT_s|CMP_OPT_l))
-			|| (((unsigned int)(--argc - optind)) > 1))
-		bb_show_usage();
+	filename1 = *argv;
+	fp1 = cmp_xfopen_input(filename1);
 
-	fp1 = cmp_xfopen_input(filename1 = *(argv += optind));
-
 	if (*++argv) {
 		filename2 = *argv;
+#if ENABLE_DESKTOP
+		if (*++argv) {
+			skip1 = XATOOFF(*argv);
+			if (*++argv) {
+				skip2 = XATOOFF(*argv);
+			}
+		}
+#endif
 	}
+
 	fp2 = cmp_xfopen_input(filename2);
-
-	if (fp1 == fp2) {			/* Paranioa check... stdin == stdin? */
+	if (fp1 == fp2) {		/* Paranoia check... stdin == stdin? */
 		/* Note that we don't bother reading stdin.  Neither does gnu wc.
 		 * But perhaps we should, so that other apps down the chain don't
 		 * get the input.  Consider 'echo hello | (cmp - - && cat -)'.
@@ -80,6 +93,10 @@
 	else
 		fmt = fmt_differ;
 
+#if ENABLE_DESKTOP
+	while (skip1) { getc(fp1); skip1--; }
+	while (skip2) { getc(fp2); skip2--; }
+#endif
 	do {
 		c1 = getc(fp1);
 		c2 = getc(fp2);

Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2007-03-21 20:17:27 UTC (rev 18198)
+++ trunk/busybox/include/usage.h	2007-03-21 22:30:14 UTC (rev 18199)
@@ -377,7 +377,7 @@
        "Clear screen"
 
 #define cmp_trivial_usage \
-       "[-l] [-s] FILE1 [FILE2]"
+       "[-l] [-s] FILE1 [FILE2" USE_DESKTOP(" [SKIP1 [SKIP2]") "]]"
 #define cmp_full_usage \
        "Compares FILE1 vs stdin if FILE2 is not specified" \
        "\n\nOptions:\n" \