Don't comment warnings. Don't put #warnings about warnings. _FIX_ warnings.

This fixes the warning, and makes the binary smaller out of sheer pique.
(Yes, since Manuel did this one it's nice tight code that took several
attempts to shrink, but I was ticked.)

Add the start of a test for uniq; this is about the first 1/3 of the
tests we need for full susv3 coverage of uniq.


git-svn-id: svn://busybox.net/trunk/busybox@11347 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 1 insertions, 39 deletions

diff --git a/coreutils/libcoreutils/Makefile.in b/coreutils/libcoreutils/Makefile.in
index 5f692b600..fe66c8243 100644
--- a/coreutils/libcoreutils/Makefile.in
+++ b/coreutils/libcoreutils/Makefile.in
@@ -23,7 +23,7 @@ LIBCOREUTILS_DIR:=$(top_builddir)/coreutils/libcoreutils/
 endif
 srcdir=$(top_srcdir)/coreutils/libcoreutils
 
-LIBCOREUTILS_SRC:= cp_mv_stat.c getopt_mk_fifo_nod.c xgetoptfile_sort_uniq.c
+LIBCOREUTILS_SRC:= cp_mv_stat.c getopt_mk_fifo_nod.c
 
 LIBCOREUTILS_OBJS=$(patsubst %.c,$(LIBCOREUTILS_DIR)%.o, $(LIBCOREUTILS_SRC))
 
diff --git a/coreutils/libcoreutils/xgetoptfile_sort_uniq.c b/coreutils/libcoreutils/xgetoptfile_sort_uniq.c
deleted file mode 100644
index a63daf97b..000000000
--- a/coreutils/libcoreutils/xgetoptfile_sort_uniq.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * coreutils utility routine
- *
- * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
- *
- * 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
- *
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include "libbb.h"
-#include "coreutils.h"
-
-extern FILE *xgetoptfile_sort_uniq(char **argv, const char *mode)
-{
-        const char *n;
-
-        if ((n = *argv) != NULL) {
-                if ((*n != '-') || n[1]) {
-                        return bb_xfopen(n, mode);
-                }
-        }
-        return (*mode == 'r') ? stdin : stdout;
-}