aboutsummaryrefslogtreecommitdiffstats
path: root/core/fs/iso9660/iso9660_fs.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-02-12 09:56:15 -0800
committerH. Peter Anvin <hpa@zytor.com>2014-02-12 09:56:15 -0800
commit83730db928b303bc3e9f7bd35c2e64cd85ab0267 (patch)
treeb383a3263acc13360ab4e6f9c3ac5d5f85888d2b /core/fs/iso9660/iso9660_fs.h
parent9376eaf8582bcec4aebd697d33836f0d180aee13 (diff)
parent5de463f724da515fd6c5ea49ded6dde178362181 (diff)
downloadsyslinux-83730db928b303bc3e9f7bd35c2e64cd85ab0267.tar.gz
syslinux-83730db928b303bc3e9f7bd35c2e64cd85ab0267.tar.xz
syslinux-83730db928b303bc3e9f7bd35c2e64cd85ab0267.zip
Merge remote-tracking branch 'origin/rockridge'
Resolved Conflicts: com32/include/byteswap.h Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/fs/iso9660/iso9660_fs.h')
-rw-r--r--core/fs/iso9660/iso9660_fs.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/fs/iso9660/iso9660_fs.h b/core/fs/iso9660/iso9660_fs.h
index a365fa1a..40265642 100644
--- a/core/fs/iso9660/iso9660_fs.h
+++ b/core/fs/iso9660/iso9660_fs.h
@@ -37,6 +37,11 @@ struct iso_dir_entry {
struct iso_sb_info {
struct iso_dir_entry root;
+
+ int do_rr; /* 1 , 2 = try to process Rock Ridge info , 0 = do not.
+ 2 indicates that the id of RRIP 1.12 was found.
+ */
+ int susp_skip; /* Skip length from SUSP entry SP */
};
/*