diff options
| author | Matt Kraai <kraai@debian.org> | 2001-04-12 21:38:06 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-04-12 21:38:06 +0000 |
| commit | 1e04ea388f5f673f44503052d0f8873e4017abc3 (patch) | |
| tree | bc9146b79f0892a753a1185698b00eccb10e92c2 | |
| parent | d6cde0bcf43903c9f691ee7e745891f713419a9b (diff) | |
| download | busybox-w32-1e04ea388f5f673f44503052d0f8873e4017abc3.tar.gz busybox-w32-1e04ea388f5f673f44503052d0f8873e4017abc3.tar.bz2 busybox-w32-1e04ea388f5f673f44503052d0f8873e4017abc3.zip | |
Fix dos2unix/tr problem noted by Larry Doolittle.
| -rw-r--r-- | coreutils/dos2unix.c | 2 | ||||
| -rw-r--r-- | dos2unix.c | 2 | ||||
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 32 | #include "busybox.h" | 32 | #include "busybox.h" |
| 33 | 33 | ||
| 34 | // if fn is NULL then input is stdin and output is stdout | 34 | // if fn is NULL then input is stdin and output is stdout |
| 35 | extern int convert(char *fn, int ConvType) { | 35 | static int convert(char *fn, int ConvType) { |
| 36 | char c; | 36 | char c; |
| 37 | char *tempFn = NULL; | 37 | char *tempFn = NULL; |
| 38 | FILE *in = stdin, *out = stdout; | 38 | 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 @@ | |||
| 32 | #include "busybox.h" | 32 | #include "busybox.h" |
| 33 | 33 | ||
| 34 | // if fn is NULL then input is stdin and output is stdout | 34 | // if fn is NULL then input is stdin and output is stdout |
| 35 | extern int convert(char *fn, int ConvType) { | 35 | static int convert(char *fn, int ConvType) { |
| 36 | char c; | 36 | char c; |
| 37 | char *tempFn = NULL; | 37 | char *tempFn = NULL; |
| 38 | FILE *in = stdin, *out = stdout; | 38 | 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); | |||
| 247 | #define CT_AUTO 0 | 247 | #define CT_AUTO 0 |
| 248 | #define CT_UNIX2DOS 1 | 248 | #define CT_UNIX2DOS 1 |
| 249 | #define CT_DOS2UNIX 2 | 249 | #define CT_DOS2UNIX 2 |
| 250 | extern int convert(char *fn, int ConvType); | 250 | /* extern int convert(char *fn, int ConvType); */ |
| 251 | 251 | ||
| 252 | #endif /* __LIBBB_H__ */ | 252 | #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); | |||
| 247 | #define CT_AUTO 0 | 247 | #define CT_AUTO 0 |
| 248 | #define CT_UNIX2DOS 1 | 248 | #define CT_UNIX2DOS 1 |
| 249 | #define CT_DOS2UNIX 2 | 249 | #define CT_DOS2UNIX 2 |
| 250 | extern int convert(char *fn, int ConvType); | 250 | /* extern int convert(char *fn, int ConvType); */ |
| 251 | 251 | ||
| 252 | #endif /* __LIBBB_H__ */ | 252 | #endif /* __LIBBB_H__ */ |