d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to hardlink directories. While I'm here, expand some

Browse Source 
comments to make this section of code a little clearer.
This commit is contained in:
Tim Kientzle 2008-07-01 05:45:03 +00:00
parent a9f1ad5de1
commit 77f719e605
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/cpio/cpio.c
View File

@ -535,16 +535,23 @@ entry_to_archive(struct cpio *cpio, struct archive_entry *entry)
fprintf(stderr,"%s", destpath);
/*
* Obviously, this only gets invoked in pass mode.
* Obviously, this only gets invoked in pass mode, since
* option_link is nonsense otherwise. Note that we can't
* hardlink dirs, and that if a link operation fails (because
* of cross-device restrictions), we'll fall back to copy mode
* for that entry.
*/
if (cpio->option_link) {
if (cpio->option_link
&& archive_entry_filetype(entry) != AE_IFDIR)
{
struct archive_entry *t;
/* Save the original entry in case we need it later. */
t = archive_entry_clone(entry);
if (t == NULL)
cpio_errc(1, ENOMEM, "Can't create link");
/* Note: link(2) doesn't create parent directories,
* so we use archive_write_header() instead. */
* so we use archive_write_header() instead as a
* convenience. */
archive_entry_set_hardlink(t, srcpath);
/* This is a straight link that carries no data. */
archive_entry_set_size(t, 0);