fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 05:38:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifupdown: misc code cleanup for "add support for source stanza"

Browse source 
- make use of glib functions
- coding style

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2013-09-04 17:15:32 +02:00
parent 48ed1abca7
commit 4e09b87d54
1 changed files with 23 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/settings/plugins/ifupdown/interface_parser.c
View file

@ -98,10 +98,10 @@ static char *join_values_with_spaces(char *dst, char **src)
return(dst); return(dst);
} }
void _ifparser_source (const char *path, const char *en_dir, int quiet); static void _ifparser_source (const char *path, const char *en_dir, int quiet);
void _recursive_ifparser (const char *eni_file, int quiet);
void _recursive_ifparser (const char *eni_file, int quiet) static void
_recursive_ifparser (const char *eni_file, int quiet)
{ {
FILE *inp; FILE *inp;
char line[255]; char line[255];
@ -228,7 +228,8 @@ void _recursive_ifparser (const char *eni_file, int quiet)
} }
// source stanza takes one or more filepaths as parameters // source stanza takes one or more filepaths as parameters
else if (strcmp(token[0], "source") == 0) { else if (strcmp(token[0], "source") == 0) {
uint i; int i;
char *en_dir;
skip_to_block = 0; skip_to_block = 0;
@ -237,27 +238,17 @@ void _recursive_ifparser (const char *eni_file, int quiet)
g_warning ("Error: Invalid source line without parameters\n"); g_warning ("Error: Invalid source line without parameters\n");
continue; continue;
} }
for (i = 1; i < toknum; ++i) {
char *eni_file_copy;
char *en_dir;
eni_file_copy = strdup (eni_file); en_dir = g_path_get_dirname (eni_file);
if (!eni_file_copy) { for (i = 1; i < toknum; ++i)
if (!quiet)
g_warning ("Error: Skipping interfaces file %s because strdup failed\n",
eni_file);
continue;
}
en_dir = dirname (eni_file_copy);
_ifparser_source (token[i], en_dir, quiet); _ifparser_source (token[i], en_dir, quiet);
free (eni_file_copy); g_free (en_dir);
}
} }
else { else {
if (skip_to_block) { if (skip_to_block) {
if (!quiet) { if (!quiet) {
g_message ("Error: ignoring out-of-block data '%s'\n", g_message ("Error: ignoring out-of-block data '%s'\n",
join_values_with_spaces(value, token)); join_values_with_spaces(value, token));
} }
} else } else
add_data(token[0], join_values_with_spaces(value, token + 1)); add_data(token[0], join_values_with_spaces(value, token + 1));
@ -269,35 +260,31 @@ void _recursive_ifparser (const char *eni_file, int quiet)
g_message (" interface-parser: finished parsing file %s\n", eni_file); g_message (" interface-parser: finished parsing file %s\n", eni_file);
} }
void _ifparser_source (const char *path, const char *en_dir, int quiet) static void
_ifparser_source (const char *path, const char *en_dir, int quiet)
{ {
// abs_path = en_dir + '/' + path + '\0' char *abs_path;
char abs_path[strlen (en_dir) + strlen (path) + 2];
wordexp_t we; wordexp_t we;
uint i; uint i;
if (path[0] == '/') { if (g_path_is_absolute (path))
strncpy (abs_path, path, sizeof (abs_path)); abs_path = g_strdup (path);
} else
else { abs_path = g_build_filename (en_dir, path, NULL);
// Convert relative path to absolute path
snprintf (abs_path, sizeof (abs_path), "%s/%s", en_dir, path);
}
if (!quiet) if (!quiet)
g_message (" interface-parser: source line includes interfaces file(s) %s\n", abs_path); g_message (" interface-parser: source line includes interfaces file(s) %s\n", abs_path);
// Recursively parse sourced in interfaces files /* ifupdown uses WRDE_NOCMD for wordexp. */
// (ifupdown uses WRDE_NOCMD for wordexp)
memset (&we, 0, sizeof (we));
if (wordexp (abs_path, &we, WRDE_NOCMD)) { if (wordexp (abs_path, &we, WRDE_NOCMD)) {
if (!quiet) if (!quiet)
g_warning ("Error: word expansion for %s failed\n", abs_path); g_warning ("Error: word expansion for %s failed\n", abs_path);
return; } else {
for (i = 0; i < we.we_wordc; i++)
_recursive_ifparser (we.we_wordv[i], quiet);
wordfree (&we);
} }
for (i = 0; i < we.we_wordc; i++) { g_free (abs_path);
_recursive_ifparser (we.we_wordv[i], quiet);
}
wordfree (&we);
} }
void ifparser_init (const char *eni_file, int quiet) void ifparser_init (const char *eni_file, int quiet)