picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

path-util: add new path_is_valid() helper

Browse source
This commit is contained in:
Lennart Poettering 2018-10-17 18:28:14 +02:00
parent 3088305166
commit 656552ebb3
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/basic/path-util.c
View file

@ -779,7 +779,18 @@ bool filename_is_valid(const char *p) {
if (*e != 0)
return false;
if (e - p > FILENAME_MAX)
if (e - p > FILENAME_MAX) /* FILENAME_MAX is counted *without* the trailing NUL byte */
return false;
return true;
}
bool path_is_valid(const char *p) {
if (isempty(p))
return false;
if (strlen(p) >= PATH_MAX) /* PATH_MAX is counted *with* the trailing NUL byte */
return false;
return true;
@ -787,7 +798,7 @@ bool filename_is_valid(const char *p) {
bool path_is_normalized(const char *p) {
if (isempty(p))
if (!path_is_valid(p))
return false;
if (dot_or_dot_dot(p))
@ -796,9 +807,6 @@ bool path_is_normalized(const char *p) {
if (startswith(p, "../") || endswith(p, "/..") || strstr(p, "/../"))
return false;
if (strlen(p)+1 > PATH_MAX)
return false;
if (startswith(p, "./") || endswith(p, "/.") || strstr(p, "/./"))
return false;

1
src/basic/path-util.h
View file

@ -134,6 +134,7 @@ char* dirname_malloc(const char *path);
const char *last_path_component(const char *path);
bool filename_is_valid(const char *p) _pure_;
bool path_is_valid(const char *p) _pure_;
bool path_is_normalized(const char *p) _pure_;
char *file_in_same_dir(const char *path, const char *filename);