From 1e04ea388f5f673f44503052d0f8873e4017abc3 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 12 Apr 2001 21:38:06 +0000 Subject: [PATCH] Fix dos2unix/tr problem noted by Larry Doolittle. --- coreutils/dos2unix.c | 2 +- dos2unix.c | 2 +- include/libbb.h | 2 +- libbb/libbb.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index 8308c4179..4ca665841 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c @@ -32,7 +32,7 @@ #include "busybox.h" // if fn is NULL then input is stdin and output is stdout -extern int convert(char *fn, int ConvType) { +static int convert(char *fn, int ConvType) { char c; char *tempFn = NULL; FILE *in = stdin, *out = stdout; diff --git a/dos2unix.c b/dos2unix.c index 8308c4179..4ca665841 100644 --- a/dos2unix.c +++ b/dos2unix.c @@ -32,7 +32,7 @@ #include "busybox.h" // if fn is NULL then input is stdin and output is stdout -extern int convert(char *fn, int ConvType) { +static int convert(char *fn, int ConvType) { char c; char *tempFn = NULL; FILE *in = stdin, *out = stdout; diff --git a/include/libbb.h b/include/libbb.h index ec2a3a8ce..bc8e3c5f3 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -247,6 +247,6 @@ extern int gz_open(FILE *compressed_file, int *pid); #define CT_AUTO 0 #define CT_UNIX2DOS 1 #define CT_DOS2UNIX 2 -extern int convert(char *fn, int ConvType); +/* extern int convert(char *fn, int ConvType); */ #endif /* __LIBBB_H__ */ diff --git a/libbb/libbb.h b/libbb/libbb.h index ec2a3a8ce..bc8e3c5f3 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -247,6 +247,6 @@ extern int gz_open(FILE *compressed_file, int *pid); #define CT_AUTO 0 #define CT_UNIX2DOS 1 #define CT_DOS2UNIX 2 -extern int convert(char *fn, int ConvType); +/* extern int convert(char *fn, int ConvType); */ #endif /* __LIBBB_H__ */