Grammer fix. Changed "longer then" to "longer than". Fix thanks to Jim
Gleason <jimg@lineo.com>.
This commit is contained in:
parent
46f0beb167
commit
3c5ee9a379
@ -39,7 +39,7 @@
|
|||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
#define BB_DECLARE_EXTERN
|
#define BB_DECLARE_EXTERN
|
||||||
#define bb_need_io_error
|
#define bb_need_io_error
|
||||||
#define bb_need_name_longer_then_foo
|
#define bb_need_name_longer_than_foo
|
||||||
#include "messages.c"
|
#include "messages.c"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
@ -535,7 +535,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
|
|||||||
}
|
}
|
||||||
if ( skipNextHeaderFlag == TRUE ) {
|
if ( skipNextHeaderFlag == TRUE ) {
|
||||||
skipNextHeaderFlag=FALSE;
|
skipNextHeaderFlag=FALSE;
|
||||||
errorMsg(name_longer_then_foo, NAME_SIZE);
|
errorMsg(name_longer_than_foo, NAME_SIZE);
|
||||||
tarExtractRegularFile(&header, FALSE, FALSE);
|
tarExtractRegularFile(&header, FALSE, FALSE);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -915,7 +915,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void*
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(fileName) >= NAME_SIZE) {
|
if (strlen(fileName) >= NAME_SIZE) {
|
||||||
errorMsg(name_longer_then_foo, NAME_SIZE);
|
errorMsg(name_longer_than_foo, NAME_SIZE);
|
||||||
return ( TRUE);
|
return ( TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1004,7 +1004,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* To be pedantically correct, we would check if the tarball
|
/* To be pedantically correct, we would check if the tarball
|
||||||
* is smaller then 20 tar blocks, and pad it if it was smaller,
|
* is smaller than 20 tar blocks, and pad it if it was smaller,
|
||||||
* but that isn't necessary for GNU tar interoperability, and
|
* but that isn't necessary for GNU tar interoperability, and
|
||||||
* so is considered a waste of space */
|
* so is considered a waste of space */
|
||||||
|
|
||||||
|
@ -81,8 +81,8 @@
|
|||||||
#if defined bb_need_too_few_args || ! defined BB_DECLARE_EXTERN
|
#if defined bb_need_too_few_args || ! defined BB_DECLARE_EXTERN
|
||||||
BB_DEF_MESSAGE(too_few_args, "too few arguments\n")
|
BB_DEF_MESSAGE(too_few_args, "too few arguments\n")
|
||||||
#endif
|
#endif
|
||||||
#if defined bb_need_name_longer_then_foo || ! defined BB_DECLARE_EXTERN
|
#if defined bb_need_name_longer_than_foo || ! defined BB_DECLARE_EXTERN
|
||||||
BB_DEF_MESSAGE(name_longer_then_foo, "Names longer then %d chars not supported.\n")
|
BB_DEF_MESSAGE(name_longer_than_foo, "Names longer than %d chars not supported.\n")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
8
tar.c
8
tar.c
@ -39,7 +39,7 @@
|
|||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
#define BB_DECLARE_EXTERN
|
#define BB_DECLARE_EXTERN
|
||||||
#define bb_need_io_error
|
#define bb_need_io_error
|
||||||
#define bb_need_name_longer_then_foo
|
#define bb_need_name_longer_than_foo
|
||||||
#include "messages.c"
|
#include "messages.c"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
@ -535,7 +535,7 @@ static int readTarFile(const char* tarName, int extractFlag, int listFlag,
|
|||||||
}
|
}
|
||||||
if ( skipNextHeaderFlag == TRUE ) {
|
if ( skipNextHeaderFlag == TRUE ) {
|
||||||
skipNextHeaderFlag=FALSE;
|
skipNextHeaderFlag=FALSE;
|
||||||
errorMsg(name_longer_then_foo, NAME_SIZE);
|
errorMsg(name_longer_than_foo, NAME_SIZE);
|
||||||
tarExtractRegularFile(&header, FALSE, FALSE);
|
tarExtractRegularFile(&header, FALSE, FALSE);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -915,7 +915,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf, void*
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(fileName) >= NAME_SIZE) {
|
if (strlen(fileName) >= NAME_SIZE) {
|
||||||
errorMsg(name_longer_then_foo, NAME_SIZE);
|
errorMsg(name_longer_than_foo, NAME_SIZE);
|
||||||
return ( TRUE);
|
return ( TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1004,7 +1004,7 @@ static int writeTarFile(const char* tarName, int verboseFlag, char **argv,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* To be pedantically correct, we would check if the tarball
|
/* To be pedantically correct, we would check if the tarball
|
||||||
* is smaller then 20 tar blocks, and pad it if it was smaller,
|
* is smaller than 20 tar blocks, and pad it if it was smaller,
|
||||||
* but that isn't necessary for GNU tar interoperability, and
|
* but that isn't necessary for GNU tar interoperability, and
|
||||||
* so is considered a waste of space */
|
* so is considered a waste of space */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user