From dca37deb75987037d7770a61e8a8daf8225c9d03 Mon Sep 17 00:00:00 2001 From: "Wiktor S. Ovalle Correa" Date: Wed, 20 Jan 2021 11:42:50 +0100 Subject: [PATCH] [EGD-5297] Fix Release build on linux Some minor warnings were preventing us from completing Release build of Linux emulator. --- board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp | 2 +- host-tools/genlittlefs/mklfs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp b/board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp index a35f16ca08a4dfed19564f5d8e642dc1d42017ed..c146afa796bb672f1648c67902b95ff3dbe1a0a3 100644 --- a/board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp +++ b/board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp @@ -174,7 +174,7 @@ extern "C" { dirp->dir_data.d_ino = stdata.st_ino; dirp->dir_data.d_type = S_ISREG(stdata.st_mode)?DT_REG:DT_DIR; dirp->dir_data.d_reclen = fname.size(); - std::strncpy(dirp->dir_data.d_name,fname.c_str(), sizeof(dirp->dir_data.d_name)); + std::strncpy(dirp->dir_data.d_name,fname.c_str(), sizeof(dirp->dir_data.d_name)-1); ret = &dirp->dir_data; } } else { diff --git a/host-tools/genlittlefs/mklfs.c b/host-tools/genlittlefs/mklfs.c index 96340046f0945887491274ce84cece5ce5d671ba..4ca9149f1a9ea9a0c74b3d2f3ea0bd1bcd1a590c 100644 --- a/host-tools/genlittlefs/mklfs.c +++ b/host-tools/genlittlefs/mklfs.c @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md #include @@ -200,7 +200,7 @@ static int add_to_lfs(lfs_t *lfs, const char *dir, struct lfs_info_summary *summ summary->directories_added++; } } - else if (is_file) { + else { // is_file err = create_file_in_lfs(lfs, host_dir, tgt_dir, verbose); if (!err) { summary->files_added++;