Changeset 9c96634 in mainline

Timestamp:

2017-05-15T18:29:10Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fec333b3

Parents:

8d2dd7f2

Message:

CDFS decoding of volume label.

Files:

• boot/Makefile.grub (modified) (1 diff)
• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (12 diffs)
• uspace/srv/volsrv/part.c (modified) (1 diff)

boot/Makefile.grub

@@ -51 +51 @@
 $(BOOT_OUTPUT): build_dist
 ifeq ($(GRUB_ARCH),pc)
-        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
+        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS-CD" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
 endif
 ifeq ($(GRUB_ARCH),efi)
-        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" --efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
+        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS-CD" --efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
 endif
 

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -208 +208 @@
         service_id_t service_id;  /**< Service ID of block device */
         cdfs_enc_t enc;           /**< Filesystem string encoding */
+        char *vol_ident;          /**< Volume identifier */
 } cdfs_t;
 
@@ -483 +484 @@
  * @param data  File name buffer
  * @param dsize Fine name buffer size
+ * @param enc   Encoding
  * @param dtype Directory entry type
  * @return      Decoded file name (allocated string)
@@ -515 +517 @@
         
         return name;
+}
+
+/** Decode volume identifier.
+ *
+ * @param data  Volume identifier buffer
+ * @param dsize Volume identifier buffer size
+ * @param enc   Encoding
+ * @return      Decoded volume identifier (allocated string)
+ */
+static char *cdfs_decode_vol_ident(void *data, size_t dsize, cdfs_enc_t enc)
+{
+        char *ident;
+        size_t i;
+        
+        ident = cdfs_decode_str(data, dsize, enc);
+        if (ident == NULL)
+                return NULL;
+        
+        /* Trim trailing spaces */
+        i = str_size(ident);
+        while (i > 0 && ident[i - 1] == ' ')
+                --i;
+        ident[i] = '\0';
+        
+        return ident;
 }
 
@@ -841 +868 @@
  * @param rlba          Place to store LBA of root dir
  * @param rsize         Place to store size of root dir
+ * @param vol_ident     Place to store pointer to volume identifier
  * @return              EOK if found, ENOENT if not
  */
 static int cdfs_find_joliet_svd(service_id_t sid, cdfs_lba_t altroot,
-    uint32_t *rlba, uint32_t *rsize)
+    uint32_t *rlba, uint32_t *rsize, char **vol_ident)
 {
         cdfs_lba_t bi;
@@ -899 +927 @@
                 *rlba = uint32_lb(vol_desc->data.prisec.root_dir.lba);
                 *rsize = uint32_lb(vol_desc->data.prisec.root_dir.size);
+
+                *vol_ident = cdfs_decode_vol_ident(vol_desc->data.prisec.ident,
+                    32, enc_ucs2);
+
                 block_put(block);
                 return EOK;
@@ -908 +940 @@
 /** Read the volume descriptors. */
 static bool iso_read_vol_desc(service_id_t sid, cdfs_lba_t altroot,
-    uint32_t *rlba, uint32_t *rsize, cdfs_enc_t *enc)
+    uint32_t *rlba, uint32_t *rsize, cdfs_enc_t *enc, char **vol_ident)
 {
         /* First 16 blocks of isofs are empty */
@@ -962 +994 @@
         uint32_t jrsize;
         
-        rc = cdfs_find_joliet_svd(sid, altroot, &jrlba, &jrsize);
+        rc = cdfs_find_joliet_svd(sid, altroot, &jrlba, &jrsize, vol_ident);
         if (rc == EOK) {
                 /* Found */
@@ -972 +1004 @@
                 *rsize = uint32_lb(vol_desc->data.prisec.root_dir.size);
                 *enc = enc_ascii;
+                *vol_ident = cdfs_decode_vol_ident(vol_desc->data.prisec.ident,
+                    32, enc_ascii);
         }
         
@@ -986 +1020 @@
         
         rc = iso_read_vol_desc(fs->service_id, altroot, &node->lba,
-            &node->size, &fs->enc);
+            &node->size, &fs->enc, &fs->vol_ident);
         if (rc != EOK)
                 return false;
@@ -1032 +1066 @@
 static int cdfs_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
 {
+        char *vol_ident;
+
         /* Initialize the block layer */
         int rc = block_init(service_id, BLOCK_SIZE);
@@ -1070 +1106 @@
         uint32_t rsize;
         cdfs_enc_t enc;
-        if (!iso_read_vol_desc(service_id, altroot, &rlba, &rsize, &enc)) {
+        if (!iso_read_vol_desc(service_id, altroot, &rlba, &rsize, &enc,
+            &vol_ident)) {
                 block_cache_fini(service_id);
                 block_fini(service_id);
                 return EIO;
         }
+        
+        str_cpy(info->label, FS_LABEL_MAXLEN + 1, vol_ident);
+        free(vol_ident);
         
         return EOK;
@@ -1160 +1200 @@
         block_cache_fini(fs->service_id);
         block_fini(fs->service_id);
+        free(fs->vol_ident);
         free(fs);
 }

uspace/srv/volsrv/part.c

@@ -182 +182 @@
 
         if (fst->name != NULL) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Found %s", fst->name);
+                log_msg(LOG_DEFAULT, LVL_NOTE, "Found %s, label '%s'",
+                    fst->name, info.label);
                 part->pcnt = vpc_fs;
                 part->fstype = fst->fstype;