mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity
123,024 Commits 339 Branches 3,553 Tags 2.1 GiB
045b6fdaf6
Commit Graph

157 Commits

Author SHA1 Message Date
Tim Kientzle
9969ea22ef getopt(3) prints an "unrecognized option" warning for me, so I 
shouldn't print another.

MFC after: 15 days
 2004-10-17 23:58:17 +00:00
Tim Kientzle
ce7691dcad Cosmetic goof: Use two spaces in "Jan 03 2004" but only one in "Jan 03 12:32" 
MFC after: 15 days
 2004-10-17 23:57:10 +00:00
Tim Kientzle
cb7f04cf39 Make -C and -T work correctly together. 
MFC after: 3 days
Thanks to: Guy Helmer
 2004-08-28 05:28:19 +00:00
Tim Kientzle
6eb25c6af2 Document the -O option's new behavior in the presence of -t. 
MFC after: 3 days
 2004-08-27 04:19:28 +00:00
Tim Kientzle
773d437982 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
Tim Kientzle
85c6c73a4d Permit -P to be combined with -t. (It's a no-op then, just as in gtar.) 2004-08-26 06:28:39 +00:00
Tim Kientzle
1ced550de7 Tell getopt to accept the (already-implemented) -I option. 2004-08-26 01:58:14 +00:00
Tim Kientzle
fc1f10af70 Make -I and --files-from be synonyms for -T 2004-08-13 07:23:02 +00:00
Tim Kientzle
b757c8251b 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
Tim Kientzle
6fc954815f Better low-memory handling: If the link cache runs out of memory, just 
throw out the whole thing and stop tracking links entirely.  That will
break all remaining hardlinks, but should free up enough memory to
let everything finish.
 2004-08-08 06:36:03 +00:00
Tim Kientzle
991f1d87bb Move the smart chdir logic into a couple of utility functions in util.c. 
Then use them to provide consistent -C support throughout the program.
Thanks to: Christoph Mallon
 2004-08-08 05:50:10 +00:00
Tim Kientzle
dd1a40a3c0 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
Tim Kientzle
3387f49acb Another pointy-hat problem: PACKAGE_VERSION macro is set in 
CFLAGS, it shouldn't be in bsdtar_platform.h.
Thanks to: Andrey Chernov for looking over my shoulder so much lately.
 2004-08-08 04:36:32 +00:00
Tim Kientzle
5ccc2612d1 Minor portability fixes. bsdtar now compiles on Win32/cygwin, though 
it doesn't yet seem to work entirely correctly.
 2004-08-08 01:30:30 +00:00
Tim Kientzle
8095e9d82b 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
Tim Kientzle
dfee4c496f 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
Tim Kientzle
5232906014 Add "make distfile" capabilities to bsdtar, including informational 
COPYING file and some conditional compilation cleanups.
 2004-08-07 03:24:49 +00:00
Tim Kientzle
d9fbe79b07 Ensure that there's always a space between the user name and 
group name in -tv output format.
 2004-08-05 05:46:22 +00:00
Tim Kientzle
a6cc81c62c 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
Tim Kientzle
1c962ead2f Correct the explanation of the -X option. 
Thanks to: Pav Lucistnik
 2004-08-01 20:09:08 +00:00
Tim Kientzle
92371d176f Improve portability to FreeBSD 4. 
Thanks to: Barry Bouwsma
 2004-07-30 02:59:58 +00:00
Tim Kientzle
cfdb7dd69b Fix comment. 
Thanks to: Johan Karlsson
 2004-07-30 02:46:12 +00:00
Tim Kientzle
556d6e605e 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
Tim Kientzle
4f23b47afa 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
Tim Kientzle
8e5c78995e Of course, I meant POSIX.1-1996, not 1997. 
Thanks to: Andrey Chernov
 2004-07-25 00:31:24 +00:00
Tim Kientzle
62010d3541 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
Tim Kientzle
ee92911f48 My bad: /dev/sa0, no 'r' 
Thanks (and many apologies) to: Cristoph Mallon
 2004-07-21 06:43:10 +00:00
Tim Kientzle
040d3851d1 Guard against argv[0] being NULL. 
Thanks to: Tim J Robbins
 2004-07-19 14:54:38 +00:00
Tim Kientzle
d3ca4b04cb Fix some misspellings, document the TAPE environment 
variable and the default tape device.
 2004-07-19 05:24:41 +00:00
Tim Kientzle
5ebbe2f056 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
Tim Kientzle
16847ae6c0 Make bsdtar the default system tar. This makes /usr/bin/tar a symlink 
pointing to /usr/bin/bsdtar by default.  To make it point to /usr/bin/gtar,
you can define WITH_GTAR.
 2004-07-17 06:03:47 +00:00
Tim Kientzle
b3ea6ecd42 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
Tim Kientzle
b9916968df 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
Tim Kientzle
8d49c1a85c Mimic ls(1) by putting an extra space before the year in old dates 2004-07-12 13:15:13 +00:00
Tim Kientzle
3481100baf Fix tab/space screwup in long_help() 2004-07-12 13:13:42 +00:00
Ruslan Ermilov
284fcee0c0 Fixed cross-references in SEE ALSO. 
Emininated double space and hard sentence breaks.
 2004-07-04 21:15:37 +00:00
Tim Kientzle
0ddb95d12c Pass the pointy hat, please: 
All of --help should go to stdout, not some to stdout and some to stderr.
 2004-07-04 18:13:01 +00:00
Ruslan Ermilov
6a3e8b0adc Mechanically kill hard sentence breaks. 2004-07-02 22:22:35 +00:00
Tim Kientzle
77d2ac4af5 Add yet another synonym for -n. 2004-06-28 14:02:22 +00:00
Tim Kientzle
da9cbfaa5d 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
Tim Kientzle
e2fe7499b6 Warn about stripping leading '/' when creating archives. 2004-06-27 18:32:14 +00:00
Tim Kientzle
d3d1a208cb 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
Tim Kientzle
d24e5e453e Fix "@-" which has apparently been broken for some time. <sigh> 
While I'm here, add in a lot more error-checking around append_archive.
 2004-06-27 03:28:13 +00:00
Tim Kientzle
4049589b28 Don't abort immediately on directory change errors. 
Instead, display a warning, clean up, and let main() return the error.
In particular, this means that chdir() problems won't leave broken
archives, though they will prompt an error exit value.
 2004-06-27 01:08:54 +00:00
Tim Kientzle
f758d316c0 Document the -W convention for accessing long options. 
Also correct an old error: there was no tar command in Sixth Edition.
 2004-06-26 22:58:29 +00:00
Tim Kientzle
0674dded37 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
Tim Kientzle
d18eca7d48 Update some internal comments about the --no-same-permissions option. 
Thanks to: Kris Kennaway for doing some gtar research for me.
 2004-06-15 07:16:44 +00:00
Tim Kientzle
4150562c7b 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
Tim Kientzle
d2286340c9 Oops. bsdtar's old -X option didn't take an argument; the new 
(gtar-compatible) one does require an argument.
 2004-06-15 06:24:54 +00:00
Tim Kientzle
b7ec47bb9f Add gtar-compatible -X/--exclude-from 2004-06-15 05:55:41 +00:00
Tim Kientzle
b9d38fa25a Fix build. 2004-06-15 01:51:45 +00:00
Tim Kientzle
24220f2890 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
Tim Kientzle
5a57a7f095 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
Tim Kientzle
c066ba2f01 Oops: gtar's --dereference should be a synonym for bsdtar's -L, not -H. 
Pointed out by: devel/nspr port
Thanks to: Kris Kennaway
 2004-06-11 01:35:56 +00:00
Tim Kientzle
a85e1b56bb Set program exit value to 1 if there are any of various errors when 
creating an archive.

Pointed out by: Failure to complain when building certain broken packages
(Thanks again to Kris Kennaway for finding this!)
 2004-06-07 07:19:04 +00:00
Tim Kientzle
af2ef563dd Fix the symlink-detection code. Don't squawk if we're just replacing 
an existing symlink (as might happen if you extract an archive twice).
Also, if we remove the offending link, then we've removed the problem
and can safely go forward with the extraction.

Pointed out by: print/adobe-cmaps port (whose distfile has
	duplicate entries for the same symlinks)
Thanks to: Kris Kennaway (for using ports as a testbed for bsdtar)
 2004-06-07 04:10:43 +00:00
Tim Kientzle
a55bfb25e7 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
Tim Kientzle
b5642237fc Ooops! Previous commit added an over-zealous error check. 
It is, in fact, perfectly legal to not specify a compression when
writing an archive. <sigh>
 2004-06-07 03:38:17 +00:00
Tim Kientzle
e1f5ccf6fb If -b is specified, then force full padding for the last block. 2004-06-07 03:19:57 +00:00
Tim Kientzle
2225b76daf Per style(9), don't use double spaces in expressions. 
Pointed out by: njl, des.
 2004-06-07 03:16:18 +00:00
Tim Kientzle
5251608d94 Pointy hat: sticky bit 't' or 'T' is shown over IXOTH bit, not IXGRP. <sigh> 2004-06-03 23:43:40 +00:00
Tim Kientzle
755e3f9b2e 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
Tim Kientzle
e47b3d7a25 Both "foo/" and "foo" should match "foo/bar", so strip 
trailing '/' characters on include patterns for extraction.

Pointed out by: games/quakeforge port (thanks to Kris!)
 2004-06-02 07:23:54 +00:00
Tim Kientzle
e5572b4b7c 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
Tim Kientzle
de10ed4154 Permit (but ignore) -Z with -x or -t, now that libarchive 
recognizes and decompresses .Z format.
 2004-05-30 00:09:43 +00:00
Tim Kientzle
f0e6a2b96d Minor corrections to error handling and user notifications: 
* Move format/compression reporting to end of output, since
  we don't always know the input format until then.
* Set bsdtar exit value to 1 if any file could not be restored.
* Generate gtar-style warning when stripping leading '/' characters.
* Warn when removing symlinks.
 2004-05-27 04:35:36 +00:00
Tim Kientzle
8df3c224c0 Provide framework for exiting with non-zero value on non-critical errors. 2004-05-27 04:30:59 +00:00
Tim Kientzle
26eddc7f41 Add --no-same-owner as a synonym for -o. 
Note that bsdtar's -o (which follows SUSv2) is not the same as GNU tar's -o.
In GNU tar, -o and --no-same-owner are not synonyms.

Pointed out by: Kris Kennaway (required by xpenguins port)
 2004-05-22 17:49:54 +00:00
Tim Kientzle
c5ce4977e6 Add --dereference as a synonym for -H 
Pointed out by: Kris Kennaway (unbreaks nspr port build)
 2004-05-21 18:40:32 +00:00
Tim Kientzle
04e2d02e20 Default is to restore timestamps, even when operating as root. <sigh> 2004-05-19 01:21:11 +00:00
Tim Kientzle
873e38290a Fix a segfault when looking up a non-existent group. 2004-05-18 23:40:25 +00:00
Tim Kientzle
656e70b49a 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
Tim Kientzle
a25502627d Set errno to 0 before calling getpwuid/getgrgid, so that error 
messages will be displayed only when there is, in fact, an error.
 2004-05-17 18:29:12 +00:00
Tim Kientzle
9d77c5f29c Speed up safe_fprintf by copying to a temp buffer, then writing 
blocks at a time, rather than using putc().
 2004-05-17 07:35:52 +00:00
Tim Kientzle
088bdb251d Propagate struct bsdtar down into a lot more places. 
Move global progname variable into struct bsdtar.
 2004-05-17 05:44:53 +00:00
Tim Kientzle
7283cd6959 Refactor name caching to use a common piece of code for uname_cache and 
gname_cache.  Cache negative lookups to dramatically improve performance
building archives containing nonexistent uid/gid.
 2004-05-17 05:02:39 +00:00
Tim Kientzle
4a07f42b98 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
Tim Kientzle
dcec34670d Update manpage to track new security features. 2004-05-17 03:19:31 +00:00
Tim Kientzle
81f3488f97 Add --unlink and --unlink-first synonyms for -U 
Make indentation of tar_longopts array more consistent.
 2004-05-05 21:06:37 +00:00
Tim Kientzle
bf0c356cdf Contrariwise, Linux sys/stat.h doesn't define mode_t and friends, 
even though POSIX requires it.  <sigh>
 2004-05-04 21:40:09 +00:00
Tim Kientzle
6e8b30b778 Include local copies of fts.c and fts.h to be used ONLY on non-FreeBSD 
systems.  The fts.h here is an exact copy of include/fts.h (except for
an initial explanatory comment and the revision tags, of course).  The
fts.c here is slightly modified from lib/libc/gen/fts.c so it can
compile correctly on non-FreeBSD systems.
 2004-05-04 17:21:01 +00:00
Tim Kientzle
9644b0783f For portability, don't rely on libc's strmode(3). <sigh> 2004-05-03 21:05:59 +00:00
Tim Kientzle
ce722a01be Correct copy/paste error in Linux nodump support. 
Thanks to: Juergen Lock for his continuing patience
while I botch his patches.
 2004-05-03 16:56:42 +00:00
Tim Kientzle
f1fe72c1cc Style: Use single tab after #define 2004-05-02 22:58:18 +00:00
Tim Kientzle
732db834d2 More of Juergen Lock's patches for Linux. 
(fflags support on Linux, nanosecond timestamp portability, enable
64-bit file offsets)
 2004-05-02 18:10:35 +00:00
Tim Kientzle
020287607f A security issue: An archive containing a symlink to another 
directory, then a file with that symlink as a prefix can drop a file
outside of the current directory, which can be a security hole.

Plug this hole by refusing to extract files if a prefix of the
pathname is a symlink.  The -P option disables this check.
 2004-05-02 00:43:02 +00:00
Tim Kientzle
6c6b3d9aa5 -U is now implemented. (It's been recognized by bsdtar for a while; 
now libarchive actually supports the underlying request.)
 2004-04-29 05:22:13 +00:00
Tim Kientzle
d7837b06fe Refuse to extract entries with '..' in pathname. 
Pointed out by: David Schultz
 2004-04-28 18:53:07 +00:00
Tim Kientzle
0c27da5f82 Remove information about specific formats; replace with a 
reference to libarchive-formats(5).
 2004-04-28 04:43:57 +00:00
Tim Kientzle
749029a437 Update write.c to follow recent API changes to libarchive. 
Also, bump up the default copy buffer from 8k to 64k
to improve performance.
 2004-04-26 23:39:17 +00:00
Tim Kientzle
7e02198e95 Fix username/groupname cache so it returns a name that 
was just looked up by get{pw,gr}id().  Otherwise, it
returns a NULL name unless it's already in the cache.

Credit to Juergen Lock.
 2004-04-23 16:33:51 +00:00
Tim Kientzle
fe44171ebd Eliminate a redundant call to archive_entry_set_pathname() 2004-04-21 05:16:28 +00:00
Tim Kientzle
97c4c5308b Allow brave souls to install bsdtar as the 
default "tar" command by defining WITH_BSDTAR.

Note: "gtar" and "bsdtar" commands both exist regardless.
 2004-04-19 22:09:04 +00:00
Tim Kientzle
cc52bf3428 --help is only supported if you have getopt_long(). 
This allows bsdtar to compile on FreeBSD 4.x.
 2004-04-16 03:50:04 +00:00
Tim Kientzle
855e109158 As suggested by Julian Elischer, use a self-sizing hash 
table for the hardlink cache.  This dramatically improves
performance when archiving millions of hardlinked files.

While I'm here, clean up some style bugs (per Bruce Evans)
and clarify some comments.
 2004-04-15 22:37:54 +00:00
Tim Kientzle
17834543c8 A simple cache of uid->uname lookups and gid->gname lookups eliminates 
almost 1/2 of the CPU time required to create an uncompressed archive
and makes a noticable reduction in wallclock time.
 2004-04-14 00:40:54 +00:00
Tim Kientzle
c7141791f3 When all the links to a file have been dumped, don't forget 
to free() the memory used to store the filename.
 2004-04-13 23:50:48 +00:00
Tim Kientzle
907d74bb26 Eliminate a lot of malloc/free calls by using 
a stack-allocated buffer for safe_fprintf formatting.
Only if the result is too large do we resort to malloc.
 2004-04-13 23:49:02 +00:00
Tim Kientzle
de60e4436b 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
Tim Kientzle
5316058f3c Style fixes 
Pointed out by: bde
 2004-04-12 18:06:07 +00:00