Author: mm
Date: Sun Jan 29 22:12:48 2012
New Revision: 230758
URL: http://svn.freebsd.org/changeset/base/230758

Log:
  Update to vendor revision 4183
  
  Obtained from:        http://libarchive.googlecode.com/svn/release/2.8

Modified:
  vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c

Modified: 
vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c
==============================================================================
--- vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c     
Sun Jan 29 21:58:18 2012        (r230757)
+++ vendor/libarchive/dist/libarchive/archive_read_support_format_iso9660.c     
Sun Jan 29 22:12:48 2012        (r230758)
@@ -1775,6 +1775,19 @@ parse_file_info(struct archive_read *a, 
                                free(file);
                                return (NULL);
                        }
+                       /*
+                        * A file size of symbolic link files in ISO images
+                        * made by makefs is not zero and its location is
+                        * the same as those of next regular file. That is
+                        * the same as hard like file and it causes unexpected
+                        * error. 
+                        */
+                       if (file->size > 0 &&
+                           (file->mode & AE_IFMT) == AE_IFLNK) {
+                               file->size = 0;
+                               file->number = -1;
+                               file->offset = -1;
+                       }
                } else
                        /* If there isn't SUSP, disable parsing
                         * rock ridge extensions. */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to