summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai2001-04-12 21:38:06 +0000
committerMatt Kraai2001-04-12 21:38:06 +0000
commit1e04ea388f5f673f44503052d0f8873e4017abc3 (patch)
treebc9146b79f0892a753a1185698b00eccb10e92c2
parentd6cde0bcf43903c9f691ee7e745891f713419a9b (diff)
downloadbusybox-1e04ea388f5f673f44503052d0f8873e4017abc3.zip
busybox-1e04ea388f5f673f44503052d0f8873e4017abc3.tar.gz
Fix dos2unix/tr problem noted by Larry Doolittle.
-rw-r--r--coreutils/dos2unix.c2
-rw-r--r--dos2unix.c2
-rw-r--r--include/libbb.h2
-rw-r--r--libbb/libbb.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 8308c41..4ca6658 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 8308c41..4ca6658 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 ec2a3a8..bc8e3c5 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 ec2a3a8..bc8e3c5 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__ */