/* Update a tar archive.
- Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001, 2003
- Free Software Foundation, Inc.
+ Copyright (C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001, 2003,
+ 2004, 2005, 2007, 2010 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any later
+ Free Software Foundation; either version 3, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Implement the 'r', 'u' and 'A' options for tar. 'A' means that the
file names are tar files, and they should simply be appended to the end
of the archive. No attempt is made to record the reads from the args; if
they're on raw tape or something like that, it'll probably lose... */
-#include "system.h"
+#include <system.h>
#include <quotearg.h>
#include "common.h"
/* We've hit the end of the old stuff, and its time to start writing new
stuff to the tape. This involves seeking back one record and
- re-writing the current record (which has been changed). */
-int time_to_start_writing;
+ re-writing the current record (which has been changed).
+ FIXME: Either eliminate it or move it to common.h.
+*/
+bool time_to_start_writing;
/* Pointer to where we started to write in the first record we write out.
This is used if we can't backspace the output and have to null out the
first part of the record. */
char *output_start;
-/* Catenate file PATH to the archive without creating a header for it.
+/* Catenate file FILE_NAME to the archive without creating a header for it.
It had better be a tar file or the archive is screwed. */
static void
-append_file (char *path)
+append_file (char *file_name)
{
- int handle = open (path, O_RDONLY | O_BINARY);
+ int handle = open (file_name, O_RDONLY | O_BINARY);
struct stat stat_data;
if (handle < 0)
{
- open_error (path);
+ open_error (file_name);
return;
}
if (fstat (handle, &stat_data) != 0)
- stat_error (path);
+ stat_error (file_name);
else
{
off_t bytes_left = stat_data.st_size;
{
union block *start = find_next_block ();
size_t buffer_size = available_space_after (start);
- ssize_t status;
+ size_t status;
char buf[UINTMAX_STRSIZE_BOUND];
if (bytes_left < buffer_size)
}
status = safe_read (handle, start->buffer, buffer_size);
- if (status < 0)
- read_fatal_details (path, stat_data.st_size - bytes_left,
+ if (status == SAFE_READ_ERROR)
+ read_fatal_details (file_name, stat_data.st_size - bytes_left,
buffer_size);
if (status == 0)
FATAL_ERROR ((0, 0,
ngettext ("%s: File shrank by %s byte",
"%s: File shrank by %s bytes",
bytes_left),
- quotearg_colon (path),
+ quotearg_colon (file_name),
STRINGIFY_BIGINT (bytes_left, buf)));
bytes_left -= status;
}
if (close (handle) != 0)
- close_error (path);
+ close_error (file_name);
}
/* Implement the 'r' (add files to end of archive), and 'u' (add files
update_archive (void)
{
enum read_header previous_status = HEADER_STILL_UNREAD;
- int found_end = 0;
+ bool found_end = false;
name_gather ();
open_archive (ACCESS_UPDATE);
+ buffer_write_global_xheader ();
while (!found_end)
{
- enum read_header status = read_header (false);
+ enum read_header status = read_header (¤t_header,
+ ¤t_stat_info,
+ read_header_auto);
switch (status)
{
{
struct name *name;
+ decode_header (current_header, ¤t_stat_info,
+ ¤t_format, 0);
+ archive_format = current_format;
+
if (subcommand_option == UPDATE_SUBCOMMAND
- && (name = name_scan (current_stat_info.file_name), name))
+ && (name = name_scan (current_stat_info.file_name)) != NULL)
{
struct stat s;
- enum archive_format unused;
- decode_header (current_header, ¤t_stat_info, &unused, 0);
chdir_do (name->change_dir);
- if (deref_stat (dereference_option, current_stat_info.file_name, &s) == 0
- && s.st_mtime <= current_stat_info.stat.st_mtime)
- add_avoided_name (current_stat_info.file_name);
+ if (deref_stat (dereference_option,
+ current_stat_info.file_name, &s) == 0)
+ {
+ if (S_ISDIR (s.st_mode))
+ {
+ char *p, *dirp;
+ dirp = savedir (name->name);
+ if (!dirp)
+ savedir_error (name->name);
+ else
+ {
+ namebuf_t nbuf = namebuf_create (name->name);
+
+ for (p = dirp; *p; p += strlen (p) + 1)
+ addname (namebuf_name (nbuf, p),
+ 0, false, NULL);
+
+ namebuf_free (nbuf);
+ free (dirp);
+
+ remname (name);
+ }
+ }
+ else if (tar_timespec_cmp (get_stat_mtime (&s),
+ current_stat_info.mtime)
+ <= 0)
+ remname (name);
+ }
}
+
skip_member ();
break;
}
case HEADER_ZERO_BLOCK:
current_block = current_header;
- found_end = 1;
+ found_end = true;
break;
case HEADER_END_OF_FILE:
- found_end = 1;
+ found_end = true;
break;
case HEADER_FAILURE:
break;
}
+ tar_stat_destroy (¤t_stat_info);
previous_status = status;
}
reset_eof ();
- time_to_start_writing = 1;
+ time_to_start_writing = true;
output_start = current_block->buffer;
{
- char *path;
-
- while (path = name_from_list (), path)
+ struct name const *p;
+ while ((p = name_from_list ()) != NULL)
{
- if (excluded_name (path))
+ char *file_name = p->name;
+ if (excluded_name (file_name))
continue;
- if (interactive_option && !confirm ("add", path))
+ if (interactive_option && !confirm ("add", file_name))
continue;
if (subcommand_option == CAT_SUBCOMMAND)
- append_file (path);
+ append_file (file_name);
else
- dump_file (path, 1, (dev_t) 0);
+ dump_file (0, file_name, file_name);
}
}
write_eot ();
close_archive ();
+ finish_deferred_unlinks ();
names_notfound ();
}
projects / chaz / tar / blobdiff