specifier: add helper for escaping '%' characters to avoid making them subject for expansion
This is ultimately just a wrapper around strreplace(), but it makes things a bit more self-descriptive.
This commit is contained in:
@@ -32,6 +32,7 @@
|
||||
#include "macro.h"
|
||||
#include "specifier.h"
|
||||
#include "string-util.h"
|
||||
#include "strv.h"
|
||||
|
||||
/*
|
||||
* Generic infrastructure for replacing %x style specifiers in
|
||||
@@ -191,3 +192,32 @@ int specifier_kernel_release(char specifier, void *data, void *userdata, char **
|
||||
*ret = n;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int specifier_escape_strv(char **l, char ***ret) {
|
||||
char **z, **p, **q;
|
||||
|
||||
assert(ret);
|
||||
|
||||
if (strv_isempty(l)) {
|
||||
*ret = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
z = new(char*, strv_length(l)+1);
|
||||
if (!z)
|
||||
return -ENOMEM;
|
||||
|
||||
for (p = l, q = z; *p; p++, q++) {
|
||||
|
||||
*q = specifier_escape(*p);
|
||||
if (!*q) {
|
||||
strv_free(z);
|
||||
return -ENOMEM;
|
||||
}
|
||||
}
|
||||
|
||||
*q = NULL;
|
||||
*ret = z;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "string-util.h"
|
||||
|
||||
typedef int (*SpecifierCallback)(char specifier, void *data, void *userdata, char **ret);
|
||||
|
||||
typedef struct Specifier {
|
||||
@@ -36,3 +38,9 @@ int specifier_machine_id(char specifier, void *data, void *userdata, char **ret)
|
||||
int specifier_boot_id(char specifier, void *data, void *userdata, char **ret);
|
||||
int specifier_host_name(char specifier, void *data, void *userdata, char **ret);
|
||||
int specifier_kernel_release(char specifier, void *data, void *userdata, char **ret);
|
||||
|
||||
static inline char* specifier_escape(const char *string) {
|
||||
return strreplace(string, "%", "%%");
|
||||
}
|
||||
|
||||
int specifier_escape_strv(char **l, char ***ret);
|
||||
|
||||
Reference in New Issue
Block a user