X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/c6de44b989e9d7286337e4cbf4d82d919f9120e6..45e1f8b055043e54be35462852ab6649d634da7c:/lunaix-os/includes/lunaix/fs/iso9660.h

diff --git a/lunaix-os/includes/lunaix/fs/iso9660.h b/lunaix-os/includes/lunaix/fs/iso9660.h
index de433d4..1a6aee2 100644
--- a/lunaix-os/includes/lunaix/fs/iso9660.h
+++ b/lunaix-os/includes/lunaix/fs/iso9660.h
@@ -14,17 +14,18 @@
 
 #include <lunaix/clock.h>
 #include <lunaix/device.h>
+#include <lunaix/fs.h>
 #include <lunaix/types.h>
 
 #define ISO_SIGNATURE_LO 0x30304443UL
 #define ISO_SIGNATURE_HI 0x31
 
 // Volume Types
-#define ISO_VOLBOOT 0   // Boot Record
-#define ISO_VOLPRIM 1   // Primary
-#define ISO_VOLSUPP 2   // Supplementary
-#define ISO_VOLPART 3   // Partition
-#define ISO_VOLTERM 255 // Volume descriptor set terminator
+#define ISO_VOLBOOT 0     // Boot Record
+#define ISO_VOLPRIM 1     // Primary
+#define ISO_VOLSUPP 2     // Supplementary
+#define ISO_VOLPART 3     // Partition
+#define ISO_VOLTERM 255   // Volume descriptor set terminator
 
 #define ISO_FHIDDEN 0x1   // a hidden file
 #define ISO_FDIR 0x2      // a directory file
@@ -35,6 +36,7 @@
 
 #define ISO9660_BLKSZ 2048
 #define ISO9660_IDLEN 256
+#define ISO9660_READ_OFF (ISO9660_BLKSZ * 16)
 
 // NOTES:
 // Each Descriptor sized 1 logical block (2048 bytes in common cases)
@@ -135,38 +137,31 @@ struct iso_var_mdu
     u8_t content[0];
 } PACKED;
 
+struct iso_datetime2
+{
+    u8_t year;
+    u8_t month;
+    u8_t day;
+    u8_t hour;
+    u8_t min;
+    u8_t sec;
+    u8_t gmt;
+} PACKED;
+
 // (9.1) Directory Record [Embedded into Variable MDU]
 struct iso_drecord
 {
     u8_t xattr_len;
     iso_bbo32_t extent_addr;
     iso_bbo32_t data_size;
-    struct
-    {
-        u8_t year;
-        u8_t month;
-        u8_t day;
-        u8_t hour;
-        u8_t min;
-        u8_t sec;
-        u8_t gmt;
-    } PACKED mktime; // Time the record is made, see 9.1.5
+    struct iso_datetime2 mktime; // Time the record is made, see 9.1.5
     u8_t flags;
-    u8_t fu_sz;  // size of file unit (FU)
-    u8_t gap_sz; // size of gap if FU is interleaved.
+    u8_t fu_sz;                  // size of file unit (FU)
+    u8_t gap_sz;                 // size of gap if FU is interleaved.
     iso_bbo16_t vol_seq;
     struct iso_var_mdu name;
 } PACKED;
 
-// (9.4) L-Path Table Record. [Embedded into Variable MDU]
-struct iso_precord
-{
-    u8_t xattr_len;
-    u32_t extent_addr;
-    u8_t parent; // indexed into path table
-    u8_t id[0];  // length = iso_var_mdu::len
-} PACKED;
-
 struct iso_xattr
 {
     iso_bbo16_t owner;
@@ -190,24 +185,95 @@ struct iso_xattr
     // It however marked as optional, hence we ignore it.
 } PACKED;
 
-struct iso_ptable
+///
+/// -------- IEEE P1281 SUSP ---------
+///
+
+#define ISOSU_ER 0x5245
+#define ISOSU_ST 0x5453
+
+struct isosu_base
 {
-    u32_t start_lba;
-    u32_t current_lba;
-    u32_t size;
-    u32_t range_lower;
-    u32_t range_upper;
-    void* ptable_part;
-};
+    u16_t signature;
+    u8_t length;
+    u8_t version;
+} PACKED;
+
+struct isosu_er
+{
+    struct isosu_base header;
+    u8_t id_len;
+    u8_t des_len;
+    u8_t src_len;
+    u8_t ext_ver;
+    u8_t id_des_src[0];
+} PACKED;
+
+///
+/// -------- Rock Ridge Extension --------
+///
+
+#define ISORR_PX 0x5850
+#define ISORR_PN 0x4e50
+#define ISORR_SL 0x4c53
+#define ISORR_NM 0x4d4e
+#define ISORR_TF 0x4654
+
+#define ISORR_NM_CONT 0x1
+
+#define ISORR_TF_CTIME 0x1
+#define ISORR_TF_MTIME 0x2
+#define ISORR_TF_ATIME 0x4
+#define ISORR_TF_LONG_FORM 0x80
+
+struct isorr_px
+{
+    struct isosu_base header;
+    iso_bbo32_t mode;
+    iso_bbo32_t link;
+    iso_bbo32_t uid;
+    iso_bbo32_t gid;
+    iso_bbo32_t sn;
+} PACKED;
+
+struct isorr_pn
+{
+    struct isosu_base header;
+    iso_bbo32_t dev_hi;
+    iso_bbo32_t dev_lo;
+} PACKED;
+
+struct isorr_sl
+{
+    struct isosu_base header;
+    u8_t flags;
+    char symlink[0];
+} PACKED;
+
+struct isorr_nm
+{
+    struct isosu_base header;
+    u8_t flags;
+    char name[0];
+} PACKED;
+
+struct isorr_tf
+{
+    struct isosu_base header;
+    u8_t flags;
+    char times[0];
+} PACKED;
+
+///
+/// -------- VFS integration ---------
+///
 
 struct iso_inode
 {
-    time_t ctime;
-    time_t mtime;
     u32_t record_fmt;
     u32_t fu_size;
     u32_t gap_size;
-    struct llist_header* drecaches;
+    struct llist_header drecaches;
 };
 
 struct iso_drecache
@@ -216,9 +282,13 @@ struct iso_drecache
     u32_t extent_addr;
     u32_t data_size;
     u32_t xattr_len;
+    u32_t fno;
     u32_t fu_size;
     u32_t gap_size;
     u32_t flags;
+    time_t ctime;
+    time_t atime;
+    time_t mtime;
     struct hstr name;
     char name_val[ISO9660_IDLEN];
 };
@@ -238,6 +308,9 @@ iso9660_fill_inode(struct v_inode* inode, struct iso_drecache* dir, int ino);
 time_t
 iso9660_dt2unix(struct iso_datetime* isodt);
 
+time_t
+iso9660_dt22unix(struct iso_datetime2* isodt2);
+
 void
 iso9660_init();
 
@@ -245,7 +318,9 @@ int
 iso9660_setup_dnode(struct v_dnode* dnode, struct v_inode* inode);
 
 void
-iso9660_fill_drecache(struct iso_drecache* cache, struct iso_drecord* drec);
+iso9660_fill_drecache(struct iso_drecache* cache,
+                      struct iso_drecord* drec,
+                      u32_t len);
 
 int
 iso9660_dir_lookup(struct v_inode* this, struct v_dnode* dnode);
@@ -268,4 +343,13 @@ iso9660_write(struct v_inode* inode, void* buffer, size_t len, size_t fpos);
 int
 iso9660_seek(struct v_inode* inode, size_t offset);
 
+int
+isorr_parse_px(struct iso_drecache* cache, void* px_start);
+
+int
+isorr_parse_nm(struct iso_drecache* cache, void* nm_start);
+
+int
+isorr_parse_tf(struct iso_drecache* cache, void* tf_start);
+
 #endif /* __LUNAIX_ISO9660_H */