Changeset aefdccd in mainline for uspace/app/bdsh/cmds/modules/ls/ls.c

Timestamp:

2025-10-20T06:14:54Z (4 months ago)

Author:

GitHub <noreply@…>

Parents:

adbd7e1 (diff), 3e41cc4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2025-10-20 06:14:54)

git-committer:

GitHub <noreply@…> (2025-10-20 06:14:54)

Message:

Merge branch 'HelenOS:master' into ticket/packet-capture

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2008 Tim Post
  * All rights reserved.
@@ -106 +107 @@
                 }
 
-                capa_spec_t capa;
-                capa_from_blocks(de->s.size, 1, &capa);
-                capa_simplify(&capa);
-
-                char *rptr;
-                errno_t rc = capa_format(&capa, &rptr);
-                if (rc != EOK) {
-                        return rc;
-                }
-
-                char *sep = str_rchr(rptr, ' ');
+                char fsize[CAPA_BLOCKS_BUFSIZE];
+                capa_blocks_format_buf(de->s.size, 1, fsize, sizeof(fsize));
+
+                char *sep = str_rchr(fsize, ' ');
                 if (sep == NULL) {
-                        free(rptr);
                         return ENOENT;
                 }
@@ -124 +117 @@
                 *sep = '\0';
 
-                printf("%-40s\t%*s %2s\n", de->name, width - 3, rptr, sep + 1);
-                free(rptr);
+                printf("%-40s\t%*s %2s\n", de->name, width - 3, fsize, sep + 1);
         } else if (de->s.is_directory)
                 printf("%-40s\t%*s\n", de->name, width, "<dir>");