Changeset bebd154 in mainline

Timestamp:

2019-05-28T18:38:09Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

52acfab

Parents:

0d14c25

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-28 18:37:57)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-05-28 18:38:09)

Message:

Fix coastline gcc build

Not really sure why, but during gcc build the code in <dirent.h>
is missing the definition of NAME_MAX from <limits.h>, despite
<limits.h> being included.

Files:

• abi/include/limits.h (modified) (2 diffs)
• uspace/lib/c/generic/dirent.c (modified) (2 diffs)
• uspace/lib/c/include/dirent.h (modified) (2 diffs)

abi/include/limits.h

@@ -84 +84 @@
 #define MB_LEN_MAX 4
 
-#define __NAME_MAX  256
-
 #ifdef _HELENOS_SOURCE
 #define UCHAR_MIN   0
@@ -104 +102 @@
 
 #define SSIZE_MAX  INTPTR_MAX
-#define NAME_MAX   __NAME_MAX
+#define NAME_MAX   255
 
 #endif

uspace/lib/c/generic/dirent.c

@@ -39 +39 @@
 #include <errno.h>
 #include <assert.h>
+#include <string.h>
 
 struct __dirstream {
@@ -92 +93 @@
         ssize_t len = 0;
 
-        rc = vfs_read_short(dirp->fd, dirp->pos, &dirp->res.d_name[0],
-            NAME_MAX + 1, &len);
+        rc = vfs_read_short(dirp->fd, dirp->pos, dirp->res.d_name,
+            sizeof(dirp->res.d_name), &len);
         if (rc != EOK) {
                 errno = rc;
                 return NULL;
         }
+
+        assert(strnlen(dirp->res.d_name, sizeof(dirp->res.d_name)) < sizeof(dirp->res.d_name));
 
         dirp->pos += len;

uspace/lib/c/include/dirent.h

@@ -36 +36 @@
 #define _LIBC_DIRENT_H_
 
-#include <limits.h>
 #include <_bits/decls.h>
 
@@ -42 +41 @@
 
 struct dirent {
-        char d_name[__NAME_MAX + 1];
+        char d_name[256];
 };