X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftar.c;h=c159e6033e518d92e32782fc630a81db7ec27ce4;hb=3f7e8b8d056161f43a0dd7c74ec97694e3fcfbfc;hp=4622647fe8e8133f595653c2dcdcc30ae90eb895;hpb=54694ee258a974a6c8a9710718500f58c74cd257;p=chaz%2Ftar

diff --git a/src/tar.c b/src/tar.c
index 4622647..c159e60 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,5 +1,5 @@
 /* Tar -- a tape archiver.
-   Copyright (C) 1988 Free Software Foundation
+   Copyright (C) 1988, 1992 Free Software Foundation
 
 This file is part of GNU Tar.
 
@@ -186,6 +186,11 @@ struct option long_options[] =
 	{"compress-block",	0,	&f_compress,		2},
 	{"sparse",		0,	&f_sparse_files,	1},
 	{"tape-length",		1,	0,			'L'},
+	{"remove-files",	0,	&f_remove_files,	1},
+	{"ignore-failed-read",	0,	&f_ignore_failed_read,	1},
+	{"checkpoint",		0,	&f_checkpoint,		1},
+	{"show-omitted-dirs",	0,	&f_show_omitted_dirs,	1},
+	{"volno-file",		1,	0,			17},
 
 	{0, 0, 0, 0}
 };
@@ -209,6 +214,9 @@ main(argc, argv)
 	if(!n_argv)
 		name_init(argc, argv);
 
+	if (f_volno_file)
+	  init_volume_number ();
+	
 	switch(cmd_mode) {
 	case CMD_CAT:
 	case CMD_UPDATE:
@@ -225,7 +233,7 @@ main(argc, argv)
 		break;
 	case CMD_EXTRACT:
 		if (f_volhdr) {
-			char *err;
+			const char *err;
 			label_pattern = (struct re_pattern_buffer *)
 			  ck_malloc (sizeof *label_pattern);
 		 	err = re_compile_pattern (f_volhdr, strlen (f_volhdr),
@@ -243,7 +251,7 @@ main(argc, argv)
 		break;
 	case CMD_LIST:
 		if (f_volhdr) {
-			char *err;
+			const char *err;
 			label_pattern = (struct re_pattern_buffer *)
 			  ck_malloc (sizeof *label_pattern);
 		 	err = re_compile_pattern (f_volhdr, strlen (f_volhdr),
@@ -273,6 +281,8 @@ main(argc, argv)
  		fprintf(stderr,"For more information, type ``%s +help''.\n",tar);
 		exit(EX_ARGSBAD);
 	}
+	if (f_volno_file)
+	  closeout_volume_number ();
 	exit(errors);
 	/* NOTREACHED */
 }
@@ -341,6 +351,10 @@ options(argc, argv)
 			filename_terminator = '\0';
 			break;
 
+		case 17:
+			f_volno_file = optarg;
+			break;
+			
 		case 'g':	/* We are making a GNU dump; save
 				   directories at the beginning of
 				   the archive, and include in each
@@ -494,6 +508,10 @@ options(argc, argv)
 		get_newer:
 			f_new_files++;
 			new_time=get_date(optarg, (PTR) 0);
+			if (new_time == (time_t) -1) {
+			  msg("invalid date format `%s'", optarg);
+			  exit(EX_ARGSBAD);
+			}
 			break;
 
 		case 'o':	/* Generate old archive */
@@ -608,68 +626,71 @@ describe()
 {
 	puts("choose one of the following:");
 	fputs("\
--A, +catenate,\n\
-    +concatenate	append tar files to an archive\n\
--c, +create		create a new archive\n\
--d, +diff,\n\
-    +compare		find differences between archive and file system\n\
-+delete			delete from the archive (not for use on mag tapes!)\n\
--r, +append		append files to the end of an archive\n\
--t, +list		list the contents of an archive\n\
--u, +update		only append files that are newer than copy in archive\n\
--x, +extract,\n\
-    +get		extract files from an archive\n",stdout);
+-A, --catenate,\n\
+    --concatenate	append tar files to an archive\n\
+-c, --create		create a new archive\n\
+-d, --diff,\n\
+    --compare		find differences between archive and file system\n\
+--delete			delete from the archive (not for use on mag tapes!)\n\
+-r, --append		append files to the end of an archive\n\
+-t, --list		list the contents of an archive\n\
+-u, --update		only append files that are newer than copy in archive\n\
+-x, --extract,\n\
+    --get		extract files from an archive\n",stdout);
 
 	fprintf(stdout, "\
 Other options:\n\
--b, +block-size N	block size of Nx512 bytes (default N=%d)\n", DEFBLOCKING);
+-b, --block-size N	block size of Nx512 bytes (default N=%d)\n", DEFBLOCKING);
 	fputs ("\
--B, +read-full-blocks	reblock as we read (for reading 4.2BSD pipes)\n\
--C, +directory DIR	change to directory DIR\n\
+-B, --read-full-blocks	reblock as we read (for reading 4.2BSD pipes)\n\
+-C, --directory DIR	change to directory DIR\n\
+--checkpoint		print directory names while reading the archive\n\
 ", stdout); /* KLUDGE */ fprintf(stdout, "\
--f, +file [HOSTNAME:]F	use archive file or device F (default %s)\n",
+-f, --file [HOSTNAME:]F	use archive file or device F (default %s)\n",
 				 DEF_AR_FILE); fputs("\
--F, +info-script F	run script at end of each tape (implies -M)\n\
--G, +incremental	create/list/extract old GNU-format incremental backup\n\
--g, +listed-incremental F create/list/extract new GNU-format incremental backup\n\
--h, +dereference	don't dump symlinks; dump the files they point to\n\
--i, +ignore-zeros	ignore blocks of zeros in archive (normally mean EOF)\n\
--k, +keep-old-files	keep existing files; don't overwrite them from archive\n\
--K, +starting-file FILE	begin at FILE in the archive\n\
--l, +one-file-system	stay in local file system when creating an archive\n\
--L, +tape-length LENGTH change tapes after writing LENGTH\n\
+-F, --info-script F	run script at end of each tape (implies -M)\n\
+-G, --incremental	create/list/extract old GNU-format incremental backup\n\
+-g, --listed-incremental F create/list/extract new GNU-format incremental backup\n\
+-h, --dereference	don't dump symlinks; dump the files they point to\n\
+-i, --ignore-zeros	ignore blocks of zeros in archive (normally mean EOF)\n\
+--ignore-failed-read	don't exit with non-zero status on unreadable files\n\
+-k, --keep-old-files	keep existing files; don't overwrite them from archive\n\
+-K, --starting-file FILE	begin at FILE in the archive\n\
+-l, --one-file-system	stay in local file system when creating an archive\n\
+-L, --tape-length LENGTH change tapes after writing LENGTH\n\
 ", stdout); /* KLUDGE */ fputs("\
--m, +modification-time	don't extract file modified time\n\
--M, +multi-volume	create/list/extract multi-volume archive\n\
--N, +after-date DATE,\n\
-    +newer DATE		only store files newer than DATE\n\
--o, +old-archive,\n\
-    +portability	write a V7 format archive, rather than ANSI format\n\
--O, +to-stdout		extract files to standard output\n\
--p, +same-permissions,\n\
-    +preserve-permissions extract all protection information\n\
--P, +absolute-paths	don't strip leading `/'s from file names\n\
-+preserve		like -p -s\n\
+-m, --modification-time	don't extract file modified time\n\
+-M, --multi-volume	create/list/extract multi-volume archive\n\
+-N, --after-date DATE,\n\
+    --newer DATE		only store files newer than DATE\n\
+-o, --old-archive,\n\
+    --portability	write a V7 format archive, rather than ANSI format\n\
+-O, --to-stdout		extract files to standard output\n\
+-p, --same-permissions,\n\
+    --preserve-permissions extract all protection information\n\
+-P, --absolute-paths	don't strip leading `/'s from file names\n\
+--preserve		like -p -s\n\
 ", stdout); /* KLUDGE */ fputs("\
--R, +record-number	show record number within archive with each message\n\
--s, +same-order,\n\
-    +preserve-order	list of names to extract is sorted to match archive\n\
-+same-order		create extracted files with the same ownership \n\
--S, +sparse		handle sparse files efficiently\n\
--T, +files-from F	get names to extract or create from file F\n\
-+null			-T reads null-terminated names, disable -C\n\
-+totals			print total bytes written with +create\n\
--v, +verbose		verbosely list files processed\n\
--V, +label NAME		create archive with volume name NAME\n\
-+version		print tar program version number\n\
--w, +interactive,\n\
-    +confirmation	ask for confirmation for every action\n\
+-R, --record-number	show record number within archive with each message\n\
+--remove-files		remove files after adding them to the archive\n\
+-s, --same-order,\n\
+    --preserve-order	list of names to extract is sorted to match archive\n\
+--same-order		create extracted files with the same ownership \n\
+-S, --sparse		handle sparse files efficiently\n\
+-T, --files-from F	get names to extract or create from file F\n\
+--null			-T reads null-terminated names, disable -C\n\
+--totals			print total bytes written with --create\n\
+-v, --verbose		verbosely list files processed\n\
+-V, --label NAME		create archive with volume name NAME\n\
+--version		print tar program version number\n\
+-w, --interactive,\n\
+    --confirmation	ask for confirmation for every action\n\
 ", stdout); /* KLUDGE */ fputs("\
--W, +verify		attempt to verify the archive after writing it\n\
-+exclude FILE		exclude file FILE\n\
--X, +exclude-from FILE	exclude files listed in FILE\n\
--z, -Z, +compress,\n\
-    +uncompress      	filter the archive through compress\n\
+-W, --verify		attempt to verify the archive after writing it\n\
+--exclude FILE		exclude file FILE\n\
+-X, --exclude-from FILE	exclude files listed in FILE\n\
+-z, -Z, --compress,\n\
+    --uncompress      	filter the archive through compress\n\
 -[0-7][lmh]		specify drive and density\n\
 ", stdout);
 }