diff options
-rw-r--r-- | archival/tar.c | 8 | ||||
-rw-r--r-- | messages.c | 4 | ||||
-rw-r--r-- | tar.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/archival/tar.c b/archival/tar.c index 4fd864b25..07c0e7105 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "busybox.h" | 39 | #include "busybox.h" |
40 | #define BB_DECLARE_EXTERN | 40 | #define BB_DECLARE_EXTERN |
41 | #define bb_need_io_error | 41 | #define bb_need_io_error |
42 | #define bb_need_name_longer_then_foo | 42 | #define bb_need_name_longer_than_foo |
43 | #include "messages.c" | 43 | #include "messages.c" |
44 | #include <stdio.h> | 44 | #include <stdio.h> |
45 | #include <dirent.h> | 45 | #include <dirent.h> |
@@ -535,7 +535,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag, | |||
535 | } | 535 | } |
536 | if ( skipNextHeaderFlag == TRUE ) { | 536 | if ( skipNextHeaderFlag == TRUE ) { |
537 | skipNextHeaderFlag=FALSE; | 537 | skipNextHeaderFlag=FALSE; |
538 | errorMsg(name_longer_then_foo, NAME_SIZE); | 538 | errorMsg(name_longer_than_foo, NAME_SIZE); |
539 | tarExtractRegularFile(&header, FALSE, FALSE); | 539 | tarExtractRegularFile(&header, FALSE, FALSE); |
540 | continue; | 540 | continue; |
541 | } | 541 | } |
@@ -915,7 +915,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* | |||
915 | } | 915 | } |
916 | 916 | ||
917 | if (strlen(fileName) >= NAME_SIZE) { | 917 | if (strlen(fileName) >= NAME_SIZE) { |
918 | errorMsg(name_longer_then_foo, NAME_SIZE); | 918 | errorMsg(name_longer_than_foo, NAME_SIZE); |
919 | return ( TRUE); | 919 | return ( TRUE); |
920 | } | 920 | } |
921 | 921 | ||
@@ -1004,7 +1004,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv, | |||
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | /* To be pedantically correct, we would check if the tarball | 1006 | /* To be pedantically correct, we would check if the tarball |
1007 | * is smaller then 20 tar blocks, and pad it if it was smaller, | 1007 | * is smaller than 20 tar blocks, and pad it if it was smaller, |
1008 | * but that isn't necessary for GNU tar interoperability, and | 1008 | * but that isn't necessary for GNU tar interoperability, and |
1009 | * so is considered a waste of space */ | 1009 | * so is considered a waste of space */ |
1010 | 1010 | ||
diff --git a/messages.c b/messages.c index 81fd9c75c..c06a87f01 100644 --- a/messages.c +++ b/messages.c | |||
@@ -81,8 +81,8 @@ | |||
81 | #if defined bb_need_too_few_args || ! defined BB_DECLARE_EXTERN | 81 | #if defined bb_need_too_few_args || ! defined BB_DECLARE_EXTERN |
82 | BB_DEF_MESSAGE(too_few_args, "too few arguments\n") | 82 | BB_DEF_MESSAGE(too_few_args, "too few arguments\n") |
83 | #endif | 83 | #endif |
84 | #if defined bb_need_name_longer_then_foo || ! defined BB_DECLARE_EXTERN | 84 | #if defined bb_need_name_longer_than_foo || ! defined BB_DECLARE_EXTERN |
85 | BB_DEF_MESSAGE(name_longer_then_foo, "Names longer then %d chars not supported.\n") | 85 | BB_DEF_MESSAGE(name_longer_than_foo, "Names longer than %d chars not supported.\n") |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | 88 | ||
@@ -39,7 +39,7 @@ | |||
39 | #include "busybox.h" | 39 | #include "busybox.h" |
40 | #define BB_DECLARE_EXTERN | 40 | #define BB_DECLARE_EXTERN |
41 | #define bb_need_io_error | 41 | #define bb_need_io_error |
42 | #define bb_need_name_longer_then_foo | 42 | #define bb_need_name_longer_than_foo |
43 | #include "messages.c" | 43 | #include "messages.c" |
44 | #include <stdio.h> | 44 | #include <stdio.h> |
45 | #include <dirent.h> | 45 | #include <dirent.h> |
@@ -535,7 +535,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag, | |||
535 | } | 535 | } |
536 | if ( skipNextHeaderFlag == TRUE ) { | 536 | if ( skipNextHeaderFlag == TRUE ) { |
537 | skipNextHeaderFlag=FALSE; | 537 | skipNextHeaderFlag=FALSE; |
538 | errorMsg(name_longer_then_foo, NAME_SIZE); | 538 | errorMsg(name_longer_than_foo, NAME_SIZE); |
539 | tarExtractRegularFile(&header, FALSE, FALSE); | 539 | tarExtractRegularFile(&header, FALSE, FALSE); |
540 | continue; | 540 | continue; |
541 | } | 541 | } |
@@ -915,7 +915,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void* | |||
915 | } | 915 | } |
916 | 916 | ||
917 | if (strlen(fileName) >= NAME_SIZE) { | 917 | if (strlen(fileName) >= NAME_SIZE) { |
918 | errorMsg(name_longer_then_foo, NAME_SIZE); | 918 | errorMsg(name_longer_than_foo, NAME_SIZE); |
919 | return ( TRUE); | 919 | return ( TRUE); |
920 | } | 920 | } |
921 | 921 | ||
@@ -1004,7 +1004,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv, | |||
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | /* To be pedantically correct, we would check if the tarball | 1006 | /* To be pedantically correct, we would check if the tarball |
1007 | * is smaller then 20 tar blocks, and pad it if it was smaller, | 1007 | * is smaller than 20 tar blocks, and pad it if it was smaller, |
1008 | * but that isn't necessary for GNU tar interoperability, and | 1008 | * but that isn't necessary for GNU tar interoperability, and |
1009 | * so is considered a waste of space */ | 1009 | * so is considered a waste of space */ |
1010 | 1010 | ||