Changeset b209135 in mainline

Timestamp:

2018-10-03T12:19:02Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba36a0

Parents:

2175178

git-author:

Jiri Svoboda <jiri@…> (2018-10-02 22:18:01)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-03 12:19:02)

Message:

Reading volume label from ext4 file system.

Location:

uspace/lib/ext4

Files:

• include/ext4/filesystem.h (modified) (1 diff)
• include/ext4/superblock.h (modified) (1 diff)
• include/ext4/types.h (modified) (1 diff)
• src/filesystem.c (modified) (2 diffs)
• src/ops.c (modified) (1 diff)
• src/superblock.c (modified) (2 diffs)

uspace/lib/ext4/include/ext4/filesystem.h

@@ -41 +41 @@
 #include "ext4/types.h"
 
-extern errno_t ext4_filesystem_probe(service_id_t);
+extern errno_t ext4_filesystem_probe(service_id_t, ext4_fs_probe_info_t *);
 extern errno_t ext4_filesystem_create(ext4_cfg_ver_t, service_id_t);
 extern errno_t ext4_filesystem_open(ext4_instance_t *, service_id_t,

uspace/lib/ext4/include/ext4/superblock.h

@@ -118 +118 @@
 extern void ext4_superblock_get_uuid(ext4_superblock_t *, uuid_t *);
 extern void ext4_superblock_set_uuid(ext4_superblock_t *, uuid_t *);
-extern const char *ext4_superblock_get_volume_name(ext4_superblock_t *);
+extern errno_t ext4_superblock_get_volume_name(ext4_superblock_t *, char *,
+    size_t);
 extern void ext4_superblock_set_volume_name(ext4_superblock_t *, const char *);
 extern const char *ext4_superblock_get_last_mounted(ext4_superblock_t *);

uspace/lib/ext4/include/ext4/types.h

@@ -235 +235 @@
 } ext4_filesystem_t;
 
+typedef struct {
+        /** Volume name, to hold 16 latin-1 chars in UTF-8 and null terminator
+         * we need 2 * 16 + 1 bytes
+         */
+        char vol_name[33];
+} ext4_fs_probe_info_t;
+
 #define EXT4_BLOCK_GROUP_INODE_UNINIT   0x0001  /* Inode table/bitmap not in use */
 #define EXT4_BLOCK_GROUP_BLOCK_UNINIT   0x0002  /* Block bitmap not in use */

uspace/lib/ext4/src/filesystem.c

@@ -374 +374 @@
  *
  * @param service_id Block device to probe
+ * @param info Place to store probe information
  *
  * @return EOK or an error code.
  *
  */
-errno_t ext4_filesystem_probe(service_id_t service_id)
+errno_t ext4_filesystem_probe(service_id_t service_id,
+    ext4_fs_probe_info_t *info)
 {
         ext4_filesystem_t *fs = NULL;
@@ -391 +393 @@
         if (rc != EOK) {
                 free(fs);
+                return rc;
+        }
+
+        rc = ext4_superblock_get_volume_name(fs->superblock, info->vol_name,
+            sizeof(info->vol_name));
+        if (rc != EOK) {
+                ext4_filesystem_fini(fs);
                 return rc;
         }

uspace/lib/ext4/src/ops.c

@@ -908 +908 @@
 static errno_t ext4_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
 {
-        return ext4_filesystem_probe(service_id);
+        ext4_fs_probe_info_t pinfo;
+        errno_t rc;
+
+        rc = ext4_filesystem_probe(service_id, &pinfo);
+        if (rc != EOK)
+                return rc;
+
+        memcpy(info->label, pinfo.vol_name, sizeof(pinfo.vol_name));
+        return EOK;
 }
 

uspace/lib/ext4/src/superblock.c

@@ -44 +44 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <str.h>
 #include <time.h>
 #include "ext4/cfg.h"
@@ -883 +884 @@
  *
  */
-const char *ext4_superblock_get_volume_name(ext4_superblock_t *sb)
-{
-        return sb->volume_name;
+errno_t ext4_superblock_get_volume_name(ext4_superblock_t *sb, char *buf,
+    size_t bufsz)
+{
+        size_t i;
+        size_t wi;
+        wchar_t ch;
+        errno_t rc;
+
+        i = 0;
+        wi = 0;
+        while (sb->volume_name[i] != '\0' && i < sizeof(sb->volume_name)) {
+                /* ISO 8859-1 codes map to identical Unicode code points */
+                ch = (wchar_t)(uint8_t)sb->volume_name[i];
+                rc = chr_encode(ch, buf, &wi, bufsz - 1);
+                if (rc != EOK)
+                        return rc;
+
+                i++;
+        }
+
+        buf[wi] = '\0';
+        return EOK;
 }