From 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 3 Oct 2006 21:00:06 +0000 Subject: 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. --- archival/tar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'archival/tar.c') 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) archive_handle_t *tar_handle; char *base_dir = NULL; const char *tar_filename = "-"; - unsigned long opt; + unsigned opt; llist_t *excludes = NULL; /* Initialise default values */ @@ -696,12 +696,12 @@ int tar_main(int argc, char **argv) tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL; /* Prepend '-' to the first argument if required */ - bb_opt_complementally = ENABLE_FEATURE_TAR_CREATE ? + opt_complementary = ENABLE_FEATURE_TAR_CREATE ? "--:X::T::\n::c:t:x:?:c--tx:t--cx:x--ct" : "--:X::T::\n::t:x:?:t--x:x--t"; if (ENABLE_FEATURE_TAR_LONG_OPTIONS) - bb_applet_long_options = tar_long_options; - opt = bb_getopt_ulflags(argc, argv, tar_options, + applet_long_options = tar_long_options; + opt = getopt32(argc, argv, tar_options, &base_dir, /* Change to dir */ &tar_filename /* archive filename */ #ifdef CONFIG_FEATURE_TAR_FROM -- cgit v1.2.3