diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:06 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:06 +0000 |
commit | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (patch) | |
tree | edb58560b444979051b42ab7f0c0c718f7459754 /archival/tar.c | |
parent | 40920825d59874cf285390434486e88c8498d2d8 (diff) | |
download | busybox-w32-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.tar.gz busybox-w32-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.tar.bz2 busybox-w32-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.zip |
getopt_ulflags -> getopt32.
It is impossible to formulate sane ABI based on
size of ulong because it can be 32-bit or 64-bit.
Basically it means that you cannot portably use
more that 32 option chars in one call anyway...
Make it explicit.
Diffstat (limited to 'archival/tar.c')
-rw-r--r-- | archival/tar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/tar.c b/archival/tar.c index bfee638b4..3775598cc 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -688,7 +688,7 @@ int tar_main(int argc, char **argv) | |||
688 | archive_handle_t *tar_handle; | 688 | archive_handle_t *tar_handle; |
689 | char *base_dir = NULL; | 689 | char *base_dir = NULL; |
690 | const char *tar_filename = "-"; | 690 | const char *tar_filename = "-"; |
691 | unsigned long opt; | 691 | unsigned opt; |
692 | llist_t *excludes = NULL; | 692 | llist_t *excludes = NULL; |
693 | 693 | ||
694 | /* Initialise default values */ | 694 | /* Initialise default values */ |
@@ -696,12 +696,12 @@ int tar_main(int argc, char **argv) | |||
696 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; | 696 | tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; |
697 | 697 | ||
698 | /* Prepend '-' to the first argument if required */ | 698 | /* Prepend '-' to the first argument if required */ |
699 | bb_opt_complementally = ENABLE_FEATURE_TAR_CREATE ? | 699 | opt_complementary = ENABLE_FEATURE_TAR_CREATE ? |
700 | "--:X::T::\n::c:t:x:?:c--tx:t--cx:x--ct" : | 700 | "--:X::T::\n::c:t:x:?:c--tx:t--cx:x--ct" : |
701 | "--:X::T::\n::t:x:?:t--x:x--t"; | 701 | "--:X::T::\n::t:x:?:t--x:x--t"; |
702 | if (ENABLE_FEATURE_TAR_LONG_OPTIONS) | 702 | if (ENABLE_FEATURE_TAR_LONG_OPTIONS) |
703 | bb_applet_long_options = tar_long_options; | 703 | applet_long_options = tar_long_options; |
704 | opt = bb_getopt_ulflags(argc, argv, tar_options, | 704 | opt = getopt32(argc, argv, tar_options, |
705 | &base_dir, /* Change to dir <optarg> */ | 705 | &base_dir, /* Change to dir <optarg> */ |
706 | &tar_filename /* archive filename */ | 706 | &tar_filename /* archive filename */ |
707 | #ifdef CONFIG_FEATURE_TAR_FROM | 707 | #ifdef CONFIG_FEATURE_TAR_FROM |