diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
commit | c7bda1ce659294d6e22c06e087f6f265983c7578 (patch) | |
tree | 4c6d2217f4d8306c59cf1096f8664e1cfd167213 /archival/tar.c | |
parent | 8854004b41065b3d081af7f3df13a100b0c8bfbe (diff) | |
download | busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.bz2 busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.zip |
Remove trailing whitespace. Update copyright to include 2004.
Diffstat (limited to 'archival/tar.c')
-rw-r--r-- | archival/tar.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/archival/tar.c b/archival/tar.c index cbd069425..2310e80cb 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * Mini tar implementation for busybox | 3 | * Mini tar implementation for busybox |
4 | * | 4 | * |
5 | * Modifed to use common extraction code used by ar, cpio, dpkg-deb, dpkg | 5 | * Modifed to use common extraction code used by ar, cpio, dpkg-deb, dpkg |
6 | * Glenn McGrath <bug1@optushome.com.au> | 6 | * Glenn McGrath <bug1@optushome.com.au> |
@@ -9,7 +9,7 @@ | |||
9 | * ground up. It still has remnents of the old code lying about, but it is | 9 | * ground up. It still has remnents of the old code lying about, but it is |
10 | * very different now (i.e., cleaner, less global variables, etc.) | 10 | * very different now (i.e., cleaner, less global variables, etc.) |
11 | * | 11 | * |
12 | * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org> | 12 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> |
13 | * | 13 | * |
14 | * Based in part in the tar implementation in sash | 14 | * Based in part in the tar implementation in sash |
15 | * Copyright (c) 1999 by David I. Bell | 15 | * Copyright (c) 1999 by David I. Bell |
@@ -111,7 +111,7 @@ struct TarBallInfo { | |||
111 | for the tarball */ | 111 | for the tarball */ |
112 | struct stat statBuf; /* Stat info for the tarball, letting | 112 | struct stat statBuf; /* Stat info for the tarball, letting |
113 | us know the inode and device that the | 113 | us know the inode and device that the |
114 | tarball lives, so we can avoid trying | 114 | tarball lives, so we can avoid trying |
115 | to include the tarball into itself */ | 115 | to include the tarball into itself */ |
116 | int verboseFlag; /* Whether to print extra stuff or not */ | 116 | int verboseFlag; /* Whether to print extra stuff or not */ |
117 | const llist_t *excludeList; /* List of files to not include */ | 117 | const llist_t *excludeList; /* List of files to not include */ |
@@ -470,7 +470,7 @@ static inline int writeTarFile(const int tar_fd, const int verboseFlag, | |||
470 | (void) &include; | 470 | (void) &include; |
471 | (void) &errorFlag; | 471 | (void) &errorFlag; |
472 | # endif | 472 | # endif |
473 | 473 | ||
474 | gzipPid = vfork(); | 474 | gzipPid = vfork(); |
475 | 475 | ||
476 | if (gzipPid == 0) { | 476 | if (gzipPid == 0) { |
@@ -616,7 +616,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle) | |||
616 | #endif | 616 | #endif |
617 | 617 | ||
618 | #ifdef CONFIG_FEATURE_TAR_BZIP2 | 618 | #ifdef CONFIG_FEATURE_TAR_BZIP2 |
619 | # define TAR_OPT_BZIP2 (1 << (8 + TAR_OPT_FLAG_CREATE)) | 619 | # define TAR_OPT_BZIP2 (1 << (8 + TAR_OPT_FLAG_CREATE)) |
620 | # define TAR_OPT_STR_BZIP2 "j" | 620 | # define TAR_OPT_STR_BZIP2 "j" |
621 | # define TAR_OPT_FLAG_BZIP2 1 | 621 | # define TAR_OPT_FLAG_BZIP2 1 |
622 | #else | 622 | #else |
@@ -646,7 +646,7 @@ static char get_header_tar_Z(archive_handle_t *archive_handle) | |||
646 | #ifdef CONFIG_FEATURE_TAR_COMPRESS | 646 | #ifdef CONFIG_FEATURE_TAR_COMPRESS |
647 | # define TAR_OPT_UNCOMPRESS (1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + TAR_OPT_FLAG_FROM + TAR_OPT_FLAG_GZIP)) | 647 | # define TAR_OPT_UNCOMPRESS (1 << (8 + TAR_OPT_FLAG_CREATE + TAR_OPT_FLAG_BZIP2 + TAR_OPT_FLAG_FROM + TAR_OPT_FLAG_GZIP)) |
648 | # define TAR_OPT_STR_COMPRESS "Z" | 648 | # define TAR_OPT_STR_COMPRESS "Z" |
649 | #else | 649 | #else |
650 | # define TAR_OPT_STR_COMPRESS "" | 650 | # define TAR_OPT_STR_COMPRESS "" |
651 | #endif | 651 | #endif |
652 | 652 | ||
@@ -740,7 +740,7 @@ int tar_main(int argc, char **argv) | |||
740 | bb_show_usage(); | 740 | bb_show_usage(); |
741 | } | 741 | } |
742 | if(ctx_flag & CTX_TEST) { | 742 | if(ctx_flag & CTX_TEST) { |
743 | if ((tar_handle->action_header == header_list) || | 743 | if ((tar_handle->action_header == header_list) || |
744 | (tar_handle->action_header == header_verbose_list)) { | 744 | (tar_handle->action_header == header_verbose_list)) { |
745 | tar_handle->action_header = header_verbose_list; | 745 | tar_handle->action_header = header_verbose_list; |
746 | } else { | 746 | } else { |
@@ -756,8 +756,8 @@ int tar_main(int argc, char **argv) | |||
756 | tar_handle->action_data = data_extract_to_stdout; | 756 | tar_handle->action_data = data_extract_to_stdout; |
757 | } | 757 | } |
758 | if(opt & TAR_OPT_VERBOSE) { | 758 | if(opt & TAR_OPT_VERBOSE) { |
759 | if ((tar_handle->action_header == header_list) || | 759 | if ((tar_handle->action_header == header_list) || |
760 | (tar_handle->action_header == header_verbose_list)) | 760 | (tar_handle->action_header == header_verbose_list)) |
761 | { | 761 | { |
762 | tar_handle->action_header = header_verbose_list; | 762 | tar_handle->action_header = header_verbose_list; |
763 | } else { | 763 | } else { |
@@ -860,13 +860,13 @@ int tar_main(int argc, char **argv) | |||
860 | } | 860 | } |
861 | # endif /* CONFIG_FEATURE_TAR_BZIP2 */ | 861 | # endif /* CONFIG_FEATURE_TAR_BZIP2 */ |
862 | 862 | ||
863 | if ((tar_handle->action_header == header_list) || | 863 | if ((tar_handle->action_header == header_list) || |
864 | (tar_handle->action_header == header_verbose_list)) { | 864 | (tar_handle->action_header == header_verbose_list)) { |
865 | verboseFlag = TRUE; | 865 | verboseFlag = TRUE; |
866 | } | 866 | } |
867 | writeTarFile(tar_handle->src_fd, verboseFlag, opt & TAR_OPT_DEREFERNCE, tar_handle->accept, | 867 | writeTarFile(tar_handle->src_fd, verboseFlag, opt & TAR_OPT_DEREFERNCE, tar_handle->accept, |
868 | tar_handle->reject, gzipFlag); | 868 | tar_handle->reject, gzipFlag); |
869 | } else | 869 | } else |
870 | #endif /* CONFIG_FEATURE_TAR_CREATE */ | 870 | #endif /* CONFIG_FEATURE_TAR_CREATE */ |
871 | { | 871 | { |
872 | while (get_header_ptr(tar_handle) == EXIT_SUCCESS); | 872 | while (get_header_ptr(tar_handle) == EXIT_SUCCESS); |