Changeset b209135 in mainline for uspace/lib/ext4/src/superblock.c

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.

File:

• uspace/lib/ext4/src/superblock.c (modified) (2 diffs)

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;
 }