d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f42640a362
freebsd-skq/usr.bin/tar/bsdtar.c

729 lines
20 KiB
C
Raw Normal View History

Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
/*-
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
* Copyright (c) 2003-2008 Tim Kientzle
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
Correct the copyright messages: Make this a standard vanilla 2-clause BSD license, update the year to 2007.
2007-01-09 08:12:17 +00:00
* notice, this list of conditions and the following disclaimer.
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "bsdtar_platform.h"
__FBSDID("$FreeBSD$");
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#ifdef HAVE_SYS_PARAM_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <sys/param.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
#ifdef HAVE_SYS_STAT_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <sys/stat.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
#ifdef HAVE_ERRNO_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <errno.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
#ifdef HAVE_FCNTL_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <fcntl.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
Add "make distfile" capabilities to bsdtar, including informational COPYING file and some conditional compilation cleanups.
2004-08-07 03:24:49 +00:00
#ifdef HAVE_LANGINFO_H
Make the day/month ordering dependent on the current locale by testing the locale at program startup and setting a flag, then using that flag to determine appropriate strftime() arguments.
2004-07-15 03:14:46 +00:00
#include <langinfo.h>
#endif
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#ifdef HAVE_LOCALE_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <locale.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
Add "make distfile" capabilities to bsdtar, including informational COPYING file and some conditional compilation cleanups.
2004-08-07 03:24:49 +00:00
#ifdef HAVE_PATHS_H
#include <paths.h>
#endif
Refactor the siginfo/sigusr1 handling. The read/write reporting is sufficiently different that it was simpler to just put separate reporting functions into read.c and write.c rather than try to have a single all-purpose reporting function. Switch to a custom function for converting int64_t to a string; in the portable version, this saves a lot of configuration headaches trying to decipher the platform printf().
2010-02-06 20:27:36 +00:00
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <stdio.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#ifdef HAVE_STDLIB_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <stdlib.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
#ifdef HAVE_STRING_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <string.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
#ifdef HAVE_TIME_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <time.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
#ifdef HAVE_UNISTD_H
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include <unistd.h>
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#endif
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#include "bsdtar.h"
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
#include "err.h"
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/*
* Per POSIX.1-1988, tar defaults to reading/writing archives to/from
* the default tape device for the system. Pick something reasonable here.
*/
A handful of minor portability and style improvements.
2005-03-14 00:30:35 +00:00
#ifdef __linux
Add --totals option. Unlike gtar, this reports the bytes actually written to the archive, not the ones written to the compressor. For uncompressed archives, these numbers are the same, of course.
2004-08-07 19:25:34 +00:00
#define _PATH_DEFTAPE "/dev/st0"
Linux port corrections: * Add a more reasonable default device for linux * Add an autoconf check for the FNM_LEADING_DIR extension (which isn't yet obeyed in the code)
2004-08-07 17:17:11 +00:00
#endif
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
#if defined(_WIN32) && !defined(__CYGWIN__)
Merger r629-631,633-646,648,654,678,681,682 from libarchive.googlecode.com: Many changes for Windows compatibility. bsdtar_test now runs successfully on both POSIX platforms and Windows.
2009-03-08 05:47:21 +00:00
#define _PATH_DEFTAPE "\\\\.\\tape0"
#endif
Linux port corrections: * Add a more reasonable default device for linux * Add an autoconf check for the FNM_LEADING_DIR extension (which isn't yet obeyed in the code)
2004-08-07 17:17:11 +00:00
Add "make distfile" capabilities to bsdtar, including informational COPYING file and some conditional compilation cleanups.
2004-08-07 03:24:49 +00:00
#ifndef _PATH_DEFTAPE
Add --totals option. Unlike gtar, this reports the bytes actually written to the archive, not the ones written to the compressor. For uncompressed archives, these numbers are the same, of course.
2004-08-07 19:25:34 +00:00
#define _PATH_DEFTAPE "/dev/tape"
Add "make distfile" capabilities to bsdtar, including informational COPYING file and some conditional compilation cleanups.
2004-08-07 03:24:49 +00:00
#endif
Various portability workarounds for non-FreeBSD platforms.
2010-02-07 01:26:45 +00:00
#ifdef __MINGW32__
int _CRT_glob = 0; /* Disable broken CRT globbing. */
#endif
Refactor the siginfo/sigusr1 handling. The read/write reporting is sufficiently different that it was simpler to just put separate reporting functions into read.c and write.c rather than try to have a single all-purpose reporting function. Switch to a custom function for converting int64_t to a string; in the portable version, this saves a lot of configuration headaches trying to decipher the platform printf().
2010-02-06 20:27:36 +00:00
#if defined(HAVE_SIGACTION) && (defined(SIGINFO) || defined(SIGUSR1))
static volatile int siginfo_occurred;
static void
siginfo_handler(int sig)
{
(void)sig; /* UNUSED */
siginfo_occurred = 1;
}
int
need_report(void)
{
int r = siginfo_occurred;
siginfo_occurred = 0;
return (r);
}
#else
int
need_report(void)
{
return (0);
}
#endif
/* External function to parse a date/time string */
Merge r687-689,691,693-701,720 from libarchive.googlecode.com: Translate getdate.y into C for portability. Make the get_date() function easier to test as well: * Have it accept a time_t "now" to use as a reference so that test code can verify relative time specifications against known starting points. * Set up default date after parsing the string so that we can use the specified timezone (if any) instead of the local default. Otherwise, local DST makes it almost impossible to reliably test time specifications such as "sunday UTC"
2009-03-08 06:03:15 +00:00
time_t get_date(time_t, const char *);
Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than switches to support selecting files by time of modification. Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets, authors of the public-domain getdate.y date-parsing code.
2005-03-13 18:36:24 +00:00
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
static void long_help(void);
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
static void only_mode(struct bsdtar *, const char *opt,
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
const char *valid);
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
static void set_mode(struct bsdtar *, char opt);
Add a --version option to bsdtar that prints the versions of both bsdtar and libarchive. Of course, this requires that bsdtar have a version number. Let's call this 1.00, shall we? ;-)
2004-07-26 03:21:41 +00:00
static void version(void);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/* A basic set of security flags to request from libarchive. */
#define SECURITY \
(ARCHIVE_EXTRACT_SECURE_SYMLINKS \
| ARCHIVE_EXTRACT_SECURE_NODOTDOT)
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
int
main(int argc, char **argv)
{
struct bsdtar *bsdtar, bsdtar_storage;
Remove unused user_uname variable. Add range-checking to argument of -b. Thanks to: Tim J Robbins
2004-07-17 18:21:00 +00:00
int opt, t;
GNU and POSIX disagree about -o and -l. For -l, upset everyone by breaking it. Specifically, -l now produces a lengthy error message that suggests --check-links (POSIX -l) or --one-file-system (GNU -l) instead. However, if POSIXLY_CORRECT is set, use the POSIX interpretation. For -o, please everyone by making it work both ways: * -xo uses POSIX behavior * -co uses "almost GNU" behavior (as close as we can get until libarchive implements a true V7 tar format)
2004-08-03 06:19:08 +00:00
char option_o;
Improve help handling: * --help produces long help message on systems with getopt_long * -h with no other options also produces long help message (If a mode is specified, -h has its usual meaning.)
2004-06-02 21:01:27 +00:00
char possible_help_request;
Rename C=dir to -C dir, which is what people expect. This requires some non-trivial surgery to the options parsing. While here, let people who only have getopt() access long options through the -W longopt=value convention.
2004-06-26 22:49:51 +00:00
char buff[16];
Merge r687-689,691,693-701,720 from libarchive.googlecode.com: Translate getdate.y into C for portability. Make the get_date() function easier to test as well: * Have it accept a time_t "now" to use as a reference so that test code can verify relative time specifications against known starting points. * Set up default date after parsing the string so that we can use the specified timezone (if any) instead of the local default. Otherwise, local DST makes it almost impossible to reliably test time specifications such as "sunday UTC"
2009-03-08 06:03:15 +00:00
time_t now;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
/*
* Use a pointer for consistency, but stack-allocated storage
* for ease of cleanup.
*/
bsdtar = &bsdtar_storage;
memset(bsdtar, 0, sizeof(*bsdtar));
bsdtar->fd = -1; /* Mark as "unused" */
GNU and POSIX disagree about -o and -l. For -l, upset everyone by breaking it. Specifically, -l now produces a lengthy error message that suggests --check-links (POSIX -l) or --one-file-system (GNU -l) instead. However, if POSIXLY_CORRECT is set, use the POSIX interpretation. For -o, please everyone by making it work both ways: * -xo uses POSIX behavior * -co uses "almost GNU" behavior (as close as we can get until libarchive implements a true V7 tar format)
2004-08-03 06:19:08 +00:00
option_o = 0;
Refactor the siginfo/sigusr1 handling. The read/write reporting is sufficiently different that it was simpler to just put separate reporting functions into read.c and write.c rather than try to have a single all-purpose reporting function. Switch to a custom function for converting int64_t to a string; in the portable version, this saves a lot of configuration headaches trying to decipher the platform printf().
2010-02-06 20:27:36 +00:00
#if defined(HAVE_SIGACTION) && (defined(SIGINFO) || defined(SIGUSR1))
{ /* Catch SIGINFO and SIGUSR1, if they exist. */
struct sigaction sa;
sa.sa_handler = siginfo_handler;
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
#ifdef SIGINFO
if (sigaction(SIGINFO, &sa, NULL))
bsdtar_errc(1, errno, "sigaction(SIGINFO) failed");
#endif
#ifdef SIGUSR1
/* ... and treat SIGUSR1 the same way as SIGINFO. */
if (sigaction(SIGUSR1, &sa, NULL))
bsdtar_errc(1, errno, "sigaction(SIGUSR1) failed");
#endif
}
Merger r629-631,633-646,648,654,678,681,682 from libarchive.googlecode.com: Many changes for Windows compatibility. bsdtar_test now runs successfully on both POSIX platforms and Windows.
2009-03-08 05:47:21 +00:00
#endif
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
/* Need bsdtar_progname before calling bsdtar_warnc. */
The bsdtar_warnc() reporting function requires the program name to be set up before it is called, so move the progname initialization before the first possible call to bsdtar_warnc(). Thanks to: Stanislav Sedov PR: bin/83366 MFC after: 7 days
2005-08-02 03:02:55 +00:00
if (*argv == NULL)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_progname = "bsdtar";
The bsdtar_warnc() reporting function requires the program name to be set up before it is called, so move the progname initialization before the first possible call to bsdtar_warnc(). Thanks to: Stanislav Sedov PR: bin/83366 MFC after: 7 days
2005-08-02 03:02:55 +00:00
else {
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
#if defined(_WIN32) && !defined(__CYGWIN__)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_progname = strrchr(*argv, '\\');
Merger r629-631,633-646,648,654,678,681,682 from libarchive.googlecode.com: Many changes for Windows compatibility. bsdtar_test now runs successfully on both POSIX platforms and Windows.
2009-03-08 05:47:21 +00:00
#else
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_progname = strrchr(*argv, '/');
Merger r629-631,633-646,648,654,678,681,682 from libarchive.googlecode.com: Many changes for Windows compatibility. bsdtar_test now runs successfully on both POSIX platforms and Windows.
2009-03-08 05:47:21 +00:00
#endif
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
if (bsdtar_progname != NULL)
bsdtar_progname++;
The bsdtar_warnc() reporting function requires the program name to be set up before it is called, so move the progname initialization before the first possible call to bsdtar_warnc(). Thanks to: Stanislav Sedov PR: bin/83366 MFC after: 7 days
2005-08-02 03:02:55 +00:00
else
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_progname = *argv;
The bsdtar_warnc() reporting function requires the program name to be set up before it is called, so move the progname initialization before the first possible call to bsdtar_warnc(). Thanks to: Stanislav Sedov PR: bin/83366 MFC after: 7 days
2005-08-02 03:02:55 +00:00
}
Merge r687-689,691,693-701,720 from libarchive.googlecode.com: Translate getdate.y into C for portability. Make the get_date() function easier to test as well: * Have it accept a time_t "now" to use as a reference so that test code can verify relative time specifications against known starting points. * Set up default date after parsing the string so that we can use the specified timezone (if any) instead of the local default. Otherwise, local DST makes it almost impossible to reliably test time specifications such as "sunday UTC"
2009-03-08 06:03:15 +00:00
time(&now);
Remove an unnecessary include and conditionalize some code.
2010-04-11 01:31:50 +00:00
#if HAVE_SETLOCALE
Propagate struct bsdtar down into a lot more places. Move global progname variable into struct bsdtar.
2004-05-17 05:44:53 +00:00
if (setlocale(LC_ALL, "") == NULL)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_warnc(0, "Failed to set default locale");
Remove an unnecessary include and conditionalize some code.
2010-04-11 01:31:50 +00:00
#endif
Add "make distfile" capabilities to bsdtar, including informational COPYING file and some conditional compilation cleanups.
2004-08-07 03:24:49 +00:00
#if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
Make the day/month ordering dependent on the current locale by testing the locale at program startup and setting a flag, then using that flag to determine appropriate strftime() arguments.
2004-07-15 03:14:46 +00:00
bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');
#endif
Improve help handling: * --help produces long help message on systems with getopt_long * -h with no other options also produces long help message (If a mode is specified, -h has its usual meaning.)
2004-06-02 21:01:27 +00:00
possible_help_request = 0;
Propagate struct bsdtar down into a lot more places. Move global progname variable into struct bsdtar.
2004-05-17 05:44:53 +00:00
Remove unused user_uname variable. Add range-checking to argument of -b. Thanks to: Tim J Robbins
2004-07-17 18:21:00 +00:00
/* Look up uid of current user for future reference */
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
bsdtar->user_uid = geteuid();
/* Default: open tape drive. */
bsdtar->filename = getenv("TAPE");
if (bsdtar->filename == NULL)
bsdtar->filename = _PATH_DEFTAPE;
/* Default: preserve mod time on extract */
bsdtar->extract_flags = ARCHIVE_EXTRACT_TIME;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/* Default: Perform basic security checks. */
bsdtar->extract_flags |= SECURITY;
Remove all traces of an experiment for handling "root" on Windows systems.
2010-02-06 19:56:32 +00:00
#ifndef _WIN32
/* On POSIX systems, assume --same-owner and -p when run by
* the root user. This doesn't make any sense on Windows. */
if (bsdtar->user_uid == 0) {
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/* --same-owner */
Default is to restore timestamps, even when operating as root. <sigh>
2004-05-19 01:21:11 +00:00
bsdtar->extract_flags |= ARCHIVE_EXTRACT_OWNER;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/* -p */
bsdtar->extract_flags |= ARCHIVE_EXTRACT_PERM;
bsdtar->extract_flags |= ARCHIVE_EXTRACT_ACL;
bsdtar->extract_flags |= ARCHIVE_EXTRACT_XATTR;
bsdtar->extract_flags |= ARCHIVE_EXTRACT_FFLAGS;
}
Remove all traces of an experiment for handling "root" on Windows systems.
2010-02-06 19:56:32 +00:00
#endif
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
bsdtar->argv = argv;
bsdtar->argc = argc;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/*
* Comments following each option indicate where that option
* originated: SUSv2, POSIX, GNU tar, star, etc. If there's
* no such comment, then I don't know of anyone else who
* implements that option.
*/
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
while ((opt = bsdtar_getopt(bsdtar)) != -1) {
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
switch (opt) {
Accept (but ignore) GNU tar's -B option. bsdtar never needs it, but it does no harm for people to specify it.
2004-05-18 17:16:55 +00:00
case 'B': /* GNU tar */
Augment the -T handling: * Add --null option (sort #defines here) * Add process_lines function to util.c that reads newline-terminated or null-terminated lines (with self-sizing buffers, etc) and iteratively invokes a provided function. Use this to dramatically simplify: -T handling for -c, --exclude-from-file, and --include-from-file. * Add -T handling to -x (via include_from_file) Hopefully, this will fix the openoffice port and a couple of others that rely on -T and --null.
2004-06-27 06:29:03 +00:00
/* libarchive doesn't need this; just ignore it. */
Accept (but ignore) GNU tar's -B option. bsdtar never needs it, but it does no harm for people to specify it.
2004-05-18 17:16:55 +00:00
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'b': /* SUSv2 */
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
t = atoi(bsdtar->optarg);
Allow -b up to 8192. I've had reports from people who routinely use -b 2048 (1MiB block size). Setting the limit to 8192 should allow some room for growth while still helping people who mistakenly put in byte counts here instead of block counts.
2010-02-06 19:48:59 +00:00
if (t <= 0 || t > 8192)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Allow -b up to 8192. I've had reports from people who routinely use -b 2048 (1MiB block size). Setting the limit to 8192 should allow some room for growth while still helping people who mistakenly put in byte counts here instead of block counts.
2010-02-06 19:48:59 +00:00
"Argument to -b is out of range (1..8192)");
Remove unused user_uname variable. Add range-checking to argument of -b. Thanks to: Tim J Robbins
2004-07-17 18:21:00 +00:00
bsdtar->bytes_per_block = 512 * t;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
case 'C': /* GNU tar */
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
set_chdir(bsdtar, bsdtar->optarg);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
case 'c': /* SUSv2 */
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
set_mode(bsdtar, opt);
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
break;
GNU and POSIX disagree about -o and -l. For -l, upset everyone by breaking it. Specifically, -l now produces a lengthy error message that suggests --check-links (POSIX -l) or --one-file-system (GNU -l) instead. However, if POSIXLY_CORRECT is set, use the POSIX interpretation. For -o, please everyone by making it work both ways: * -xo uses POSIX behavior * -co uses "almost GNU" behavior (as close as we can get until libarchive implements a true V7 tar format)
2004-08-03 06:19:08 +00:00
case OPTION_CHECK_LINKS: /* GNU tar */
bsdtar->option_warn_links = 1;
break;
--chroot implementation thanks to Joerg Sonnenberger.
2008-03-15 03:06:46 +00:00
case OPTION_CHROOT: /* NetBSD */
bsdtar->option_chroot = 1;
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case OPTION_EXCLUDE: /* GNU tar */
Merge a bunch of refactoring from Joerg Sonnenberger to isolate common code used by tar and cpio (and useful to other libarchive clients). The functions here are prefixed with "lafe" (libarchive front-end) to indicate their use.
2010-02-07 02:00:26 +00:00
if (lafe_exclude(&bsdtar->matching, bsdtar->optarg))
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
"Couldn't exclude %s\n", bsdtar->optarg);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
case OPTION_FORMAT: /* GNU tar, others */
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->create_format = bsdtar->optarg;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
case OPTION_OPTIONS:
bsdtar->option_options = bsdtar->optarg;
Merge r492 from libarchive.googlecode.com: First cut at exposing the new options mechanism to userland. Documentation pending...
2009-03-08 06:19:28 +00:00
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'f': /* SUSv2 */
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->filename = bsdtar->optarg;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
if (strcmp(bsdtar->filename, "-") == 0)
bsdtar->filename = NULL;
break;
case 'H': /* BSD convention */
bsdtar->symlink_mode = 'H';
break;
Correction: -h should be a synonym for -L, not -H. (as specified by Linux Standards Base, GNU tar, and 4.4BSD documentation)
2004-05-31 20:22:41 +00:00
case 'h': /* Linux Standards Base, gtar; synonym for -L */
bsdtar->symlink_mode = 'L';
Improve help handling: * --help produces long help message on systems with getopt_long * -h with no other options also produces long help message (If a mode is specified, -h has its usual meaning.)
2004-06-02 21:01:27 +00:00
/* Hack: -h by itself is the "help" command. */
possible_help_request = 1;
Manpage changes suggested by Irina Liakh. Also, add -h as a synonym for -H, for Linux Standards Base compliance.
2004-04-13 19:45:55 +00:00
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
case OPTION_HELP: /* GNU tar, others */
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
long_help();
Clean up usage message(s): * Usage goes to stderr, not stdout * Use correct argument markup * bsdtar --help no longer exits with an error return code * ensure that the word "bsdtar" appears in the first line output from "bsdtar --help" (even if the program is invoked as "tar") In particular, scripts can now test for the presence of bsdtar. For example, in /bin/sh: if (tar --help 2>&1 | grep bsdtar >/dev/null 2>&1) then \ echo bsdtar; else echo not bsdtar; fi
2004-06-15 00:07:23 +00:00
exit(0);
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
break;
Make -I and --files-from be synonyms for -T
2004-08-13 07:23:02 +00:00
case 'I': /* GNU tar */
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/*
* TODO: Allow 'names' to come from an archive,
* not just a text file. Design a good UI for
* allowing names and mode/owner to be read
* from an archive, with contents coming from
* disk. This can be used to "refresh" an
* archive or to design archives with special
* permissions without having to create those
* permissions on disk.
*/
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->names_from_file = bsdtar->optarg;
Make -I and --files-from be synonyms for -T
2004-08-13 07:23:02 +00:00
break;
The --include='pattern' option is the natural counterpart to --exclude='pattern'. I should have added this a long time ago, since it's so useful for testing. In particular, it allows me to select a few entries from a troublesome archive so that I can easily focus my debugging efforts: bsdtar -czf new.tgz --include='*foo*' @old.tgz
2004-06-07 03:49:48 +00:00
case OPTION_INCLUDE:
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/*
* Noone else has the @archive extension, so
* noone else needs this to filter entries
* when transforming archives.
*/
Merge a bunch of refactoring from Joerg Sonnenberger to isolate common code used by tar and cpio (and useful to other libarchive clients). The functions here are prefixed with "lafe" (libarchive front-end) to indicate their use.
2010-02-07 02:00:26 +00:00
if (lafe_include(&bsdtar->matching, bsdtar->optarg))
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
A bunch of style and security fixes (error checking return values, etc), mostly from: Tim J Robbins
2004-07-25 04:15:50 +00:00
"Failed to add %s to inclusion list",
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->optarg);
The --include='pattern' option is the natural counterpart to --exclude='pattern'. I should have added this a long time ago, since it's so useful for testing. In particular, it allows me to select a few entries from a troublesome archive so that I can easily focus my debugging efforts: bsdtar -czf new.tgz --include='*foo*' @old.tgz
2004-06-07 03:49:48 +00:00
break;
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
case 'j': /* GNU tar */
if (bsdtar->create_compression != '\0')
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
"Can't specify both -%c and -%c", opt,
bsdtar->create_compression);
bsdtar->create_compression = opt;
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
break;
case 'J': /* GNU tar 1.21 and later */
if (bsdtar->create_compression != '\0')
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
"Can't specify both -%c and -%c", opt,
bsdtar->create_compression);
bsdtar->create_compression = opt;
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'k': /* GNU tar */
bsdtar->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE;
break;
Add --keep-newer-files option (as in GNU tar: When in -x mode, ignore files if the existing file is newer than the archive entry). Currently if any files are ignored, bsdtar will exit with a non-zero exit status; this is likely to change in the future, but requires some API changes in libarchive. Discussed with: kientzle Obtained from: tarsnap
2008-05-17 15:55:29 +00:00
case OPTION_KEEP_NEWER_FILES: /* GNU tar */
bsdtar->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'L': /* BSD convention */
bsdtar->symlink_mode = 'L';
break;
Make -l always have the SUSv2 meaning of "check links." GNU tar changed -l to match SUSv2 a couple of years ago, so bsdtar no longer needs to pander to this particular GNUism. Thanks to: Debian maintainers MFC after: 7 days
2008-01-22 07:23:44 +00:00
case 'l': /* SUSv2 and GNU tar beginning with 1.16 */
/* GNU tar 1.13 used -l for --one-file-system */
bsdtar->option_warn_links = 1;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
case OPTION_LZMA:
if (bsdtar->create_compression != '\0')
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
"Can't specify both -%c and -%c", opt,
bsdtar->create_compression);
bsdtar->create_compression = opt;
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'm': /* SUSv2 */
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_TIME;
break;
case 'n': /* GNU tar */
bsdtar->option_no_subdirs = 1;
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/*
* Selecting files by time:
* --newer-?time='date' Only files newer than 'date'
* --newer-?time-than='file' Only files newer than time
* on specified file (useful for incremental backups)
* TODO: Add corresponding "older" options to reverse these.
*/
Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than switches to support selecting files by time of modification. Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets, authors of the public-domain getdate.y date-parsing code.
2005-03-13 18:36:24 +00:00
case OPTION_NEWER_CTIME: /* GNU tar */
Merge r687-689,691,693-701,720 from libarchive.googlecode.com: Translate getdate.y into C for portability. Make the get_date() function easier to test as well: * Have it accept a time_t "now" to use as a reference so that test code can verify relative time specifications against known starting points. * Set up default date after parsing the string so that we can use the specified timezone (if any) instead of the local default. Otherwise, local DST makes it almost impossible to reliably test time specifications such as "sunday UTC"
2009-03-08 06:03:15 +00:00
bsdtar->newer_ctime_sec = get_date(now, bsdtar->optarg);
Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than switches to support selecting files by time of modification. Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets, authors of the public-domain getdate.y date-parsing code.
2005-03-13 18:36:24 +00:00
break;
case OPTION_NEWER_CTIME_THAN:
{
struct stat st;
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
if (stat(bsdtar->optarg, &st) != 0)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
"Can't open file %s", bsdtar->optarg);
Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than switches to support selecting files by time of modification. Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets, authors of the public-domain getdate.y date-parsing code.
2005-03-13 18:36:24 +00:00
bsdtar->newer_ctime_sec = st.st_ctime;
bsdtar->newer_ctime_nsec =
ARCHIVE_STAT_CTIME_NANOS(&st);
}
break;
case OPTION_NEWER_MTIME: /* GNU tar */
Merge r687-689,691,693-701,720 from libarchive.googlecode.com: Translate getdate.y into C for portability. Make the get_date() function easier to test as well: * Have it accept a time_t "now" to use as a reference so that test code can verify relative time specifications against known starting points. * Set up default date after parsing the string so that we can use the specified timezone (if any) instead of the local default. Otherwise, local DST makes it almost impossible to reliably test time specifications such as "sunday UTC"
2009-03-08 06:03:15 +00:00
bsdtar->newer_mtime_sec = get_date(now, bsdtar->optarg);
Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than switches to support selecting files by time of modification. Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets, authors of the public-domain getdate.y date-parsing code.
2005-03-13 18:36:24 +00:00
break;
case OPTION_NEWER_MTIME_THAN:
{
struct stat st;
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
if (stat(bsdtar->optarg, &st) != 0)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
"Can't open file %s", bsdtar->optarg);
Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than switches to support selecting files by time of modification. Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets, authors of the public-domain getdate.y date-parsing code.
2005-03-13 18:36:24 +00:00
bsdtar->newer_mtime_sec = st.st_mtime;
bsdtar->newer_mtime_nsec =
ARCHIVE_STAT_MTIME_NANOS(&st);
}
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case OPTION_NODUMP: /* star */
bsdtar->option_honor_nodump = 1;
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
case OPTION_NO_SAME_OWNER: /* GNU tar */
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_OWNER;
break;
As near as I can tell, --no-same-permissions is a no-op in gtar, so that makes it easy to implement. Required by: audio/timidity port Thanks to: Kris Kennaway
2004-06-15 06:44:41 +00:00
case OPTION_NO_SAME_PERMISSIONS: /* GNU tar */
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_PERM;
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_ACL;
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_XATTR;
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_FFLAGS;
As near as I can tell, --no-same-permissions is a no-op in gtar, so that makes it easy to implement. Required by: audio/timidity port Thanks to: Kris Kennaway
2004-06-15 06:44:41 +00:00
break;
Augment the -T handling: * Add --null option (sort #defines here) * Add process_lines function to util.c that reads newline-terminated or null-terminated lines (with self-sizing buffers, etc) and iteratively invokes a provided function. Use this to dramatically simplify: -T handling for -c, --exclude-from-file, and --include-from-file. * Add -T handling to -x (via include_from_file) Hopefully, this will fix the openoffice port and a couple of others that rely on -T and --null.
2004-06-27 06:29:03 +00:00
case OPTION_NULL: /* GNU tar */
bsdtar->option_null++;
break;
MFp4: bsdtar 2.5.4b In addition to a number of bug fixes and minor changes: * --numeric-owner (ignore user/group names on create and extract) * -S (sparsify files on extraction) * -s (regex filename substitutions) * Use new libarchive 'linkify' to get correct hardlink handling for both old and new cpio formats * Rework 'copy' test to be insensitive to readdir() filename ordering Most of the credit for this work goes to Joerg Sonnenberger, who has been duplicating features from NetBSD's 'pax' program.
2008-05-26 17:10:10 +00:00
case OPTION_NUMERIC_OWNER: /* GNU tar */
bsdtar->option_numeric_owner++;
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'O': /* GNU tar */
bsdtar->option_stdout = 1;
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
case 'o': /* SUSv2 and GNU conflict here, but not fatally */
GNU and POSIX disagree about -o and -l. For -l, upset everyone by breaking it. Specifically, -l now produces a lengthy error message that suggests --check-links (POSIX -l) or --one-file-system (GNU -l) instead. However, if POSIXLY_CORRECT is set, use the POSIX interpretation. For -o, please everyone by making it work both ways: * -xo uses POSIX behavior * -co uses "almost GNU" behavior (as close as we can get until libarchive implements a true V7 tar format)
2004-08-03 06:19:08 +00:00
option_o = 1; /* Record it and resolve it later. */
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
case OPTION_ONE_FILE_SYSTEM: /* GNU tar */
Rename -X to --one-file-system, as GNU tar uses -X for something else. I would really like a short option for this, but all of the obvious ones conflict with something else.
2004-06-15 00:28:34 +00:00
bsdtar->option_dont_traverse_mounts = 1;
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
#if 0
/*
* The common BSD -P option is not necessary, since
* our default is to archive symlinks, not follow
* them. This is convenient, as -P conflicts with GNU
* tar anyway.
*/
case 'P': /* BSD convention */
/* Default behavior, no option necessary. */
break;
#endif
case 'P': /* GNU tar */
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
bsdtar->extract_flags &= ~SECURITY;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
bsdtar->option_absolute_paths = 1;
break;
case 'p': /* GNU tar, star */
bsdtar->extract_flags |= ARCHIVE_EXTRACT_PERM;
Update -p: * Don't change the umask; the library now ignores the umask if you set EXTRACT_PERM * Set the EXTRACT_ACL and EXTRACT_FFLAGS bits (used to be controlled by EXTRACT_PERM).
2004-06-27 23:29:44 +00:00
bsdtar->extract_flags |= ARCHIVE_EXTRACT_ACL;
Extended attribute support on write for Linux; FreeBSD hooks are forthcoming. This commit also has a number of style(9) fixes and minor corrections so the code works better with the build system being used for non-FreeBSD builds. Many thanks to: Jaakko Heinonen, who proposed a mechanism for extended attribute support and implemented both the machine-independent portion and the Linux-specific portion.
2006-03-21 17:03:51 +00:00
bsdtar->extract_flags |= ARCHIVE_EXTRACT_XATTR;
Update -p: * Don't change the umask; the library now ignores the umask if you set EXTRACT_PERM * Set the EXTRACT_ACL and EXTRACT_FFLAGS bits (used to be controlled by EXTRACT_PERM).
2004-06-27 23:29:44 +00:00
bsdtar->extract_flags |= ARCHIVE_EXTRACT_FFLAGS;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
Add --posix as a synonym for --format=pax, for GNU tar compatibility. Approved by: re (bmah)
2007-09-09 00:07:18 +00:00
case OPTION_POSIX: /* GNU tar */
bsdtar->create_format = "pax";
break;
Support -q (from NetBSD) as a synonym for --fast-read (the old FreeBSD extension to GNU tar). Thanks to: Joerg Sonnenberger
2008-03-15 03:18:24 +00:00
case 'q': /* FreeBSD GNU tar --fast-read, NetBSD -q */
bsdtar->option_fast_read = 1;
break;
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
case 'r': /* SUSv2 */
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
set_mode(bsdtar, opt);
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
break;
MFp4: bsdtar 2.5.4b In addition to a number of bug fixes and minor changes: * --numeric-owner (ignore user/group names on create and extract) * -S (sparsify files on extraction) * -s (regex filename substitutions) * Use new libarchive 'linkify' to get correct hardlink handling for both old and new cpio formats * Rework 'copy' test to be insensitive to readdir() filename ordering Most of the credit for this work goes to Joerg Sonnenberger, who has been duplicating features from NetBSD's 'pax' program.
2008-05-26 17:10:10 +00:00
case 'S': /* NetBSD pax-as-tar */
bsdtar->extract_flags |= ARCHIVE_EXTRACT_SPARSE;
break;
case 's': /* NetBSD pax-as-tar */
#if HAVE_REGEX_H
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
add_substitution(bsdtar, bsdtar->optarg);
MFp4: bsdtar 2.5.4b In addition to a number of bug fixes and minor changes: * --numeric-owner (ignore user/group names on create and extract) * -S (sparsify files on extraction) * -s (regex filename substitutions) * Use new libarchive 'linkify' to get correct hardlink handling for both old and new cpio formats * Rework 'copy' test to be insensitive to readdir() filename ordering Most of the credit for this work goes to Joerg Sonnenberger, who has been duplicating features from NetBSD's 'pax' program.
2008-05-26 17:10:10 +00:00
#else
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_warnc(0,
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
"-s is not supported by this version of bsdtar");
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
usage();
MFp4: bsdtar 2.5.4b In addition to a number of bug fixes and minor changes: * --numeric-owner (ignore user/group names on create and extract) * -S (sparsify files on extraction) * -s (regex filename substitutions) * Use new libarchive 'linkify' to get correct hardlink handling for both old and new cpio formats * Rework 'copy' test to be insensitive to readdir() filename ordering Most of the credit for this work goes to Joerg Sonnenberger, who has been duplicating features from NetBSD's 'pax' program.
2008-05-26 17:10:10 +00:00
#endif
break;
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
case OPTION_SAME_OWNER: /* GNU tar */
bsdtar->extract_flags |= ARCHIVE_EXTRACT_OWNER;
break;
Add --newer-ctime, --newer-mtime, --newer-ctime-than, and --newer-mtime-than switches to support selecting files by time of modification. Special thanks to: Steven M. Bellovin, Rich $alz, and Jim Berets, authors of the public-domain getdate.y date-parsing code.
2005-03-13 18:36:24 +00:00
case OPTION_STRIP_COMPONENTS: /* GNU tar 1.15 */
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->strip_components = atoi(bsdtar->optarg);
Add --strip-components option, per bin/77666. Thanks to: Sangwoo Shim
2005-03-13 04:12:30 +00:00
break;
Augment the -T handling: * Add --null option (sort #defines here) * Add process_lines function to util.c that reads newline-terminated or null-terminated lines (with self-sizing buffers, etc) and iteratively invokes a provided function. Use this to dramatically simplify: -T handling for -c, --exclude-from-file, and --include-from-file. * Add -T handling to -x (via include_from_file) Hopefully, this will fix the openoffice port and a couple of others that rely on -T and --null.
2004-06-27 06:29:03 +00:00
case 'T': /* GNU tar */
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->names_from_file = bsdtar->optarg;
Augment the -T handling: * Add --null option (sort #defines here) * Add process_lines function to util.c that reads newline-terminated or null-terminated lines (with self-sizing buffers, etc) and iteratively invokes a provided function. Use this to dramatically simplify: -T handling for -c, --exclude-from-file, and --include-from-file. * Add -T handling to -x (via include_from_file) Hopefully, this will fix the openoffice port and a couple of others that rely on -T and --null.
2004-06-27 06:29:03 +00:00
break;
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
case 't': /* SUSv2 */
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
set_mode(bsdtar, opt);
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
bsdtar->verbose++;
break;
Add --totals option. Unlike gtar, this reports the bytes actually written to the archive, not the ones written to the compressor. For uncompressed archives, these numbers are the same, of course.
2004-08-07 19:25:34 +00:00
case OPTION_TOTALS: /* GNU tar */
bsdtar->option_totals++;
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'U': /* GNU tar */
bsdtar->extract_flags |= ARCHIVE_EXTRACT_UNLINK;
Make symlink protection a bit more useful: * Remove terminal symlinks so they can be replaced. * If -U, remove intermediate symlinks as well * Otherwise, refuse the extraction
2004-05-17 03:33:06 +00:00
bsdtar->option_unlink_first = 1;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
case 'u': /* SUSv2 */
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
set_mode(bsdtar, opt);
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'v': /* SUSv2 */
bsdtar->verbose++;
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
case OPTION_VERSION: /* GNU convention */
Add a --version option to bsdtar that prints the versions of both bsdtar and libarchive. Of course, this requires that bsdtar have a version number. Let's call this 1.00, shall we? ;-)
2004-07-26 03:21:41 +00:00
version();
break;
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
#if 0
/*
* The -W longopt feature is handled inside of
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
* bsdtar_getopt(), so -W is not available here.
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
*/
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
case 'W': /* Obscure GNU convention. */
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
break;
#endif
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'w': /* SUSv2 */
bsdtar->option_interactive = 1;
break;
Add gtar-compatible -X/--exclude-from
2004-06-15 05:55:41 +00:00
case 'X': /* GNU tar */
Merge a bunch of refactoring from Joerg Sonnenberger to isolate common code used by tar and cpio (and useful to other libarchive clients). The functions here are prefixed with "lafe" (libarchive front-end) to indicate their use.
2010-02-07 02:00:26 +00:00
if (lafe_exclude_from_file(&bsdtar->matching, bsdtar->optarg))
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
A bunch of style and security fixes (error checking return values, etc), mostly from: Tim J Robbins
2004-07-25 04:15:50 +00:00
"failed to process exclusions from file %s",
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->optarg);
Add gtar-compatible -X/--exclude-from
2004-06-15 05:55:41 +00:00
break;
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
case 'x': /* SUSv2 */
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
set_mode(bsdtar, opt);
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'y': /* FreeBSD version of GNU tar */
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->create_compression != '\0')
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
"Can't specify both -%c and -%c", opt,
bsdtar->create_compression);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
bsdtar->create_compression = opt;
break;
case 'Z': /* GNU tar */
Permit (but ignore) -Z with -x or -t, now that libarchive recognizes and decompresses .Z format.
2004-05-30 00:09:43 +00:00
if (bsdtar->create_compression != '\0')
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Permit (but ignore) -Z with -x or -t, now that libarchive recognizes and decompresses .Z format.
2004-05-30 00:09:43 +00:00
"Can't specify both -%c and -%c", opt,
bsdtar->create_compression);
bsdtar->create_compression = opt;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
break;
Augment the -T handling: * Add --null option (sort #defines here) * Add process_lines function to util.c that reads newline-terminated or null-terminated lines (with self-sizing buffers, etc) and iteratively invokes a provided function. Use this to dramatically simplify: -T handling for -c, --exclude-from-file, and --include-from-file. * Add -T handling to -x (via include_from_file) Hopefully, this will fix the openoffice port and a couple of others that rely on -T and --null.
2004-06-27 06:29:03 +00:00
case 'z': /* GNU tar, star, many others */
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->create_compression != '\0')
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
"Can't specify both -%c and -%c", opt,
bsdtar->create_compression);
bsdtar->create_compression = opt;
break;
bsdtar 2.2.3: * Implement --use-compress-program using new libarchive feature. * Minor portability improvement by adjusting casts used to print out uids, gids, and device numbers. Thanks to: Joerg Sonnenberger for the --use-compress-program implementation. MFC after: 15 days
2007-05-29 05:39:10 +00:00
case OPTION_USE_COMPRESS_PROGRAM:
New command-line parser for bsdtar. This replaces the getopt()/getopt_long() wrapper, the old-style argument rewriter and the associated configuration glue with a more straightforward custom command parser. In particular, this ensures that bsdtar will have consistent option parsing on every platform, regardless of whether the platform supports getopt_long(). MFC after: 30 days
2008-11-08 04:43:24 +00:00
bsdtar->compress_program = bsdtar->optarg;
bsdtar 2.2.3: * Implement --use-compress-program using new libarchive feature. * Minor portability improvement by adjusting casts used to print out uids, gids, and device numbers. Thanks to: Joerg Sonnenberger for the --use-compress-program implementation. MFC after: 15 days
2007-05-29 05:39:10 +00:00
break;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
default:
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
usage();
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
}
}
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
/*
* Sanity-check options.
*/
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/* If no "real" mode was specified, treat -h as --help. */
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
if ((bsdtar->mode == '\0') && possible_help_request) {
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
long_help();
Clean up usage message(s): * Usage goes to stderr, not stdout * Use correct argument markup * bsdtar --help no longer exits with an error return code * ensure that the word "bsdtar" appears in the first line output from "bsdtar --help" (even if the program is invoked as "tar") In particular, scripts can now test for the presence of bsdtar. For example, in /bin/sh: if (tar --help 2>&1 | grep bsdtar >/dev/null 2>&1) then \ echo bsdtar; else echo not bsdtar; fi
2004-06-15 00:07:23 +00:00
exit(0);
Improve help handling: * --help produces long help message on systems with getopt_long * -h with no other options also produces long help message (If a mode is specified, -h has its usual meaning.)
2004-06-02 21:01:27 +00:00
}
bsdtar 2.0.23: * New test scripts exercise some basic functionality * Most header inclusions are now protected (portability) * read.c now relies on security checks in libarchive instead of trying to do its own (optimization) * -p now enabled by default for root, add --no-same-permissions to disable it * Comments, minor style fixes.
2007-03-11 10:36:42 +00:00
/* Otherwise, a mode is required. */
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
if (bsdtar->mode == '\0')
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Propagate struct bsdtar down into a lot more places. Move global progname variable into struct bsdtar.
2004-05-17 05:44:53 +00:00
"Must specify one of -c, -r, -t, -u, -x");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
/* Check boolean options only permitted in certain modes. */
if (bsdtar->option_dont_traverse_mounts)
Correct the names of some options. MFC after: 3 days
2006-12-23 07:01:59 +00:00
only_mode(bsdtar, "--one-file-system", "cru");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->option_fast_read)
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(bsdtar, "--fast-read", "xt");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->option_honor_nodump)
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(bsdtar, "--nodump", "cru");
GNU and POSIX disagree about -o and -l. For -l, upset everyone by breaking it. Specifically, -l now produces a lengthy error message that suggests --check-links (POSIX -l) or --one-file-system (GNU -l) instead. However, if POSIXLY_CORRECT is set, use the POSIX interpretation. For -o, please everyone by making it work both ways: * -xo uses POSIX behavior * -co uses "almost GNU" behavior (as close as we can get until libarchive implements a true V7 tar format)
2004-08-03 06:19:08 +00:00
if (option_o > 0) {
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
switch (bsdtar->mode) {
GNU and POSIX disagree about -o and -l. For -l, upset everyone by breaking it. Specifically, -l now produces a lengthy error message that suggests --check-links (POSIX -l) or --one-file-system (GNU -l) instead. However, if POSIXLY_CORRECT is set, use the POSIX interpretation. For -o, please everyone by making it work both ways: * -xo uses POSIX behavior * -co uses "almost GNU" behavior (as close as we can get until libarchive implements a true V7 tar format)
2004-08-03 06:19:08 +00:00
case 'c':
/*
* In GNU tar, -o means "old format." The
* "ustar" format is the closest thing
* supported by libarchive.
*/
bsdtar->create_format = "ustar";
/* TODO: bsdtar->create_format = "v7"; */
break;
case 'x':
/* POSIX-compatible behavior. */
bsdtar->option_no_owner = 1;
bsdtar->extract_flags &= ~ARCHIVE_EXTRACT_OWNER;
break;
default:
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(bsdtar, "-o", "xc");
GNU and POSIX disagree about -o and -l. For -l, upset everyone by breaking it. Specifically, -l now produces a lengthy error message that suggests --check-links (POSIX -l) or --one-file-system (GNU -l) instead. However, if POSIXLY_CORRECT is set, use the POSIX interpretation. For -o, please everyone by making it work both ways: * -xo uses POSIX behavior * -co uses "almost GNU" behavior (as close as we can get until libarchive implements a true V7 tar format)
2004-08-03 06:19:08 +00:00
break;
}
Validate -o usage. Strictly speaking, -o only makes sense with -x, of course, but I make an effort to accomodate GNU tar scripts that use -o with -c (with a meaning that totally contradicts SUSv2) by only issuing a benign warning message in that case.
2004-07-17 04:17:50 +00:00
}
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->option_no_subdirs)
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(bsdtar, "-n", "cru");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->option_stdout)
Support -t -O as in gtar. Perversely enough, -O means "send to stderr" when used with -t, "send to stdout" when used with -x. Thanks to: Ryan Hamilton for pointing out this odd beast MFC after: 3 days
2004-08-27 04:13:15 +00:00
only_mode(bsdtar, "-O", "xt");
Add two checks for inappropriate options: -U only makes sense in "x" mode, and --strip-components only makes sense in "x" and "t" modes. MFC after: 3 days
2006-12-23 07:06:37 +00:00
if (bsdtar->option_unlink_first)
Fic typo in previous commit. MFC after: 3 days
2006-12-23 08:16:54 +00:00
only_mode(bsdtar, "-U", "x");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->option_warn_links)
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(bsdtar, "--check-links", "cr");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
style(9) fix to add whitespace around an '=' sign and restore a comment that got accidentally dropped.
2008-03-15 05:08:21 +00:00
/* Check other parameters only permitted in certain modes. */
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->create_compression != '\0') {
strcpy(buff, "-?");
buff[1] = bsdtar->create_compression;
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(bsdtar, buff, "cxt");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
}
if (bsdtar->create_format != NULL)
Documentation updates: * --format can be used with -r or -u * -o is a synonym for --format=ustar when used with -c, -r, or -u Also, fix the erroneous sanity check that suppressed --format with -r or -u.
2008-05-02 05:40:05 +00:00
only_mode(bsdtar, "--format", "cru");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
if (bsdtar->symlink_mode != '\0') {
Augment the -T handling: * Add --null option (sort #defines here) * Add process_lines function to util.c that reads newline-terminated or null-terminated lines (with self-sizing buffers, etc) and iteratively invokes a provided function. Use this to dramatically simplify: -T handling for -c, --exclude-from-file, and --include-from-file. * Add -T handling to -x (via include_from_file) Hopefully, this will fix the openoffice port and a couple of others that rely on -T and --null.
2004-06-27 06:29:03 +00:00
strcpy(buff, "-?");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
buff[1] = bsdtar->symlink_mode;
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(bsdtar, buff, "cru");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
}
Add two checks for inappropriate options: -U only makes sense in "x" mode, and --strip-components only makes sense in "x" and "t" modes. MFC after: 3 days
2006-12-23 07:06:37 +00:00
if (bsdtar->strip_components != 0)
only_mode(bsdtar, "--strip-components", "xt");
Allow arguments to appear in any order. While I'm here, add a couple of extra sanity-checks to the argument parsing (reject -j -z, for instance) and update the docs a bit. Requested by: most everyone ;-)
2004-04-08 19:37:01 +00:00
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
switch(bsdtar->mode) {
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
case 'c':
tar_mode_c(bsdtar);
break;
case 'r':
tar_mode_r(bsdtar);
break;
case 't':
tar_mode_t(bsdtar);
break;
case 'u':
tar_mode_u(bsdtar);
break;
case 'x':
tar_mode_x(bsdtar);
break;
}
Merge a bunch of refactoring from Joerg Sonnenberger to isolate common code used by tar and cpio (and useful to other libarchive clients). The functions here are prefixed with "lafe" (libarchive front-end) to indicate their use.
2010-02-07 02:00:26 +00:00
lafe_cleanup_exclusions(&bsdtar->matching);
MFp4: bsdtar 2.5.4b In addition to a number of bug fixes and minor changes: * --numeric-owner (ignore user/group names on create and extract) * -S (sparsify files on extraction) * -s (regex filename substitutions) * Use new libarchive 'linkify' to get correct hardlink handling for both old and new cpio formats * Rework 'copy' test to be insensitive to readdir() filename ordering Most of the credit for this work goes to Joerg Sonnenberger, who has been duplicating features from NetBSD's 'pax' program.
2008-05-26 17:10:10 +00:00
#if HAVE_REGEX_H
cleanup_substitution(bsdtar);
#endif
Issue a warning if there's a non-zero exit value.
2007-03-24 03:25:49 +00:00
if (bsdtar->return_value != 0)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_warnc(0,
Issue a warning if there's a non-zero exit value.
2007-03-24 03:25:49 +00:00
"Error exit delayed from previous errors.");
Provide framework for exiting with non-zero value on non-critical errors.
2004-05-27 04:30:59 +00:00
return (bsdtar->return_value);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
}
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
static void
set_mode(struct bsdtar *bsdtar, char opt)
{
if (bsdtar->mode != '\0' && bsdtar->mode != opt)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
"Can't specify both -%c and -%c", opt, bsdtar->mode);
bsdtar->mode = opt;
}
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
/*
* Verify that the mode is correct.
*/
static void
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
only_mode(struct bsdtar *bsdtar, const char *opt, const char *valid_modes)
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
{
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
if (strchr(valid_modes, bsdtar->mode) == NULL)
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
bsdtar_errc(1, 0,
Propagate struct bsdtar down into a lot more places. Move global progname variable into struct bsdtar.
2004-05-17 05:44:53 +00:00
"Option %s is not permitted in mode -%c",
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
opt, bsdtar->mode);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
}
void
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
usage(void)
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
{
const char *p;
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
p = bsdtar_progname;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
Clean up usage message(s): * Usage goes to stderr, not stdout * Use correct argument markup * bsdtar --help no longer exits with an error return code * ensure that the word "bsdtar" appears in the first line output from "bsdtar --help" (even if the program is invoked as "tar") In particular, scripts can now test for the presence of bsdtar. For example, in /bin/sh: if (tar --help 2>&1 | grep bsdtar >/dev/null 2>&1) then \ echo bsdtar; else echo not bsdtar; fi
2004-06-15 00:07:23 +00:00
fprintf(stderr, "Usage:\n");
fprintf(stderr, " List: %s -tf <archive-filename>\n", p);
fprintf(stderr, " Extract: %s -xf <archive-filename>\n", p);
fprintf(stderr, " Create: %s -cf <archive-filename> [filenames...]\n", p);
fprintf(stderr, " Help: %s --help\n", p);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
exit(1);
}
Add a --version option to bsdtar that prints the versions of both bsdtar and libarchive. Of course, this requires that bsdtar have a version number. Let's call this 1.00, shall we? ;-)
2004-07-26 03:21:41 +00:00
static void
version(void)
{
A couple of miscellaneous fixes: * prototypes for optarg/optind on platforms that don't already have them * Disambiguate version number macros * Remove unnecessary PACKAGE_NAME macro * Hook for forthcoming bsdtar test suite * Sync version number up with the portable distribution
2008-01-02 00:27:14 +00:00
printf("bsdtar %s - %s\n",
BSDTAR_VERSION_STRING,
archive_version());
bsdtar --version should succeed.
2008-05-02 05:18:47 +00:00
exit(0);
Add a --version option to bsdtar that prints the versions of both bsdtar and libarchive. Of course, this requires that bsdtar have a version number. Let's call this 1.00, shall we? ;-)
2004-07-26 03:21:41 +00:00
}
A bunch of stuff from Christoph Mellon: * Whitespace fixes * Check some malloc calls * Simplify long_help formatting * Spell "LINUX" -> "linux" * A few other miscellaneous style improvements
2004-07-24 22:13:44 +00:00
static const char *long_help_msg =
"First option must be a mode specifier:\n"
" -c Create -r Add/Replace -t List -u Update -x Extract\n"
"Common Options:\n"
" -b # Use # 512-byte records per I/O block\n"
" -f <filename> Location of archive (default " _PATH_DEFTAPE ")\n"
" -v Verbose\n"
" -w Interactive\n"
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
"Create: %p -c [options] [<file> | <dir> | @<archive> | -C <dir> ]\n"
A bunch of stuff from Christoph Mellon: * Whitespace fixes * Check some malloc calls * Simplify long_help formatting * Spell "LINUX" -> "linux" * A few other miscellaneous style improvements
2004-07-24 22:13:44 +00:00
" <file>, <dir> add these items to archive\n"
Merge remaining changes from libarchive.googlecode.com: * Add xz and lzma compression options * Rename --format-options to simply --options * Add --same-owner for GNU tar compat * Add -lmd and -lcrypto to fix link * Documentation
2009-04-17 03:45:15 +00:00
" -z, -j, -J, --lzma Compress archive with gzip/bzip2/xz/lzma\n"
gtar uses -F for another purpose, so bsdtar no longer treats it as a synonym for --format. Update the man page to reflect this. While I'm here, change the man page to document "tar" rather than "bsdtar," update some comments about -l compatibility and fix a few grammar nits.
2004-08-08 17:20:23 +00:00
" --format {ustar|pax|cpio|shar} Select archive format\n"
A bunch of stuff from Christoph Mellon: * Whitespace fixes * Check some malloc calls * Simplify long_help formatting * Spell "LINUX" -> "linux" * A few other miscellaneous style improvements
2004-07-24 22:13:44 +00:00
" --exclude <pattern> Skip files that match pattern\n"
It shouldn't be an error to specify the same mode twice: allow -cc but not -ct. Thanks to: Christoph Mallon (whose proposed patch was actually simpler than what I ended up with)
2004-08-08 05:10:10 +00:00
" -C <dir> Change to <dir> before processing remaining files\n"
A bunch of stuff from Christoph Mellon: * Whitespace fixes * Check some malloc calls * Simplify long_help formatting * Spell "LINUX" -> "linux" * A few other miscellaneous style improvements
2004-07-24 22:13:44 +00:00
" @<archive> Add entries from <archive> to output\n"
"List: %p -t [options] [<patterns>]\n"
" <patterns> If specified, list only entries that match\n"
"Extract: %p -x [options] [<patterns>]\n"
" <patterns> If specified, extract only entries that match\n"
" -k Keep (don't overwrite) existing files\n"
" -m Don't restore modification times\n"
" -O Write entries to stdout, don't restore to disk\n"
" -p Restore permissions (including ACLs, owner, file flags)\n";
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
Clean up usage message(s): * Usage goes to stderr, not stdout * Use correct argument markup * bsdtar --help no longer exits with an error return code * ensure that the word "bsdtar" appears in the first line output from "bsdtar --help" (even if the program is invoked as "tar") In particular, scripts can now test for the presence of bsdtar. For example, in /bin/sh: if (tar --help 2>&1 | grep bsdtar >/dev/null 2>&1) then \ echo bsdtar; else echo not bsdtar; fi
2004-06-15 00:07:23 +00:00
/*
* Note that the word 'bsdtar' will always appear in the first line
* of output.
*
* In particular, /bin/sh scripts that need to test for the presence
* of bsdtar can use the following template:
*
* if (tar --help 2>&1 | grep bsdtar >/dev/null 2>&1 ) then \
* echo bsdtar; else echo not bsdtar; fi
*/
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
static void
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
long_help(void)
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
{
const char *prog;
const char *p;
Diff reduction compared to portable bsdtar 2.8: Move the program name into a global, which eliminates an extra argument from a lot of places.
2010-02-06 19:44:37 +00:00
prog = bsdtar_progname;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
Clean up usage message(s): * Usage goes to stderr, not stdout * Use correct argument markup * bsdtar --help no longer exits with an error return code * ensure that the word "bsdtar" appears in the first line output from "bsdtar --help" (even if the program is invoked as "tar") In particular, scripts can now test for the presence of bsdtar. For example, in /bin/sh: if (tar --help 2>&1 | grep bsdtar >/dev/null 2>&1) then \ echo bsdtar; else echo not bsdtar; fi
2004-06-15 00:07:23 +00:00
fflush(stderr);
Add a --version option to bsdtar that prints the versions of both bsdtar and libarchive. Of course, this requires that bsdtar have a version number. Let's call this 1.00, shall we? ;-)
2004-07-26 03:21:41 +00:00
p = (strcmp(prog,"bsdtar") != 0) ? "(bsdtar)" : "";
printf("%s%s: manipulate archive files\n", prog, p);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
A bunch of stuff from Christoph Mellon: * Whitespace fixes * Check some malloc calls * Simplify long_help formatting * Spell "LINUX" -> "linux" * A few other miscellaneous style improvements
2004-07-24 22:13:44 +00:00
for (p = long_help_msg; *p != '\0'; p++) {
if (*p == '%') {
if (p[1] == 'p') {
fputs(prog, stdout);
p++;
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
} else
A bunch of stuff from Christoph Mellon: * Whitespace fixes * Check some malloc calls * Simplify long_help formatting * Spell "LINUX" -> "linux" * A few other miscellaneous style improvements
2004-07-24 22:13:44 +00:00
putchar('%');
} else
putchar(*p);
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
}
Change the output of --version to match GNU "gnits" standards. (I'm not using GPL, but I still think there are good ideas in the GNU projects. ;-) Among other things, this should make it easier for clients of bsdtar to recognize it automatically: bsdtar --version | grep bsdtar
2006-03-07 06:05:38 +00:00
version();
Initial commit for bsdtar.
2004-04-05 21:32:18 +00:00
}
Reference in New Issue Copy Permalink