Fix dos2unix/tr problem noted by Larry Doolittle.

diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 8308c417996ae000a25d9af10d264f58330eaaa5..4ca665841641aa9136bbddc0f9a3c0d54ce62a70 100644 (file)
--- 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 8308c417996ae000a25d9af10d264f58330eaaa5..4ca665841641aa9136bbddc0f9a3c0d54ce62a70 100644 (file)
--- 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 ec2a3a8ce5428f67633955484871f85a5ccdb6d0..bc8e3c5f3ba47b89235779f69619cde01a048502 100644 (file)
--- 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 ec2a3a8ce5428f67633955484871f85a5ccdb6d0..bc8e3c5f3ba47b89235779f69619cde01a048502 100644 (file)
--- 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__ */