emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the -h, --dereference option for archive creation.

Browse Source
This commit is contained in:
Glenn L McGrath
2004-01-25 05:48:28 +00:00
parent ca43b485de
commit 303e989a11
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
archival/tar.c
View File

@ -432,7 +432,8 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf,
} }
static inline int writeTarFile(const int tar_fd, const int verboseFlag, static inline int writeTarFile(const int tar_fd, const int verboseFlag,
const llist_t *include, const llist_t *exclude, const int gzip) const unsigned long dereferenceFlag, const llist_t *include,
const llist_t *exclude, const int gzip)
{ {
#ifdef CONFIG_FEATURE_TAR_GZIP #ifdef CONFIG_FEATURE_TAR_GZIP
int gzipDataPipe[2] = { -1, -1 }; int gzipDataPipe[2] = { -1, -1 };
@ -516,7 +517,7 @@ static inline int writeTarFile(const int tar_fd, const int verboseFlag,
/* Read the directory/files and iterate over them one at a time */ /* Read the directory/files and iterate over them one at a time */
while (include) { while (include) {
if (!recursive_action(include->data, TRUE, FALSE, FALSE, if (!recursive_action(include->data, TRUE, dereferenceFlag, FALSE,
writeFileToTarball, writeFileToTarball, writeFileToTarball, writeFileToTarball,
(void *) &tbInfo)) { (void *) &tbInfo)) {
errorFlag = TRUE; errorFlag = TRUE;
@ -605,8 +606,9 @@ static char get_header_tar_Z(archive_handle_t *archive_handle)
#ifdef CONFIG_FEATURE_TAR_CREATE #ifdef CONFIG_FEATURE_TAR_CREATE
# define CTX_CREATE (1 << 8) # define CTX_CREATE (1 << 8)
# define TAR_OPT_STR_CREATE "c" # define TAR_OPT_DEREFERNCE (1 << 9)
# define TAR_OPT_FLAG_CREATE 1 # define TAR_OPT_STR_CREATE "ch"
# define TAR_OPT_FLAG_CREATE 2
#else #else
//# define CTX_CREATE 0 //# define CTX_CREATE 0
# define TAR_OPT_STR_CREATE "" # define TAR_OPT_STR_CREATE ""
@ -667,6 +669,7 @@ static const struct option tar_long_options[] = {
{ "keep-old", 0, NULL, 'k' }, { "keep-old", 0, NULL, 'k' },
# ifdef CONFIG_FEATURE_TAR_CREATE # ifdef CONFIG_FEATURE_TAR_CREATE
{ "create", 0, NULL, 'c' }, { "create", 0, NULL, 'c' },
{ "dereference", 0, NULL, 'h' },
# endif # endif
# ifdef CONFIG_FEATURE_TAR_BZIP2 # ifdef CONFIG_FEATURE_TAR_BZIP2
{ "bzip2", 0, NULL, 'j' }, { "bzip2", 0, NULL, 'j' },
@ -861,7 +864,7 @@ int tar_main(int argc, char **argv)
(tar_handle->action_header == header_verbose_list)) { (tar_handle->action_header == header_verbose_list)) {
verboseFlag = TRUE; verboseFlag = TRUE;
} }
writeTarFile(tar_handle->src_fd, verboseFlag, tar_handle->accept, writeTarFile(tar_handle->src_fd, verboseFlag, opt & TAR_OPT_DEREFERNCE, tar_handle->accept,
tar_handle->reject, gzipFlag); tar_handle->reject, gzipFlag);
} else } else
#endif /* CONFIG_FEATURE_TAR_CREATE */ #endif /* CONFIG_FEATURE_TAR_CREATE */