fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-31 10:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: refactor check whether filename starts with a dot

Browse source 
check_prefix() was only ever called with "." as prefix.
Simplify the implementation to explicitly check for a leading
dot.
This commit is contained in:
Thomas Haller 2018-09-27 13:35:42 +02:00
parent 345c91a0a4
commit 2e5985f2e9
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/settings/plugins/keyfile/nms-keyfile-utils.c
View file

@ -56,18 +56,11 @@ check_mkstemp_suffix (const char *path)
}
static gboolean
check_prefix (const char *base, const char *tag)
check_prefix_dot (const char *base)
{
int len, tag_len;
nm_assert (base && base[0]);
g_return_val_if_fail (base != NULL, TRUE);
g_return_val_if_fail (tag != NULL, TRUE);
len = strlen (base);
tag_len = strlen (tag);
if ((len > tag_len) && !g_ascii_strncasecmp (base, tag, tag_len))
return TRUE;
return FALSE;
return base[0] == '.';
}
static gboolean
@ -102,7 +95,7 @@ nms_keyfile_utils_should_ignore_file (const char *filename)
/* Ignore hidden and backup files */
/* should_ignore_file() must mirror escape_filename() */
if (check_prefix (base, ".") || check_suffix (base, "~"))
if (check_prefix_dot (base) || check_suffix (base, "~"))
return TRUE;
/* Ignore temporary files */
if (check_mkstemp_suffix (base))
@ -198,7 +191,7 @@ nms_keyfile_utils_escape_filename (const char *filename)
/* escape_filename() must avoid anything that should_ignore_file() would reject.
* We can escape here more aggressivly then what we would read back. */
if (check_prefix (str->str, "."))
if (check_prefix_dot (str->str))
str->str[0] = ESCAPE_CHAR2;
if (check_suffix (str->str, "~"))
str->str[str->len - 1] = ESCAPE_CHAR2;