projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 1.28
[debian/tar]
/
src
/
create.c
diff --git
a/src/create.c
b/src/create.c
index 4344a24747eeda16d2fc3b7b74adb75917a4bfc3..e2f4ede6b8d12c1200c931f9f425c9537a72906b 100644
(file)
--- a/
src/create.c
+++ b/
src/create.c
@@
-1,7
+1,7
@@
/* Create a tar archive.
Copyright 1985, 1992-1994, 1996-1997, 1999-2001, 2003-2007,
/* Create a tar archive.
Copyright 1985, 1992-1994, 1996-1997, 1999-2001, 2003-2007,
- 2009-2010, 2012-201
3
Free Software Foundation, Inc.
+ 2009-2010, 2012-201
4
Free Software Foundation, Inc.
This file is part of GNU tar.
This file is part of GNU tar.
@@
-1113,6
+1113,8
@@
dump_dir0 (struct tar_stat_info *st, char const *directory)
if (!blk)
return;
if (!blk)
return;
+ info_attach_exclist (st);
+
if (incremental_option && archive_format != POSIX_FORMAT)
blk->header.typeflag = GNUTYPE_DUMPDIR;
else /* if (standard_option) */
if (incremental_option && archive_format != POSIX_FORMAT)
blk->header.typeflag = GNUTYPE_DUMPDIR;
else /* if (standard_option) */
@@
-1196,7
+1198,7
@@
dump_dir0 (struct tar_stat_info *st, char const *directory)
char const *entry;
size_t entry_len;
size_t name_len;
char const *entry;
size_t entry_len;
size_t name_len;
-
+
name_buf = xstrdup (st->orig_file_name);
name_size = name_len = strlen (name_buf);
name_buf = xstrdup (st->orig_file_name);
name_size = name_len = strlen (name_buf);
@@
-1210,7
+1212,7
@@
dump_dir0 (struct tar_stat_info *st, char const *directory)
name_buf = xrealloc (name_buf, name_size + 1);
}
strcpy (name_buf + name_len, entry);
name_buf = xrealloc (name_buf, name_size + 1);
}
strcpy (name_buf + name_len, entry);
- if (!excluded_name (name_buf))
+ if (!excluded_name (name_buf
, st
))
dump_file (st, entry, name_buf);
}
dump_file (st, entry, name_buf);
}
@@
-1288,7
+1290,7
@@
get_directory_entries (struct tar_stat_info *st)
while (! (st->dirstream = fdopendir (st->fd)))
if (! open_failure_recover (st))
return 0;
while (! (st->dirstream = fdopendir (st->fd)))
if (! open_failure_recover (st))
return 0;
- return streamsavedir (st->dirstream);
+ return streamsavedir (st->dirstream
, savedir_sort_order
);
}
/* Dump the directory ST. Return true if successful, false (emitting
}
/* Dump the directory ST. Return true if successful, false (emitting
@@
-1339,12
+1341,12
@@
create_archive (void)
collect_and_sort_names ();
while ((p = name_from_list ()) != NULL)
collect_and_sort_names ();
while ((p = name_from_list ()) != NULL)
- if (!excluded_name (p->name))
+ if (!excluded_name (p->name
, NULL
))
dump_file (0, p->name, p->name);
blank_name_list ();
while ((p = name_from_list ()) != NULL)
dump_file (0, p->name, p->name);
blank_name_list ();
while ((p = name_from_list ()) != NULL)
- if (!excluded_name (p->name))
+ if (!excluded_name (p->name
, NULL
))
{
struct tar_stat_info st;
size_t plen = strlen (p->name);
{
struct tar_stat_info st;
size_t plen = strlen (p->name);
@@
-1358,7
+1360,7
@@
create_archive (void)
if (! ISSLASH (buffer[plen - 1]))
buffer[plen++] = DIRECTORY_SEPARATOR;
tar_stat_init (&st);
if (! ISSLASH (buffer[plen - 1]))
buffer[plen++] = DIRECTORY_SEPARATOR;
tar_stat_init (&st);
- q = directory_contents (
gnu_list_name
->directory);
+ q = directory_contents (
p
->directory);
if (q)
while (*q)
{
if (q)
while (*q)
{
@@
-1401,7
+1403,7
@@
create_archive (void)
{
const char *name;
while ((name = name_next (1)) != NULL)
{
const char *name;
while ((name = name_next (1)) != NULL)
- if (!excluded_name (name))
+ if (!excluded_name (name
, NULL
))
dump_file (0, name, name);
}
dump_file (0, name, name);
}