diff options
| author | Marcin Wojdyr <wojdyr@gmail.com> | 2019-05-13 01:32:59 +0300 |
|---|---|---|
| committer | Cong <congusbongus@gmail.com> | 2019-05-13 01:32:59 +0300 |
| commit | 5d907978e1e6f2a3b0ad8d51fa186d6fda863ea6 (patch) | |
| tree | 2c50e45ea546901570d0a0b5c0d98e4f5f7d6f42 | |
| parent | 4e17cff96be617855af461cb96784e096fcaf0f8 (diff) | |
tinydir_readfile(): avoid GCC 8+ warning and simplify (#64)
The code was correct, but GCC 8 and 9 warned:
$ g++-8 -O2 -Wall -I.. file_open_sample.c
In file included from /usr/include/string.h:494,
from ../tinydir.h:46,
from file_open_sample.c:2:
In function ‘char* strcat(char*, const char*)’,
inlined from ‘int tinydir_readfile(const tinydir_dir*, tinydir_file*)’ at ../tinydir.h:550:17,
inlined from ‘int tinydir_file_open(tinydir_file*, const char*)’ at ../tinydir.h:727:23,
inlined from ‘int main(int, char**)’ at file_open_sample.c:12:23:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:128:33: warning: ‘char* __builtin___strcat_chk(char*, const char*, long unsigned int)’ accessing 4097 or more bytes at offsets 0 and 4096 may overlap 1 byte at offset 4096 [-Wrestrict]
return __builtin___strcat_chk (__dest, __src, __bos (__dest));
~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| -rw-r--r-- | tinydir.h | 29 |
1 files changed, 9 insertions, 20 deletions
@@ -498,6 +498,7 @@ int tinydir_next(tinydir_dir *dir) _TINYDIR_FUNC int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file) { + const _tinydir_char_t *filename; if (dir == NULL || file == NULL) { errno = EINVAL; @@ -512,27 +513,21 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file) errno = ENOENT; return -1; } - if (_tinydir_strlen(dir->path) + - _tinydir_strlen( + filename = #ifdef _MSC_VER - dir->_f.cFileName + dir->_f.cFileName; #else - dir->_e->d_name + dir->_e->d_name; #endif - ) + 1 + _TINYDIR_PATH_EXTRA >= + if (_tinydir_strlen(dir->path) + + _tinydir_strlen(filename) + 1 + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX) { /* the path for the file will be too long */ errno = ENAMETOOLONG; return -1; } - if (_tinydir_strlen( -#ifdef _MSC_VER - dir->_f.cFileName -#else - dir->_e->d_name -#endif - ) >= _TINYDIR_FILENAME_MAX) + if (_tinydir_strlen(filename) >= _TINYDIR_FILENAME_MAX) { errno = ENAMETOOLONG; return -1; @@ -540,14 +535,8 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file) _tinydir_strcpy(file->path, dir->path); _tinydir_strcat(file->path, TINYDIR_STRING("/")); - _tinydir_strcpy(file->name, -#ifdef _MSC_VER - dir->_f.cFileName -#else - dir->_e->d_name -#endif - ); - _tinydir_strcat(file->path, file->name); + _tinydir_strcpy(file->name, filename); + _tinydir_strcat(file->path, filename); #ifndef _MSC_VER #ifdef __MINGW32__ if (_tstat( |