CVS log for src/bin/pax/options.c

Up to [cvs.NetBSD.org] / src / bin / pax

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

pax(1): Nix trailing whitespace.

No functional change intended.

pax: need <strings.h> for ffs()

Fixes warning as host tool on NetBSD 9.99

Pull up following revision(s) (requested by mrg in ticket #1678):

	bin/pax/options.c: revision 1.119
	usr.bin/config/scan.l: revision 1.32
	usr.bin/make/main.c: revision 1.274
	bin/pax/extern.h: revision 1.60
	usr.bin/config/defs.h: revision 1.106
	usr.bin/make/make.h: revision 1.105
	sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
	sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
	usr.bin/config/main.c: revision 1.100
	usr.sbin/installboot/Makefile:	revisions 1.53,1.54 (patch)
	usr.sbin/installboot/installboot.h: revision 1.41 (patch)
	usr.sbin/installboot/machines.c: revisisons 1.41,1.42 (patch)

Avoid depending on common symbols.

Pull up following revision(s) (requested by mrg in ticket #1263):

	bin/pax/options.c: revision 1.119
	usr.bin/config/scan.l: revision 1.32
	usr.bin/make/main.c: revision 1.274
	bin/pax/extern.h: revision 1.60
	usr.bin/config/defs.h: revision 1.106
	usr.bin/make/make.h: revision 1.105
	sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
	sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
	usr.bin/config/main.c: revision 1.100

Avoid depending on common symbols.

Ooops, restore accidently removed files from merge mishap

Sync with HEAD

Merge changes from current as of 20200406

Move definition of chdname and do_chroot to options.c

Add the timestamp option to the pax front end.

PR/50119: Thomas Klausner: Add --timestamp option to tar.

Add -J/--xz to specifically decompress xz compressed files. We don't really
need this because -z autodetects the compression format; this is for syntax
compatibility with other tar implementations. From Joachim Henke

Rebase to HEAD as of a few days ago.

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

add --gnu for pax.

sync with head

add missing include files

sync with head

Use C89 function definitions

NULL does not need a cast

static + __dead

Catchup with rmind-uvmplock merge.

add --xz

- Raise an error rather than silently creating broken archive
  if user don't specify --force-local but opened file is actually
  a local file.
- Make cpio to accept -F option as described in manpage.
- Make pax to set forcelocal flag if requested to do so.
- Add missing break statement.

Do not throw a usage message for -i followed by -t
since 'cpio -itv' is a valid command.

add --use-compress-program to pax, requested by mrg.

sync to netbsd-5

Pull up following revision(s) (requested by dholland in ticket #1272):
	bin/pax/options.c: revision 1.106
Don't use NOGLOB_MTCH for pax, only for tar. Fixes fix for PR 41167 and
closes PR 42301. Since the 41167 fix was pulled up to -5, this needs to
be too.

Don't use NOGLOB_MTCH for pax, only for tar. Fixes fix for PR 41167 and
closes PR 42301. Since the 41167 fix was pulled up to -5, this needs to
be too.

Pull up following revision(s) (requested by plunky in ticket #1354):
	bin/pax/options.c: revision 1.105 via patch
	usr.bin/ctags/C.c: revision 1.19
	usr.bin/ctags/ctags.h: revision 1.9
	usr.bin/ctags/fortran.c: revision 1.11
	usr.bin/ctags/lisp.c: revision 1.11
	usr.bin/ctags/print.c: revision 1.10
	usr.bin/ctags/yacc.c: revision 1.12
	usr.bin/gencat/gencat.c: revision 1.30 via patch
Rename internal getline() function to get_line() so it does not
conflict with the soon to be added getline(3) libc function.

Pull up following revision(s) (requested by plunky in ticket #1354):
	bin/pax/options.c: revision 1.105 via patch
	usr.bin/ctags/C.c: revision 1.19
	usr.bin/ctags/ctags.h: revision 1.9
	usr.bin/ctags/fortran.c: revision 1.11
	usr.bin/ctags/lisp.c: revision 1.11
	usr.bin/ctags/print.c: revision 1.10
	usr.bin/ctags/yacc.c: revision 1.12
	usr.bin/gencat/gencat.c: revision 1.30 via patch
Rename internal getline() function to get_line() so it does
conflict with the soon to be added getline(3) libc function.

Pull up following revision(s) (requested by roy in ticket #885):
	bin/pax/options.c: revision 1.105
	dist/nawk/maketab.c: revision 1.12
	dist/nawk/proctab.c: revision 1.11
	dist/nawk/proto.h: revision 1.9
	dist/nawk/run.c: revision 1.29
	usr.bin/ctags/C.c: revision 1.19
	usr.bin/ctags/ctags.h: revision 1.9
	usr.bin/ctags/fortran.c: revision 1.11
	usr.bin/ctags/lisp.c: revision 1.11
	usr.bin/ctags/print.c: revision 1.10
	usr.bin/ctags/yacc.c: revision 1.12
	usr.bin/gencat/gencat.c: revision 1.30
Rename internal getline() function to get_line() so it does
conflict with the soon to be added getline(3) libc function.

Pull up following revision(s) (requested by roy in ticket #885):
	bin/pax/options.c: revision 1.105
	dist/nawk/maketab.c: revision 1.12
	dist/nawk/proctab.c: revision 1.11
	dist/nawk/proto.h: revision 1.9
	dist/nawk/run.c: revision 1.29
	usr.bin/ctags/C.c: revision 1.19
	usr.bin/ctags/ctags.h: revision 1.9
	usr.bin/ctags/fortran.c: revision 1.11
	usr.bin/ctags/lisp.c: revision 1.11
	usr.bin/ctags/print.c: revision 1.10
	usr.bin/ctags/yacc.c: revision 1.12
	usr.bin/gencat/gencat.c: revision 1.30
Rename internal getline() function to get_line() so it does
conflict with the soon to be added getline(3) libc function.

Rename internal getline() function to get_line() so it does
conflict with the soon to be added getline(3) libc function.

Sync with HEAD.

Third (and last) commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html

Pull up following revision(s) (requested by christo in ticket #678):
	bin/pax/extern.h: revision 1.56
	bin/pax/file_subs.c: revision 1.62
	bin/pax/options.c: revision 1.104
	bin/pax/pat_rep.c: revision 1.29
	bin/pax/pax.h: revision 1.30
Fixes from christos for pr-41167
XXX -X is still broken, but that wasn't part of this PR.

Fixes from christos for pr-41167

XXX -X is still broken, but that wasn't part of this PR.

fix -Wsign-compare issues

Pull up following revision(s) (requested by dholland in ticket #114):
	bin/pax/options.c: revision 1.102
Don't pass strings from argv[] to free(). Fixes PR 39992.

Don't pass strings from argv[] to free(). Fixes PR 39992.

sync with HEAD

 - Add -0 and -V to pax_usage().
 - Add -k to tar_usage().

PR/36194: Greg A. Woods: add a '-V' flag to pax for verbose summary without
listing (and other minor fixes)

Fix for PR bin/35432:
 * The flags "crtux" are mutually exclusive for tar.
 * The flags "ipt" and "oA" are mutually exclusive for cpio.

add missing inititializer

PR/22995: Sergey Svishchev: If we are cd'ing around and we have directories
with relative paths, convert the directories to absolute paths, so that
restoring timestamps does not fail.

Don't free str; it is used in pat_add. Noted by: Kouichirou Hiratsuka

Coverity CID 2734, 2731: Use after free; resource leak

Coverity CID 345: Add missing free's.

Change all the 'return(x)' to 'return c'.
Makes some other searches I want to do a bit easier.

Another missing mkdir() race pointed out by chuq. Factor out the mkdir code.

use stat and not lstat to detect if we have a directory. refactor the mkpath()
code.

when creating directories, check if the failure occured because someone
else created the directory before we did to avoid races. From chuq.

Apply patch (requested by riz in ticket #5512):
Sync pax with HEAD of 2005-07-22.

Don't compile in cpio usage, if we are SMALL.

appease gcc -Wuninitialized

Pull up revision 1.83 (requested by kleink in ticket #1554):
Fix from PR#29290. Properly terminate the cpio_longopts struct so an unknown
option doesn't run off the end and core dump

be more lenient on the comparison to argv[0] to determine our personality.

PR/30167: J.T. Conklin: NetBSD tar does not support GNU tar --no-recursion flag

PR/29005: Jesse Off: nbpax requires sys/mtio.h which doesn't exist on Interix
I added an ifdef called HAVE_MTIO_H and fixed the code to use it. It is
always defined now, but you can change this for Interix.

Pax longopts were not empty element terminated.

Fix from PR#29290. Properly terminate the cpio_longopts struct so an unknown
option doesn't run off the end and core dump

Pull up revision 1.82 (requested by tron in ticket #952):
  Fix broken cpio(1) option handling:
   o "cpio -i -t" should list the contents of a file, not
     extract it.
   o Don't extract a file when only option "-d" is given.
  Fixes PR#26513.

Fix broken cpio(1) option handling:
- "cpio -i -t" should list the contents of a file, not extract it.
- Don't extract a file when only option "-d" is given.
Patch supplied by Paul Ripke in PR bin/26513.

For HOSTTOOL builds, just exclude the chroot support as it's not needed and
avoids having to platform check for fchroot(). Fixes PR#27336

Add an option --chroot to tar.  Causes it to chroot(".") before doing
an extract.  With -h this will cause existing absolute symlinks to be treated
as relative to the current directory.
Helps sysinst handle existing symlinks in the target system.
Remove 'L' from the usage (got spilt into 'h' and 'H' many moons ago)
Add 'S' to usage, and put into correct place in options list.

PR/27212: Greg A. Woods: Accept "-C <dirname>" inside filelists in addition
to "-C\n<dirname>".
But we are not making it the default output option as the patch suggests.

PR/19490: Julio Merino: Teach tar about --sparse, -S option.
Do it for cpio too.

update the comment that documents the fields initialized in the array below.

Pull up revision 1.76 (requested by jmc in ticket #527):
Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')
Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).
Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.
Fixes PR's: PR#17762 PR#25944

Completely rework how tools/compat is done. Purge all uses/references to
_NETBSD_SOURCE as this makes cross building from older/newer versions of
NetBSD harder, not easier (and also makes the resulting tools 'different')

Wrap all required code with the inclusion of nbtool_config.h, attempt to
only use POSIX code in all places (or when reasonable test w. configure and
provide definitions: ala u_int, etc).

Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86
NetBSD current (x86 and amd64) and Solaris 9.

Fixes PR's: PR#17762 PR#25944

add -0 argument to handle nul separated file lists.

fix botched pullup from ticket #1021 and make sure this compiles on
non-NetBSD hosts again. Also fixes PR#24481

Welcome to WARNS=3

Pullup rev 1.40-1.73 (requested by rafal in ticket #1021)

Pullup pax to current version on trunk. Includes many fixes.

Tar(1)'s -s option needs an argument.  Correct option string (s -> s:).

Reported and tested by Tomoaki Imamura.

recognize -k [--keep-old-files] short option. From hubertf.

Homogenize usage messages: make the 'usage' word all lowercase, as this seems
to be the most common practice in our tree.

Rewrite the loop in printflg(): if passing -Z to pax with syntax errors
(like executing "pax -Z" by itself), this caused a shr of 32 bits, which is
undefined behavior (C99) if the variable is 32 bits wide, too.  Also solves
a problem where the flgch array could be indexed out of bounds.

Thanks to uwe@ and lha@ for their suggestions... I just found the bug :p

Overhaul how `build.sh tools' are used:

    *	Rename "config.h" to "nbtool_config.h" and
	HAVE_CONFIG_H to HAVE_NBTOOL_CONFIG_H.
	This makes in more obvious in the source when we're using
	tools/compat/config.h versus "standard autoconf" config.h

    *	Consistently move the inclusion of nbtool_config.h to before
    	<sys/cdefs.h> so that the former can provide __RCSID() (et al),
    	and there's no need to protect those macros any more.

These changes should make it easier to "tool-ify" a program by adding:
	#if HAVE_NBTOOL_CONFIG_H
	#include "nbtool_config.h"
	#endif
to the top of the source files (for the general case).

Don't pass an integer as NULL.

Move Keith Muller's code from a 4-clause to a 3-clause licence by removing
the advertising clause. Diffs provided in PR 22397 by Joel Baker, confirmed
to the board by Keith Muller.

Move UCB-licensed code from 4-clause to 3-clause licence.

Patches provided by Joel Baker in PR 22249, verified by myself.

Add support for gnutar's -O "extract to stdout" option.

PR/21064: Perry Metzger: Re-add -k to tar (--keep-old-files)

PR/20495: Soren Jacobsen: Add -j [bzip2] compression to tar.

Add support for '-j' to create (and extract, but -z already did that)
bzip2 compressed tar files, for GNU tar compatibility.
Patch from Soren Jacobsen in PR 19467, okayed by christos.
Sync usage with options while here.

Fix various spelling, grammar, and punctuation problems in comments, from Sergey Svishchev in PR 20164.

tar(1) has no -L any longer.

Correct which _usage function to use for some pax/cpio error cases.

PR/19757: Andreas Wrede: make tar's -h behave like pax's -L

add --exclude support.

XXX:  --exclude & --exclude-from are still not 100% compatible, but since
rafal fixed --exclude-from's most annoying bug, they mostly work now.

void functions should not return a value.

Handle -C\ndir\n in a file containing a file list. From Eric Gillespie.

Fix DEFOP botch. DEFOP == LIST so tar -tvf stopped working. (hi soren)

Tweak tar_usage().

Have tar require a specific action as documented.

Sync cpio_usage() with cpio.1 as with pax and tar.

we need to have -force-local on pax.

turn gnu tar off by pax and cpio front ends.

Support gnu long filename extensions by default for tar on create, list, and
extract. We now generate GNU tar archives by default ("ustar  ^@" instead of
"ustar^@00"). GNU extensions can be disabled with --strict.

XXX: long symlinks untested.

PR/18663: Jeremy Reed: pax/tar/cpio allows ".." in names.
We now disallow it by default on both archive creation and extraction.
Add --insecure option to override.

implement fast read. nothing to it really, it was already there as -q option.

Add all the gnu cpio long options.

Sync tar_usage() with tar.1.

-T expects an argument. From Eric Gillespie, thanks.

fix "pax -rw" processing.  for some reason, it was now written to process
"pax -rwvpe a b" as "pax -rwvpe b a", and "pax -rwvpe a b c" as
"pax -rwvpe b c a".  only the part of revision 1.40 that broken this has
been reverted.

add a "+" to the options string rather than setting POSIXLY_CORRECT

merge OpenBSD changes:
    - correct -C processing
    - add ability to read filenames and flags from a file
    - don't print dangerous escape sequences to the terminal
    - use strlcpy/strncpy properly.
    - handle tmpfile creation better.
    - improve documentation of options.
    - handle stdout/stderr list selection correctly.
    - kill gzip when we get interrupted.
    - simplify gzip setup.
    - add more flags to programs.

additional changes:
    - librmt processing.
    - set POSIXLY_CORRECT in options parsing.
    - prevent more string overruns.
    - support -T

we don't turn the switch on to replace tar and cpio yet.

- don't compile in support for -M (mtree specfile input) or -N dbdir
  (alternate directory for id info) if SMALL is defined
- enable -DSMALL and remove unused objects if CRUNCHEDPROG is defined
- minor cleanup in next_file() (preparation for future work)

Roll in fixes to permit cross-compiling from non-NetBSD hosts.  This
round has been tested on Solaris/x86 and Linux hosts.

* Add host tools cap_mkdb, ctags, m4, uudecode.
* Protect __RCSID() and __COPYRIGHT() better.
* Reduce the number of places that need to include "config.h", to keep
  sources closer to their "vanilla" versions.
* Add more compat #defines and autoconf-checked functions.

Make almost all tools compile and run properly on non-NetBSD hosts.  (In
particular, most tools now run correctly on Solaris 7.)

provide meaningful warning if -N is called with a dodgy dbdir

Add '-N dbdir', to specify that user & group lookups (via pwcache(3)) are to
be done from dbdir/master.passwd and dbdir/group, using simple text file
parsing routines from ../../usr.sbin/mtree/getid.c.
This does not affect the -G and -U options, which always use the
system databases.

Implement -M flag: During a write or copy operation, treat the list of
files on standard input as an mtree(8) `specfile' specification, and
write or copy only those items in the specfile.

If the file exists in the underlying file system, its permissions and
modification time will be used unless specifically overridden by the
specfile. An error will be raised if the type of entry in the specfile
conflicts with that of an existing file.

Otherwise, it is necessary to specify at least the following parameters
in the specfile: type, mode, gname or gid, and uname or uid, device
(in the case of block or character devices), and link (in the case of
symbolic links). If time isn't provided, the current time will be used.

- ansi KNF (just remove all the #ifndef __STDC__ prototype junk,
  leaving the ansi stuff)
- use longlong_t instead of quad_t (etc), and rename *uqd*() -> *ull*()
- clean up the NET2_STAT stuff similar to ftpd; provide #defines and
  macros which select which cast to use, etc
- clean up the NET2_FTS and NET2_REGEX #define use

seperate -> separate

Implement --atime-preserve.

Implement --use-compress-program.

Add GNU tar-style long options for pax's tar front-end.  Still many
GNU options not implemented, but there is an #if 0'd out canonical
list.

Don't declare 'extern opt*' getopt variables.

Add a -O option: force one volume.  This causes pax to not prompt for
a new volume upon premature end-of-volume (e.g. broken pipe).  This is
especially useful in automated environments where error recovery cannot
be performed by a human.

Cleanup and fix typos.
Partially from FreeBSD.

Pull up to last week's -current.

Disable -pf for now, too.

file options.c was added on branch comdex-fall-1999 on 1999-11-07 15:57:32 +0000

Disable -pf for now, too.

add a new -p subflag: 'f' to preserve 4.4BSD fileflags.  this only
really works for `pax -rw' but that's where it is most useful.

Implement positional -C argument to tar.

Fix "tar" mode usage string.

Recognize GnuTAR's "h" (instead of "H") and "P" options.

Strip leading slashes from filenames by default, add new "A" option to
disable this behaviour. Patches supplied by Peter Seebach in PR bin/8233.

Add -z option to usage message.

Fix opt_add to take const char * so that it can be passed a constant
string legally (it strdup()s the argument).  How pax-as-tar `-o' ever
worked without a coredump is beyond me...

Also modify pax-as-tar `-o' to do three things, which depend on the
create/extract mode:

- write V7 format archives (which, though part of GNU tar, actually
  goes along with the following point--after all, old pax-as-tar created
  V7 archives by default);
- write archives with "write_opt=nodir", as pax already did, and as
  specified by 4.2BSD;
- extract archives with owner/group set to invoking user, as specified
  by SUS.

Lost 5 lines in the version that was committed.  Re-add them.

Uh, when called as "tar" we should still default to "ustar" output, not
V7 tar format.  Also change meaning of pax-as-tar option "-o" to mean
"use V7 output format" (same as GNU tar's -o).

implement the gnutar -X flag in terms of pax -s.  fix some bugs in pax -s handling while i am here...

Use the uid/gid caching moved into libc.  Fixed a memory leak!

Be more retentive about use of NOTREACHED and noreturn.

Delint.

oops, fix broken cpio options code.  tar options code should be made like pax and cpio code.

- implement -C and -l for pax-as-tar, as inspried by GNU tar.
- minor cleanups to the options parsing code.
- add a cpio frontend.

note:  a few GNU/svr4 cpio options are not supported yet (#ifdef
notyet), however all x/open ones are.

* cleanup manpage
* getopt returns -1 not EOF
* deprecate register

- Rename local warn so tty_warn that we can include <err.h> since this program
  uses err() and errx().
- Fix printf format strings.
- Added WARNS=1; note
- Added missing prototypes.
- Split overloaded trail function into trail() and subtrail().

kill 'register'

impliment -z (gzip) in pax and tar, and -Z (compress) in tar.

convert to new RCS id conventions.

Whoever wrote the tar command line argument parsing code didn't realize
that the order of arguments is different if the command flags are specified
without a `-'.  I've integrated getoldopt.c from John Gilmore's pdtar which
handles argument parsing correctly.

Fix up RCS ids.

Add RCS ID's

From 4.4 lite

Initial revision