aboutsummaryrefslogtreecommitdiff
path: root/coreutils/uniq.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
committerRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
commitd921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch)
treee4a2769349867c441cf2983d83097bb66701a733 /coreutils/uniq.c
parent6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff)
downloadbusybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.bz2
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip
Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.)
Diffstat (limited to 'coreutils/uniq.c')
-rw-r--r--coreutils/uniq.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 956c50796..26afc00f4 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -11,9 +11,6 @@
11/* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */ 11/* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
12 12
13#include "busybox.h" 13#include "busybox.h"
14#include <string.h>
15#include <ctype.h>
16#include <unistd.h>
17 14
18static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4"; 15static const char uniq_opts[] = "f:s:" "cdu\0\1\2\4";
19 16
@@ -23,7 +20,7 @@ static FILE *xgetoptfile_uniq_s(char **argv, int read0write2)
23 20
24 if ((n = *argv) != NULL) { 21 if ((n = *argv) != NULL) {
25 if ((*n != '-') || n[1]) { 22 if ((*n != '-') || n[1]) {
26 return bb_xfopen(n, "r\0w" + read0write2); 23 return xfopen(n, "r\0w" + read0write2);
27 } 24 }
28 } 25 }
29 return (read0write2) ? stdout : stdin; 26 return (read0write2) ? stdout : stdin;
@@ -100,7 +97,7 @@ int uniq_main(int argc, char **argv)
100 } 97 }
101 } while (s1); 98 } while (s1);
102 99
103 bb_xferror(in, input_filename); 100 xferror(in, input_filename);
104 101
105 bb_fflush_stdout_and_exit(EXIT_SUCCESS); 102 bb_fflush_stdout_and_exit(EXIT_SUCCESS);
106} 103}