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

keyfile: ignore all dot files (bgo#735824)

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=735824
(cherry picked from commit 091732e13b)
This commit is contained in:
Pavel Šimerda 2014-09-02 13:25:19 +02:00 • committed by Thomas Haller
parent 7d065b018b
commit 0fe52b9cd7
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/plugins/keyfile/tests/test-keyfile.c
View file

@ -3612,7 +3612,7 @@ test_nm_keyfile_plugin_utils_escape_filename (void)
_escape_filename (".mkstemp.A23456", TRUE);
_escape_filename (".#emacs-locking", TRUE);
_escape_filename ("file-with-tilde~", TRUE);
_escape_filename (".file-with-dot", FALSE);
_escape_filename (".file-with-dot", TRUE);
}
/*****************************************************************************/

25
src/settings/plugins/keyfile/utils.c
View file

@ -23,6 +23,7 @@
#include <glib.h>
#include <stdlib.h>
#include <string.h>
#include "gsystem-local-alloc.h"
#include "utils.h"
#include <nm-setting-wired.h>
#include <nm-setting-wireless.h>
@ -87,27 +88,25 @@ check_suffix (const char *base, const char *tag)
gboolean
nm_keyfile_plugin_utils_should_ignore_file (const char *filename)
{
char *base;
gboolean ignore = FALSE;
gs_free char *base = NULL;
g_return_val_if_fail (filename != NULL, TRUE);
base = g_path_get_basename (filename);
g_return_val_if_fail (base != NULL, TRUE);
/* Ignore files with certain patterns */
/* Ignore hidden and backup files */
/* should_ignore_file() must mirror escape_filename() */
if ( (check_prefix (base, ".") && check_suffix (base, SWP_TAG)) /* vim temporary files: .filename.swp */
|| (check_prefix (base, ".") && check_suffix (base, SWPX_TAG)) /* vim temporary files: .filename.swpx */
|| check_suffix (base, PEM_TAG) /* 802.1x certificates and keys */
|| check_suffix (base, DER_TAG) /* 802.1x certificates and keys */
|| check_mkstemp_suffix (base) /* temporary files created by mkstemp() */
|| check_prefix (base, ".#") /* Emacs locking file (link) */
|| base[strlen (base) - 1] == '~')
ignore = TRUE;
if (check_prefix (base, ".") || check_suffix (base, "~"))
return TRUE;
/* Ignore temporary files */
if (check_mkstemp_suffix (base))
return TRUE;
/* Ignore 802.1x certificates and keys */
if (check_suffix (base, PEM_TAG) || check_suffix (base, DER_TAG))
return TRUE;
g_free (base);
return ignore;
return FALSE;
}
char *