colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh/trivial: remove unused functions utils_single_quote_string() and unquote

Browse Source
This commit is contained in:
Thomas Haller
2016-11-01 22:47:41 +01:00
parent 39a79b0ee7
commit 58b69e2f90
2 changed files with 0 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
View File

@@ -30,87 +30,6 @@
#include "nms-ifcfg-rh-common.h" #include "nms-ifcfg-rh-common.h"
/*
* utils_single_quote_string
*
* Put string inside single quotes and remove CR, LF characters. If single quote
* is present, escape it with a backslash and prepend the whole string with $
* in order to have $'string'. That allows us to use single quote inside
* single quotes without breaking bash syntax. (man bash, section QUOTING).
*
* Caller is responsible for freeing the returned string.
*/
char *
utils_single_quote_string (const char *str)
{
static const char *drop_chars = "\r\n"; /* drop CR and LF */
static const char escape_char = '\\'; /* escape char is backslash */
static const char quote_char = '\''; /* quote char is single quote */
size_t i, slen, j = 0;
size_t drop = 0, extra = 0;
char *new_str;
slen = strlen (str);
for (i = 0; i < slen; i++) {
if (str[i] == quote_char)
extra++;
if (strchr (drop_chars, str[i]))
drop++;
}
new_str = g_malloc0 (slen + extra - drop + 4); /* 4 is for $''\0*/
if (extra > 0)
new_str[j++] = '$';
new_str[j++] = quote_char;
for (i = 0; i < slen; i++) {
if (strchr (drop_chars, str[i]))
continue;
if (str[i] == quote_char)
new_str[j++] = escape_char;
new_str[j++] = str[i];
}
new_str[j] = quote_char;
return new_str;
}
/*
* utils_single_unquote_string
*
* Remove string from single (or double) quotes, and remove escaping of '.
* Also remove first $ if the string is in the form of $'string'.
*
* Caller is responsible for freeing the returned string.
*/
char *
utils_single_unquote_string (const char *str)
{
static const char escape_char = '\\'; /* escape char is backslash */
static const char q_char = '\''; /* quote char is single quote */
static const char dq_char = '"'; /* double quote char */
size_t i, slen, j = 0, quote = 0, dollar = 0;
char *new_str;
slen = strlen (str);
new_str = g_malloc0 (slen + 1);
if ( (slen >= 2 && (str[0] == dq_char || str[0] == q_char) && str[0] == str[slen-1])
|| (slen >= 3 && str[0] == '$' && str[1] == q_char && str[1] == str[slen-1])) {
quote = 1;
if (str[0] == '$') dollar = 1;
}
i = quote + dollar;
while (i < slen - quote) {
if (str[i] == escape_char && str[i+1] == q_char && i+1 < slen-quote)
i++;
new_str[j++] = str[i++];
}
new_str[j] = '\0';
return new_str;
}
/* /*
* Check ';[a-fA-F0-9]{8}' file suffix used for temporary files by rpm when * Check ';[a-fA-F0-9]{8}' file suffix used for temporary files by rpm when
* installing packages. * installing packages.

4
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h
View File

@@ -31,10 +31,6 @@
#define NM_IFCFG_CONNECTION_LOG_FMTD "%s (%s,\"%s\",%p)" #define NM_IFCFG_CONNECTION_LOG_FMTD "%s (%s,\"%s\",%p)"
#define NM_IFCFG_CONNECTION_LOG_ARGD(con) NM_IFCFG_CONNECTION_LOG_PATH (nm_settings_connection_get_filename ((NMSettingsConnection *) (con))), nm_connection_get_uuid ((NMConnection *) (con)), nm_connection_get_id ((NMConnection *) (con)), (con) #define NM_IFCFG_CONNECTION_LOG_ARGD(con) NM_IFCFG_CONNECTION_LOG_PATH (nm_settings_connection_get_filename ((NMSettingsConnection *) (con))), nm_connection_get_uuid ((NMConnection *) (con)), nm_connection_get_id ((NMConnection *) (con)), (con)
char *utils_single_quote_string (const char *str);
char *utils_single_unquote_string (const char *str);
char *utils_cert_path (const char *parent, const char *suffix); char *utils_cert_path (const char *parent, const char *suffix);
const char *utils_get_ifcfg_name (const char *file, gboolean only_ifcfg); const char *utils_get_ifcfg_name (const char *file, gboolean only_ifcfg);