[haiku-commits] haiku: hrev43875 - src/add-ons/kernel/file_systems/iso9660

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 18 Mar 2012 15:05:36 +0100 (CET)

hrev43875 adds 1 changeset to branch 'master'
old head: 12c10314f945b805b99210abc9aebb07ecede4b0
new head: e766bb9e26a5dfd65caa82d8a7dd9f3c91d5c3e8

----------------------------------------------------------------------------

e766bb9: Fix iso9660 add-on.
  
  hrev43777 introduced a regression that resulted in the symlink flag byte
  no longer getting skipped in non-trace builds. Fixes #8369.

                                      [ Rene Gollent <anevilyak@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43875
Commit:      e766bb9e26a5dfd65caa82d8a7dd9f3c91d5c3e8
URL:         http://cgit.haiku-os.org/haiku/commit/?id=e766bb9
Author:      Rene Gollent <anevilyak@xxxxxxxxx>
Date:        Sun Mar 18 14:04:18 2012 UTC

Ticket:      https://dev.haiku-os.org/ticket/8369

----------------------------------------------------------------------------

1 files changed, 3 insertions(+), 0 deletions(-)
.../kernel/file_systems/iso9660/iso9660.cpp        |    3 +++

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp 
b/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
index d64b45b..039c57d 100644
--- a/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
+++ b/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
@@ -369,6 +369,9 @@ parse_rock_ridge(iso9660_volume* volume, iso9660_inode* 
node, char* buffer,
 #if TRACE_ISO9660
                                uint8 slFlags = *(uint8*)(buffer + bytePos++);
                                TRACE(("sl flags are %u\n", slFlags));
+#else
+                               // skip symlink flags
+                               ++bytePos;
 #endif
                                while (!slDone && bytePos < length) {
                                        uint8 compFlag = *(uint8*)(buffer + 
bytePos++);


Other related posts: