Changeset 4a764d1 in mainline

Timestamp:

2019-06-01T12:45:30Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

c878693

Parents:

0feb39b

Message:

Replacing scanf() with str_rchr()

The command ls used scanf() for indenting
the size column. This has been replaced with
str_rchr() which is safer in that context.

File:

• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (1 diff)

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

@@ -112 +112 @@
                         errno_t rc = cap_format(&cap, &rptr);
                         if (rc == EOK) {
-                                char bytes[9], suffix[3];
-                                sscanf(rptr, "%s %s", bytes, suffix);
+                                char *sep = str_rchr(rptr, ' ');
+                                if (sep == NULL) {
+                                        free(rptr);
+                                        return ENOENT;
+                                }
+
+                                *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, bytes, suffix);
                         } else
                                 return rc;