From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Fri, 15 Jan 2010 16:51:56 +0000 (-0500)
Subject: Fix a bug that the nlink of regular files, which are not hard linking,
X-Git-Tag: v2.8.0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4392d8299dcf164811d4257ee673c28aa913534;p=thirdparty%2Flibarchive.git

Fix a bug that the nlink of regular files, which are not hard linking,
was not set when rockridge was disabled.

SVN-Revision: 1814
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 7bc031af8..0c640c88e 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -1858,6 +1858,7 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
 			iso9660->opt_support_rockridge = 0;
 	}
 
+	file->nlinks = 1;/* Reset nlink. we'll calculate it later. */
 	/* Tell file's parent how many children that parent has. */
 	if (parent != NULL && (flags & 0x02) && file->cl_offset == 0)
 		parent->subdirs++;