projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
re-mark 1.29b-2 as not yet uploaded (merge madness!)
[debian/tar]
/
src
/
update.c
diff --git
a/src/update.c
b/src/update.c
index b0151759d9b0430b34086d013a29efae722d99ce..ad7a6bf78be480efa1ecdb71866c90340c892020 100644
(file)
--- a/
src/update.c
+++ b/
src/update.c
@@
-1,21
+1,22
@@
/* Update a tar archive.
/* Update a tar archive.
- Copyright
(C) 1988, 1992, 1994, 1996, 1997, 1999, 2000, 2001, 2003
,
- 20
04, 2005, 2007, 2010
Free Software Foundation, Inc.
+ Copyright
1988, 1992, 1994, 1996-1997, 1999-2001, 2003-2005, 2007
,
+ 20
10, 2013-2014, 2016
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 3, or (at your option) any later
- version.
+ This file is part of GNU tar.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-
Public License for more details
.
+ GNU tar 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 3 of the License, or
+
(at your option) any later version
.
- 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ GNU tar is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* 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
/* 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
@@
-47,7
+48,7
@@
char *output_start;
static void
append_file (char *file_name)
{
static void
append_file (char *file_name)
{
- int handle = open
(
file_name, O_RDONLY | O_BINARY);
+ int handle = open
at (chdir_fd,
file_name, O_RDONLY | O_BINARY);
struct stat stat_data;
if (handle < 0)
struct stat stat_data;
if (handle < 0)
@@
-114,8
+115,8
@@
update_archive (void)
while (!found_end)
{
while (!found_end)
{
- enum read_header status = read_header (¤t_header,
- ¤t_stat_info,
+ enum read_header status = read_header (¤t_header,
+ ¤t_stat_info,
read_header_auto);
switch (status)
read_header_auto);
switch (status)
@@
-130,6
+131,8
@@
update_archive (void)
decode_header (current_header, ¤t_stat_info,
¤t_format, 0);
decode_header (current_header, ¤t_stat_info,
¤t_format, 0);
+ transform_stat_info (current_header->header.typeflag,
+ ¤t_stat_info);
archive_format = current_format;
if (subcommand_option == UPDATE_SUBCOMMAND
archive_format = current_format;
if (subcommand_option == UPDATE_SUBCOMMAND
@@
-138,26
+141,22
@@
update_archive (void)
struct stat s;
chdir_do (name->change_dir);
struct stat s;
chdir_do (name->change_dir);
- if (deref_stat (dereference_option,
- current_stat_info.file_name, &s) == 0)
+ if (deref_stat (current_stat_info.file_name, &s) == 0)
{
if (S_ISDIR (s.st_mode))
{
{
if (S_ISDIR (s.st_mode))
{
- char *p, *dirp;
- dirp = savedir (name->name);
- if (!dirp)
- savedir_error (name->name);
- else
+ char *p, *dirp = tar_savedir (name->name, 1);
+ if (dirp)
{
namebuf_t nbuf = namebuf_create (name->name);
{
namebuf_t nbuf = namebuf_create (name->name);
-
+
for (p = dirp; *p; p += strlen (p) + 1)
addname (namebuf_name (nbuf, p),
0, false, NULL);
for (p = dirp; *p; p += strlen (p) + 1)
addname (namebuf_name (nbuf, p),
0, false, NULL);
-
+
namebuf_free (nbuf);
free (dirp);
namebuf_free (nbuf);
free (dirp);
-
+
remname (name);
}
}
remname (name);
}
}
@@
-167,7
+166,7
@@
update_archive (void)
remname (name);
}
}
remname (name);
}
}
-
+
skip_member ();
break;
}
skip_member ();
break;
}
@@
-217,18
+216,19
@@
update_archive (void)
while ((p = name_from_list ()) != NULL)
{
char *file_name = p->name;
while ((p = name_from_list ()) != NULL)
{
char *file_name = p->name;
- if (excluded_name (file_name))
+ if (excluded_name (file_name
, NULL
))
continue;
if (interactive_option && !confirm ("add", file_name))
continue;
if (subcommand_option == CAT_SUBCOMMAND)
append_file (file_name);
else
continue;
if (interactive_option && !confirm ("add", file_name))
continue;
if (subcommand_option == CAT_SUBCOMMAND)
append_file (file_name);
else
- dump_file (
file_name, 1, (dev_t) 0
);
+ dump_file (
0, file_name, file_name
);
}
}
write_eot ();
close_archive ();
}
}
write_eot ();
close_archive ();
+ finish_deferred_unlinks ();
names_notfound ();
}
names_notfound ();
}