Changeset c111da2 in mainline for uspace/lib/c

Timestamp:

2025-10-09T15:44:52Z (2 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

cfd04c4

Parents:

1a96db9

Message:

Create non-zero size file in Navigator, new newfile utility.

Location:

uspace/lib/c

Files:

• generic/capa.c (modified) (2 diffs)
• include/capa.h (modified) (2 diffs)
• test/capa.c (modified) (2 diffs)

uspace/lib/c/generic/capa.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -233 +233 @@
 }
 
+errno_t capa_format_buf(capa_spec_t *capa, char *buf, size_t bufsize)
+{
+        errno_t rc;
+        const char *sunit;
+        uint64_t ipart;
+        uint64_t fpart;
+        uint64_t div;
+
+        sunit = NULL;
+
+        assert(capa->cunit < CU_LIMIT);
+
+        rc = ipow10_u64(capa->dp, &div);
+        if (rc != EOK)
+                return rc;
+
+        ipart = capa->m / div;
+        fpart = capa->m % div;
+
+        sunit = cu_str[capa->cunit];
+        if (capa->dp > 0) {
+                snprintf(buf, bufsize, "%" PRIu64 ".%0*" PRIu64 " %s", ipart,
+                    (int)capa->dp, fpart, sunit);
+        } else {
+                snprintf(buf, bufsize, "%" PRIu64 " %s", ipart, sunit);
+        }
+
+        return EOK;
+}
+
+errno_t capa_blocks_format(uint64_t nblocks, size_t block_size,
+    char **rptr)
+{
+        capa_spec_t capa;
+
+        capa_from_blocks(nblocks, block_size, &capa);
+        capa_simplify(&capa);
+        return capa_format(&capa, rptr);
+}
+
+void capa_blocks_format_buf(uint64_t nblocks, size_t block_size,
+    char *buf, size_t bsize)
+{
+        capa_spec_t capa;
+        errno_t rc;
+
+        capa_from_blocks(nblocks, block_size, &capa);
+        capa_simplify(&capa);
+
+        /* Should not get range error because of nblocks * block_size limits */
+        rc = capa_format_buf(&capa, buf, bsize);
+        assert(rc == EOK);
+        (void)rc;
+}
+
 static errno_t capa_digit_val(char c, int *val)
 {

uspace/lib/c/include/capa.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -87 +87 @@
 } capa_spec_t;
 
+/** Size of buffer large enough for capa_blocks_format_buf */
+#define CAPA_BLOCKS_BUFSIZE 16
+
 extern errno_t capa_format(capa_spec_t *, char **);
+extern errno_t capa_format_buf(capa_spec_t *, char *, size_t);
+extern errno_t capa_blocks_format(uint64_t, size_t, char **);
+extern void capa_blocks_format_buf(uint64_t, size_t, char *, size_t);
 extern errno_t capa_parse(const char *, capa_spec_t *);
 extern void capa_simplify(capa_spec_t *);

uspace/lib/c/test/capa.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2019 Matthieu Riolo
  * All rights reserved.
@@ -285 +286 @@
 }
 
+PCUT_TEST(capa_blocks_format)
+{
+        errno_t rc;
+        char *str;
+
+        rc = capa_blocks_format(42, 1, &str);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_STR_EQUALS("42 B", str);
+        free(str);
+}
+
+PCUT_TEST(capa_blocks_format_buf)
+{
+        char str[CAPA_BLOCKS_BUFSIZE];
+
+        capa_blocks_format_buf(42, 1, str, sizeof(str));
+        PCUT_ASSERT_STR_EQUALS("42 B", str);
+}
+
 PCUT_EXPORT(capa);