2019-09-10 11:19:01 +02:00
|
|
|
// SPDX-License-Identifier: LGPL-2.1+
|
2019-09-25 13:13:40 +02:00
|
|
|
/*
|
2016-03-18 13:45:20 +01:00
|
|
|
* (C) Copyright 2016 Red Hat, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "nm-default.h"
|
|
|
|
|
|
|
|
|
|
#include "nm-shared-utils.h"
|
|
|
|
|
|
2017-09-05 15:24:47 +02:00
|
|
|
#include <arpa/inet.h>
|
2017-10-13 11:02:25 +02:00
|
|
|
#include <poll.h>
|
2017-10-12 15:43:21 +02:00
|
|
|
#include <fcntl.h>
|
2019-01-15 14:53:46 +01:00
|
|
|
#include <sys/syscall.h>
|
2017-10-12 15:43:21 +02:00
|
|
|
|
2019-01-31 16:53:45 +01:00
|
|
|
#include "nm-errno.h"
|
|
|
|
|
|
2016-03-20 10:32:43 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-04-11 15:17:18 +02:00
|
|
|
const void *const _NM_PTRARRAY_EMPTY[1] = { NULL };
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2019-02-08 12:24:07 +01:00
|
|
|
const NMIPAddr nm_ip_addr_zero = { };
|
2017-09-14 08:32:27 +02:00
|
|
|
|
2019-02-17 12:12:51 +01:00
|
|
|
/* this initializes a struct in_addr/in6_addr and allows for untrusted
|
|
|
|
|
* arguments (like unsuitable @addr_family or @src_len). It's almost safe
|
|
|
|
|
* in the sense that it verifies input arguments strictly. Also, it
|
|
|
|
|
* uses memcpy() to access @src, so alignment is not an issue.
|
|
|
|
|
*
|
|
|
|
|
* Only potential pitfalls:
|
|
|
|
|
*
|
|
|
|
|
* - it allows for @addr_family to be AF_UNSPEC. If that is the case (and the
|
|
|
|
|
* caller allows for that), the caller MUST provide @out_addr_family.
|
|
|
|
|
* - when setting @dst to an IPv4 address, the trailing bytes are not touched.
|
|
|
|
|
* Meaning, if @dst is an NMIPAddr union, only the first bytes will be set.
|
|
|
|
|
* If that matter to you, clear @dst before. */
|
|
|
|
|
gboolean
|
|
|
|
|
nm_ip_addr_set_from_untrusted (int addr_family,
|
|
|
|
|
gpointer dst,
|
|
|
|
|
gconstpointer src,
|
|
|
|
|
gsize src_len,
|
|
|
|
|
int *out_addr_family)
|
|
|
|
|
{
|
|
|
|
|
nm_assert (dst);
|
|
|
|
|
|
|
|
|
|
switch (addr_family) {
|
|
|
|
|
case AF_UNSPEC:
|
|
|
|
|
if (!out_addr_family) {
|
|
|
|
|
/* when the callers allow undefined @addr_family, they must provide
|
|
|
|
|
* an @out_addr_family argument. */
|
|
|
|
|
nm_assert_not_reached ();
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
switch (src_len) {
|
|
|
|
|
case sizeof (struct in_addr): addr_family = AF_INET; break;
|
|
|
|
|
case sizeof (struct in6_addr): addr_family = AF_INET6; break;
|
|
|
|
|
default:
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case AF_INET:
|
|
|
|
|
if (src_len != sizeof (struct in_addr))
|
|
|
|
|
return FALSE;
|
|
|
|
|
break;
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
if (src_len != sizeof (struct in6_addr))
|
|
|
|
|
return FALSE;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
/* when the callers allow undefined @addr_family, they must provide
|
|
|
|
|
* an @out_addr_family argument. */
|
|
|
|
|
nm_assert (out_addr_family);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nm_assert (src);
|
|
|
|
|
|
|
|
|
|
memcpy (dst, src, src_len);
|
|
|
|
|
NM_SET_OUT (out_addr_family, addr_family);
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-14 08:32:27 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2019-01-15 14:53:46 +01:00
|
|
|
pid_t
|
|
|
|
|
nm_utils_gettid (void)
|
|
|
|
|
{
|
|
|
|
|
return (pid_t) syscall (SYS_gettid);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Used for asserting that this function is called on the main-thread.
|
|
|
|
|
* The main-thread is determined by remembering the thread-id
|
|
|
|
|
* of when the function was called the first time.
|
|
|
|
|
*
|
|
|
|
|
* When forking, the thread-id is again reset upon first call. */
|
|
|
|
|
gboolean
|
|
|
|
|
_nm_assert_on_main_thread (void)
|
|
|
|
|
{
|
|
|
|
|
G_LOCK_DEFINE_STATIC (lock);
|
|
|
|
|
static pid_t seen_tid;
|
|
|
|
|
static pid_t seen_pid;
|
|
|
|
|
pid_t tid;
|
|
|
|
|
pid_t pid;
|
|
|
|
|
gboolean success = FALSE;
|
|
|
|
|
|
|
|
|
|
tid = nm_utils_gettid ();
|
|
|
|
|
nm_assert (tid != 0);
|
|
|
|
|
|
|
|
|
|
G_LOCK (lock);
|
|
|
|
|
|
|
|
|
|
if (G_LIKELY (tid == seen_tid)) {
|
|
|
|
|
/* we don't care about false positives (when the process forked, and the thread-id
|
|
|
|
|
* is accidentally re-used) . It's for assertions only. */
|
|
|
|
|
success = TRUE;
|
|
|
|
|
} else {
|
|
|
|
|
pid = getpid ();
|
|
|
|
|
nm_assert (pid != 0);
|
|
|
|
|
|
|
|
|
|
if ( seen_tid == 0
|
|
|
|
|
|| seen_pid != pid) {
|
|
|
|
|
/* either this is the first time we call the function, or the process
|
|
|
|
|
* forked. In both cases, remember the thread-id. */
|
|
|
|
|
seen_tid = tid;
|
|
|
|
|
seen_pid = pid;
|
|
|
|
|
success = TRUE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
G_UNLOCK (lock);
|
|
|
|
|
|
|
|
|
|
return success;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2016-12-21 17:42:49 +01:00
|
|
|
void
|
|
|
|
|
nm_utils_strbuf_append_c (char **buf, gsize *len, char c)
|
|
|
|
|
{
|
|
|
|
|
switch (*len) {
|
|
|
|
|
case 0:
|
|
|
|
|
return;
|
|
|
|
|
case 1:
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
*len = 0;
|
|
|
|
|
(*buf)++;
|
|
|
|
|
return;
|
|
|
|
|
default:
|
|
|
|
|
(*buf)[0] = c;
|
|
|
|
|
(*buf)[1] = '\0';
|
|
|
|
|
(*len)--;
|
|
|
|
|
(*buf)++;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-14 14:58:53 +01:00
|
|
|
void
|
|
|
|
|
nm_utils_strbuf_append_bin (char **buf, gsize *len, gconstpointer str, gsize str_len)
|
|
|
|
|
{
|
|
|
|
|
switch (*len) {
|
|
|
|
|
case 0:
|
|
|
|
|
return;
|
|
|
|
|
case 1:
|
|
|
|
|
if (str_len == 0) {
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
*len = 0;
|
|
|
|
|
(*buf)++;
|
|
|
|
|
return;
|
|
|
|
|
default:
|
|
|
|
|
if (str_len == 0) {
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (str_len >= *len) {
|
|
|
|
|
memcpy (*buf, str, *len - 1);
|
|
|
|
|
(*buf)[*len - 1] = '\0';
|
|
|
|
|
*buf = &(*buf)[*len];
|
|
|
|
|
*len = 0;
|
|
|
|
|
} else {
|
|
|
|
|
memcpy (*buf, str, str_len);
|
|
|
|
|
*buf = &(*buf)[str_len];
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
*len -= str_len;
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-12-21 17:42:49 +01:00
|
|
|
void
|
|
|
|
|
nm_utils_strbuf_append_str (char **buf, gsize *len, const char *str)
|
|
|
|
|
{
|
|
|
|
|
gsize src_len;
|
|
|
|
|
|
|
|
|
|
switch (*len) {
|
|
|
|
|
case 0:
|
|
|
|
|
return;
|
|
|
|
|
case 1:
|
|
|
|
|
if (!str || !*str) {
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
*len = 0;
|
|
|
|
|
(*buf)++;
|
|
|
|
|
return;
|
|
|
|
|
default:
|
|
|
|
|
if (!str || !*str) {
|
|
|
|
|
(*buf)[0] = '\0';
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
src_len = g_strlcpy (*buf, str, *len);
|
|
|
|
|
if (src_len >= *len) {
|
|
|
|
|
*buf = &(*buf)[*len];
|
|
|
|
|
*len = 0;
|
|
|
|
|
} else {
|
|
|
|
|
*buf = &(*buf)[src_len];
|
|
|
|
|
*len -= src_len;
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
nm_utils_strbuf_append (char **buf, gsize *len, const char *format, ...)
|
|
|
|
|
{
|
|
|
|
|
char *p = *buf;
|
|
|
|
|
va_list args;
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
int retval;
|
2016-12-21 17:42:49 +01:00
|
|
|
|
|
|
|
|
if (*len == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
va_start (args, format);
|
|
|
|
|
retval = g_vsnprintf (p, *len, format, args);
|
|
|
|
|
va_end (args);
|
|
|
|
|
|
2018-09-06 15:20:21 +02:00
|
|
|
if ((gsize) retval >= *len) {
|
2016-12-21 17:42:49 +01:00
|
|
|
*buf = &p[*len];
|
|
|
|
|
*len = 0;
|
|
|
|
|
} else {
|
|
|
|
|
*buf = &p[retval];
|
|
|
|
|
*len -= retval;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-06 15:20:21 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_strbuf_seek_end:
|
|
|
|
|
* @buf: the input/output buffer
|
2018-09-30 11:30:18 -03:00
|
|
|
* @len: the input/output length of the buffer.
|
2018-09-06 15:20:21 +02:00
|
|
|
*
|
|
|
|
|
* Commonly, one uses nm_utils_strbuf_append*(), to incrementally
|
|
|
|
|
* append strings to the buffer. However, sometimes we need to use
|
|
|
|
|
* existing API to write to the buffer.
|
|
|
|
|
* After doing so, we want to adjust the buffer counter.
|
|
|
|
|
* Essentially,
|
|
|
|
|
*
|
|
|
|
|
* g_snprintf (buf, len, ...);
|
|
|
|
|
* nm_utils_strbuf_seek_end (&buf, &len);
|
|
|
|
|
*
|
|
|
|
|
* is almost the same as
|
|
|
|
|
*
|
|
|
|
|
* nm_utils_strbuf_append (&buf, &len, ...);
|
|
|
|
|
*
|
2018-09-07 18:05:10 +02:00
|
|
|
* The only difference is the behavior when the string got truncated:
|
|
|
|
|
* nm_utils_strbuf_append() will recognize that and set the remaining
|
|
|
|
|
* length to zero.
|
|
|
|
|
*
|
|
|
|
|
* In general, the behavior is:
|
|
|
|
|
*
|
|
|
|
|
* - if *len is zero, do nothing
|
|
|
|
|
* - if the buffer contains a NUL byte within the first *len characters,
|
|
|
|
|
* the buffer is pointed to the NUL byte and len is adjusted. In this
|
|
|
|
|
* case, the remaining *len is always >= 1.
|
|
|
|
|
* In particular, that is also the case if the NUL byte is at the very last
|
|
|
|
|
* position ((*buf)[*len -1]). That happens, when the previous operation
|
|
|
|
|
* either fit the string exactly into the buffer or the string was truncated
|
|
|
|
|
* by g_snprintf(). The difference cannot be determined.
|
|
|
|
|
* - if the buffer contains no NUL bytes within the first *len characters,
|
|
|
|
|
* write NUL at the last position, set *len to zero, and point *buf past
|
|
|
|
|
* the NUL byte. This would happen with
|
|
|
|
|
*
|
|
|
|
|
* strncpy (buf, long_str, len);
|
|
|
|
|
* nm_utils_strbuf_seek_end (&buf, &len).
|
|
|
|
|
*
|
|
|
|
|
* where strncpy() does truncate the string and not NUL terminate it.
|
|
|
|
|
* nm_utils_strbuf_seek_end() would then NUL terminate it.
|
2018-09-06 15:20:21 +02:00
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
nm_utils_strbuf_seek_end (char **buf, gsize *len)
|
|
|
|
|
{
|
|
|
|
|
gsize l;
|
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
|
|
nm_assert (len);
|
|
|
|
|
nm_assert (buf && *buf);
|
|
|
|
|
|
2018-09-07 18:05:10 +02:00
|
|
|
if (*len <= 1) {
|
|
|
|
|
if ( *len == 1
|
|
|
|
|
&& (*buf)[0])
|
|
|
|
|
goto truncate;
|
2018-09-06 15:20:21 +02:00
|
|
|
return;
|
2018-09-07 18:05:10 +02:00
|
|
|
}
|
2018-09-06 15:20:21 +02:00
|
|
|
|
|
|
|
|
end = memchr (*buf, 0, *len);
|
2018-09-07 18:05:10 +02:00
|
|
|
if (end) {
|
|
|
|
|
l = end - *buf;
|
|
|
|
|
nm_assert (l < *len);
|
|
|
|
|
|
|
|
|
|
*buf = end;
|
|
|
|
|
*len -= l;
|
2018-09-06 15:20:21 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-07 18:05:10 +02:00
|
|
|
truncate:
|
|
|
|
|
/* hm, no NUL character within len bytes.
|
|
|
|
|
* Just NUL terminate the array and consume them
|
|
|
|
|
* all. */
|
|
|
|
|
*buf += *len;
|
|
|
|
|
(*buf)[-1] = '\0';
|
|
|
|
|
*len = 0;
|
|
|
|
|
return;
|
2018-09-06 15:20:21 +02:00
|
|
|
}
|
|
|
|
|
|
2016-12-21 17:42:49 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-08-12 19:53:53 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_gbytes_equals:
|
|
|
|
|
* @bytes: (allow-none): a #GBytes array to compare. Note that
|
|
|
|
|
* %NULL is treated like an #GBytes array of length zero.
|
|
|
|
|
* @mem_data: the data pointer with @mem_len bytes
|
|
|
|
|
* @mem_len: the length of the data pointer
|
|
|
|
|
*
|
|
|
|
|
* Returns: %TRUE if @bytes contains the same data as @mem_data. As a
|
|
|
|
|
* special case, a %NULL @bytes is treated like an empty array.
|
|
|
|
|
*/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_utils_gbytes_equal_mem (GBytes *bytes,
|
|
|
|
|
gconstpointer mem_data,
|
|
|
|
|
gsize mem_len)
|
|
|
|
|
{
|
|
|
|
|
gconstpointer p;
|
|
|
|
|
gsize l;
|
|
|
|
|
|
|
|
|
|
if (!bytes) {
|
|
|
|
|
/* as a special case, let %NULL GBytes compare idential
|
|
|
|
|
* to an empty array. */
|
|
|
|
|
return (mem_len == 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = g_bytes_get_data (bytes, &l);
|
|
|
|
|
return l == mem_len
|
|
|
|
|
&& ( mem_len == 0 /* allow @mem_data to be %NULL */
|
|
|
|
|
|| memcmp (p, mem_data, mem_len) == 0);
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-13 21:21:14 +02:00
|
|
|
GVariant *
|
|
|
|
|
nm_utils_gbytes_to_variant_ay (GBytes *bytes)
|
|
|
|
|
{
|
|
|
|
|
const guint8 *p;
|
|
|
|
|
gsize l;
|
|
|
|
|
|
|
|
|
|
if (!bytes) {
|
|
|
|
|
/* for convenience, accept NULL to return an empty variant */
|
|
|
|
|
return g_variant_new_array (G_VARIANT_TYPE_BYTE, NULL, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
p = g_bytes_get_data (bytes, &l);
|
|
|
|
|
return g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, p, l, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-10-05 14:27:24 +02:00
|
|
|
/**
|
|
|
|
|
* nm_strquote:
|
|
|
|
|
* @buf: the output buffer of where to write the quoted @str argument.
|
|
|
|
|
* @buf_len: the size of @buf.
|
|
|
|
|
* @str: (allow-none): the string to quote.
|
|
|
|
|
*
|
|
|
|
|
* Writes @str to @buf with quoting. The resulting buffer
|
|
|
|
|
* is always NUL terminated, unless @buf_len is zero.
|
|
|
|
|
* If @str is %NULL, it writes "(null)".
|
|
|
|
|
*
|
|
|
|
|
* If @str needs to be truncated, the closing quote is '^' instead
|
|
|
|
|
* of '"'.
|
|
|
|
|
*
|
|
|
|
|
* This is similar to nm_strquote_a(), which however uses alloca()
|
|
|
|
|
* to allocate a new buffer. Also, here @buf_len is the size of @buf,
|
|
|
|
|
* while nm_strquote_a() has the number of characters to print. The latter
|
|
|
|
|
* doesn't include the quoting.
|
|
|
|
|
*
|
2017-10-13 12:10:02 +02:00
|
|
|
* Returns: the input buffer with the quoted string.
|
|
|
|
|
*/
|
2017-10-05 14:27:24 +02:00
|
|
|
const char *
|
|
|
|
|
nm_strquote (char *buf, gsize buf_len, const char *str)
|
|
|
|
|
{
|
|
|
|
|
const char *const buf0 = buf;
|
|
|
|
|
|
|
|
|
|
if (!str) {
|
|
|
|
|
nm_utils_strbuf_append_str (&buf, &buf_len, "(null)");
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (G_UNLIKELY (buf_len <= 2)) {
|
|
|
|
|
switch (buf_len) {
|
|
|
|
|
case 2:
|
|
|
|
|
*(buf++) = '^';
|
2017-10-12 12:22:06 +02:00
|
|
|
/* fall-through */
|
2017-10-05 14:27:24 +02:00
|
|
|
case 1:
|
|
|
|
|
*(buf++) = '\0';
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*(buf++) = '"';
|
|
|
|
|
buf_len--;
|
|
|
|
|
|
|
|
|
|
nm_utils_strbuf_append_str (&buf, &buf_len, str);
|
|
|
|
|
|
|
|
|
|
/* if the string was too long we indicate truncation with a
|
|
|
|
|
* '^' instead of a closing quote. */
|
|
|
|
|
if (G_UNLIKELY (buf_len <= 1)) {
|
|
|
|
|
switch (buf_len) {
|
|
|
|
|
case 1:
|
|
|
|
|
buf[-1] = '^';
|
|
|
|
|
break;
|
|
|
|
|
case 0:
|
|
|
|
|
buf[-2] = '^';
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
nm_assert_not_reached ();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
nm_assert (buf_len >= 2);
|
|
|
|
|
*(buf++) = '"';
|
|
|
|
|
*(buf++) = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
return buf0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-09-26 09:04:07 +02:00
|
|
|
char _nm_utils_to_string_buffer[];
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
nm_utils_to_string_buffer_init (char **buf, gsize *len)
|
|
|
|
|
{
|
|
|
|
|
if (!*buf) {
|
|
|
|
|
*buf = _nm_utils_to_string_buffer;
|
|
|
|
|
*len = sizeof (_nm_utils_to_string_buffer);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_utils_to_string_buffer_init_null (gconstpointer obj, char **buf, gsize *len)
|
|
|
|
|
{
|
|
|
|
|
nm_utils_to_string_buffer_init (buf, len);
|
|
|
|
|
if (!obj) {
|
|
|
|
|
g_strlcpy (*buf, "(null)", *len);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
nm_utils_flags2str (const NMUtilsFlags2StrDesc *descs,
|
|
|
|
|
gsize n_descs,
|
|
|
|
|
unsigned flags,
|
|
|
|
|
char *buf,
|
|
|
|
|
gsize len)
|
|
|
|
|
{
|
|
|
|
|
gsize i;
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
#if NM_MORE_ASSERTS > 10
|
|
|
|
|
nm_assert (descs);
|
|
|
|
|
nm_assert (n_descs > 0);
|
|
|
|
|
for (i = 0; i < n_descs; i++) {
|
|
|
|
|
gsize j;
|
|
|
|
|
|
|
|
|
|
nm_assert (descs[i].name && descs[i].name[0]);
|
|
|
|
|
for (j = 0; j < i; j++)
|
|
|
|
|
nm_assert (descs[j].flag != descs[i].flag);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
nm_utils_to_string_buffer_init (&buf, &len);
|
|
|
|
|
|
|
|
|
|
if (!len)
|
|
|
|
|
return buf;
|
|
|
|
|
|
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
p = buf;
|
|
|
|
|
if (!flags) {
|
|
|
|
|
for (i = 0; i < n_descs; i++) {
|
|
|
|
|
if (!descs[i].flag) {
|
|
|
|
|
nm_utils_strbuf_append_str (&p, &len, descs[i].name);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return buf;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; flags && i < n_descs; i++) {
|
|
|
|
|
if ( descs[i].flag
|
|
|
|
|
&& NM_FLAGS_ALL (flags, descs[i].flag)) {
|
|
|
|
|
flags &= ~descs[i].flag;
|
|
|
|
|
|
|
|
|
|
if (buf[0] != '\0')
|
|
|
|
|
nm_utils_strbuf_append_c (&p, &len, ',');
|
|
|
|
|
nm_utils_strbuf_append_str (&p, &len, descs[i].name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (flags) {
|
|
|
|
|
if (buf[0] != '\0')
|
|
|
|
|
nm_utils_strbuf_append_c (&p, &len, ',');
|
|
|
|
|
nm_utils_strbuf_append (&p, &len, "0x%x", flags);
|
|
|
|
|
}
|
|
|
|
|
return buf;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-09-05 15:24:47 +02:00
|
|
|
/**
|
|
|
|
|
* _nm_utils_ip4_prefix_to_netmask:
|
|
|
|
|
* @prefix: a CIDR prefix
|
|
|
|
|
*
|
|
|
|
|
* Returns: the netmask represented by the prefix, in network byte order
|
|
|
|
|
**/
|
|
|
|
|
guint32
|
|
|
|
|
_nm_utils_ip4_prefix_to_netmask (guint32 prefix)
|
|
|
|
|
{
|
|
|
|
|
return prefix < 32 ? ~htonl(0xFFFFFFFF >> prefix) : 0xFFFFFFFF;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* _nm_utils_ip4_get_default_prefix:
|
|
|
|
|
* @ip: an IPv4 address (in network byte order)
|
|
|
|
|
*
|
|
|
|
|
* When the Internet was originally set up, various ranges of IP addresses were
|
|
|
|
|
* segmented into three network classes: A, B, and C. This function will return
|
|
|
|
|
* a prefix that is associated with the IP address specified defining where it
|
|
|
|
|
* falls in the predefined classes.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the default class prefix for the given IP
|
|
|
|
|
**/
|
|
|
|
|
/* The function is originally from ipcalc.c of Red Hat's initscripts. */
|
|
|
|
|
guint32
|
|
|
|
|
_nm_utils_ip4_get_default_prefix (guint32 ip)
|
|
|
|
|
{
|
|
|
|
|
if (((ntohl (ip) & 0xFF000000) >> 24) <= 127)
|
|
|
|
|
return 8; /* Class A - 255.0.0.0 */
|
|
|
|
|
else if (((ntohl (ip) & 0xFF000000) >> 24) <= 191)
|
|
|
|
|
return 16; /* Class B - 255.255.0.0 */
|
|
|
|
|
|
|
|
|
|
return 24; /* Class C - 255.255.255.0 */
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-05 17:11:25 +02:00
|
|
|
gboolean
|
|
|
|
|
nm_utils_ip_is_site_local (int addr_family,
|
|
|
|
|
const void *address)
|
|
|
|
|
{
|
|
|
|
|
in_addr_t addr4;
|
|
|
|
|
|
|
|
|
|
switch (addr_family) {
|
|
|
|
|
case AF_INET:
|
|
|
|
|
/* RFC1918 private addresses
|
|
|
|
|
* 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16 */
|
|
|
|
|
addr4 = ntohl (*((const in_addr_t *) address));
|
|
|
|
|
return (addr4 & 0xff000000) == 0x0a000000
|
|
|
|
|
|| (addr4 & 0xfff00000) == 0xac100000
|
|
|
|
|
|| (addr4 & 0xffff0000) == 0xc0a80000;
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
return IN6_IS_ADDR_SITELOCAL (address);
|
|
|
|
|
default:
|
|
|
|
|
g_return_val_if_reached (FALSE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-05 15:24:47 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-09-04 14:03:33 +02:00
|
|
|
gboolean
|
2017-10-04 17:34:39 +02:00
|
|
|
nm_utils_parse_inaddr_bin (int addr_family,
|
|
|
|
|
const char *text,
|
2018-09-17 14:18:47 +02:00
|
|
|
int *out_addr_family,
|
2017-10-04 17:34:39 +02:00
|
|
|
gpointer out_addr)
|
2017-09-04 14:03:33 +02:00
|
|
|
{
|
2017-09-14 12:02:00 +02:00
|
|
|
NMIPAddr addrbin;
|
2017-09-04 14:03:33 +02:00
|
|
|
|
|
|
|
|
g_return_val_if_fail (text, FALSE);
|
|
|
|
|
|
2018-09-17 14:18:47 +02:00
|
|
|
if (addr_family == AF_UNSPEC) {
|
|
|
|
|
g_return_val_if_fail (!out_addr || out_addr_family, FALSE);
|
2017-10-04 17:34:39 +02:00
|
|
|
addr_family = strchr (text, ':') ? AF_INET6 : AF_INET;
|
2018-09-17 14:18:47 +02:00
|
|
|
} else
|
2017-10-04 17:34:39 +02:00
|
|
|
g_return_val_if_fail (NM_IN_SET (addr_family, AF_INET, AF_INET6), FALSE);
|
2017-09-04 14:03:33 +02:00
|
|
|
|
2017-10-04 17:42:52 +02:00
|
|
|
if (inet_pton (addr_family, text, &addrbin) != 1)
|
2017-09-04 14:03:33 +02:00
|
|
|
return FALSE;
|
2017-10-04 17:42:52 +02:00
|
|
|
|
2018-09-17 14:18:47 +02:00
|
|
|
NM_SET_OUT (out_addr_family, addr_family);
|
|
|
|
|
if (out_addr)
|
|
|
|
|
nm_ip_addr_set (addr_family, out_addr, &addrbin);
|
2017-09-14 12:02:00 +02:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
2017-10-04 17:34:39 +02:00
|
|
|
nm_utils_parse_inaddr (int addr_family,
|
|
|
|
|
const char *text,
|
2017-09-14 12:02:00 +02:00
|
|
|
char **out_addr)
|
|
|
|
|
{
|
|
|
|
|
NMIPAddr addrbin;
|
|
|
|
|
char addrstr_buf[MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
|
2017-09-04 14:03:33 +02:00
|
|
|
|
2019-03-17 13:38:07 +01:00
|
|
|
g_return_val_if_fail (text, FALSE);
|
|
|
|
|
|
|
|
|
|
if (addr_family == AF_UNSPEC)
|
|
|
|
|
addr_family = strchr (text, ':') ? AF_INET6 : AF_INET;
|
|
|
|
|
else
|
|
|
|
|
g_return_val_if_fail (NM_IN_SET (addr_family, AF_INET, AF_INET6), FALSE);
|
|
|
|
|
|
|
|
|
|
if (inet_pton (addr_family, text, &addrbin) != 1)
|
2017-09-14 12:02:00 +02:00
|
|
|
return FALSE;
|
2019-03-17 13:38:07 +01:00
|
|
|
|
2017-10-04 17:34:39 +02:00
|
|
|
NM_SET_OUT (out_addr, g_strdup (inet_ntop (addr_family, &addrbin, addrstr_buf, sizeof (addrstr_buf))));
|
2017-09-04 14:03:33 +02:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
2017-10-04 17:34:39 +02:00
|
|
|
nm_utils_parse_inaddr_prefix_bin (int addr_family,
|
|
|
|
|
const char *text,
|
2018-09-17 14:18:47 +02:00
|
|
|
int *out_addr_family,
|
2017-09-14 12:02:00 +02:00
|
|
|
gpointer out_addr,
|
|
|
|
|
int *out_prefix)
|
2017-09-04 14:03:33 +02:00
|
|
|
{
|
|
|
|
|
gs_free char *addrstr_free = NULL;
|
|
|
|
|
int prefix = -1;
|
|
|
|
|
const char *slash;
|
|
|
|
|
const char *addrstr;
|
2017-09-14 12:02:00 +02:00
|
|
|
NMIPAddr addrbin;
|
2017-09-04 14:03:33 +02:00
|
|
|
|
|
|
|
|
g_return_val_if_fail (text, FALSE);
|
|
|
|
|
|
2018-09-17 14:18:47 +02:00
|
|
|
if (addr_family == AF_UNSPEC) {
|
|
|
|
|
g_return_val_if_fail (!out_addr || out_addr_family, FALSE);
|
2017-10-04 17:34:39 +02:00
|
|
|
addr_family = strchr (text, ':') ? AF_INET6 : AF_INET;
|
2018-09-17 14:18:47 +02:00
|
|
|
} else
|
|
|
|
|
g_return_val_if_fail (NM_IN_SET (addr_family, AF_INET, AF_INET6), FALSE);
|
2017-09-04 14:03:33 +02:00
|
|
|
|
|
|
|
|
slash = strchr (text, '/');
|
|
|
|
|
if (slash)
|
|
|
|
|
addrstr = addrstr_free = g_strndup (text, slash - text);
|
|
|
|
|
else
|
|
|
|
|
addrstr = text;
|
|
|
|
|
|
2017-10-04 17:34:39 +02:00
|
|
|
if (inet_pton (addr_family, addrstr, &addrbin) != 1)
|
2017-09-04 14:03:33 +02:00
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (slash) {
|
2019-02-28 14:22:35 +01:00
|
|
|
/* For IPv4, `ip addr add` supports the prefix-length as a netmask. We don't
|
|
|
|
|
* do that. */
|
2017-09-04 14:03:33 +02:00
|
|
|
prefix = _nm_utils_ascii_str_to_int64 (slash + 1, 10,
|
|
|
|
|
0,
|
2017-10-04 17:34:39 +02:00
|
|
|
addr_family == AF_INET ? 32 : 128,
|
2017-09-04 14:03:33 +02:00
|
|
|
-1);
|
|
|
|
|
if (prefix == -1)
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-17 14:18:47 +02:00
|
|
|
NM_SET_OUT (out_addr_family, addr_family);
|
2017-09-14 12:02:00 +02:00
|
|
|
if (out_addr)
|
2018-09-17 14:18:47 +02:00
|
|
|
nm_ip_addr_set (addr_family, out_addr, &addrbin);
|
2017-09-04 14:03:33 +02:00
|
|
|
NM_SET_OUT (out_prefix, prefix);
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-14 12:02:00 +02:00
|
|
|
gboolean
|
2017-10-04 17:34:39 +02:00
|
|
|
nm_utils_parse_inaddr_prefix (int addr_family,
|
|
|
|
|
const char *text,
|
2017-09-14 12:02:00 +02:00
|
|
|
char **out_addr,
|
|
|
|
|
int *out_prefix)
|
|
|
|
|
{
|
|
|
|
|
NMIPAddr addrbin;
|
|
|
|
|
char addrstr_buf[MAX (INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
|
|
|
|
|
|
2018-09-17 14:18:47 +02:00
|
|
|
if (!nm_utils_parse_inaddr_prefix_bin (addr_family, text, &addr_family, &addrbin, out_prefix))
|
2017-09-14 12:02:00 +02:00
|
|
|
return FALSE;
|
2017-10-04 17:34:39 +02:00
|
|
|
NM_SET_OUT (out_addr, g_strdup (inet_ntop (addr_family, &addrbin, addrstr_buf, sizeof (addrstr_buf))));
|
2017-09-14 12:02:00 +02:00
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-04 14:03:33 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2016-03-20 10:32:43 +01:00
|
|
|
/* _nm_utils_ascii_str_to_int64:
|
|
|
|
|
*
|
|
|
|
|
* A wrapper for g_ascii_strtoll, that checks whether the whole string
|
|
|
|
|
* can be successfully converted to a number and is within a given
|
|
|
|
|
* range. On any error, @fallback will be returned and %errno will be set
|
|
|
|
|
* to a non-zero value. On success, %errno will be set to zero, check %errno
|
|
|
|
|
* for errors. Any trailing or leading (ascii) white space is ignored and the
|
|
|
|
|
* functions is locale independent.
|
|
|
|
|
*
|
|
|
|
|
* The function is guaranteed to return a value between @min and @max
|
|
|
|
|
* (inclusive) or @fallback. Also, the parsing is rather strict, it does
|
|
|
|
|
* not allow for any unrecognized characters, except leading and trailing
|
|
|
|
|
* white space.
|
|
|
|
|
**/
|
|
|
|
|
gint64
|
|
|
|
|
_nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback)
|
|
|
|
|
{
|
|
|
|
|
gint64 v;
|
2016-11-02 12:04:38 +01:00
|
|
|
const char *s = NULL;
|
2016-03-20 10:32:43 +01:00
|
|
|
|
2019-05-01 11:36:02 +02:00
|
|
|
str = nm_str_skip_leading_spaces (str);
|
2016-03-20 10:32:43 +01:00
|
|
|
if (!str || !str[0]) {
|
|
|
|
|
errno = EINVAL;
|
|
|
|
|
return fallback;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
errno = 0;
|
2016-11-02 12:04:38 +01:00
|
|
|
v = g_ascii_strtoll (str, (char **) &s, base);
|
2016-03-20 10:32:43 +01:00
|
|
|
|
|
|
|
|
if (errno != 0)
|
2016-04-30 14:44:09 +02:00
|
|
|
return fallback;
|
2019-05-01 11:36:02 +02:00
|
|
|
|
2016-04-30 14:44:09 +02:00
|
|
|
if (s[0] != '\0') {
|
2019-05-01 11:36:02 +02:00
|
|
|
s = nm_str_skip_leading_spaces (s);
|
2016-04-30 14:44:09 +02:00
|
|
|
if (s[0] != '\0') {
|
|
|
|
|
errno = EINVAL;
|
|
|
|
|
return fallback;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (v > max || v < min) {
|
2016-03-20 10:32:43 +01:00
|
|
|
errno = ERANGE;
|
2016-04-30 14:44:09 +02:00
|
|
|
return fallback;
|
2016-03-20 10:32:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-16 14:06:38 +02:00
|
|
|
guint64
|
|
|
|
|
_nm_utils_ascii_str_to_uint64 (const char *str, guint base, guint64 min, guint64 max, guint64 fallback)
|
|
|
|
|
{
|
|
|
|
|
guint64 v;
|
|
|
|
|
const char *s = NULL;
|
|
|
|
|
|
|
|
|
|
if (str) {
|
|
|
|
|
while (g_ascii_isspace (str[0]))
|
|
|
|
|
str++;
|
|
|
|
|
}
|
|
|
|
|
if (!str || !str[0]) {
|
|
|
|
|
errno = EINVAL;
|
|
|
|
|
return fallback;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
|
v = g_ascii_strtoull (str, (char **) &s, base);
|
|
|
|
|
|
|
|
|
|
if (errno != 0)
|
|
|
|
|
return fallback;
|
|
|
|
|
if (s[0] != '\0') {
|
|
|
|
|
while (g_ascii_isspace (s[0]))
|
|
|
|
|
s++;
|
|
|
|
|
if (s[0] != '\0') {
|
|
|
|
|
errno = EINVAL;
|
|
|
|
|
return fallback;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (v > max || v < min) {
|
|
|
|
|
errno = ERANGE;
|
|
|
|
|
return fallback;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( v != 0
|
|
|
|
|
&& str[0] == '-') {
|
|
|
|
|
/* I don't know why, but g_ascii_strtoull() accepts minus signs ("-2" gives 18446744073709551614).
|
|
|
|
|
* For "-0" that is OK, but otherwise not. */
|
|
|
|
|
errno = ERANGE;
|
|
|
|
|
return fallback;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-20 10:32:43 +01:00
|
|
|
/*****************************************************************************/
|
2016-03-18 13:59:57 +01:00
|
|
|
|
2019-07-19 10:33:54 +02:00
|
|
|
int
|
|
|
|
|
nm_strcmp_with_data (gconstpointer a, gconstpointer b, gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
const char *s1 = a;
|
|
|
|
|
const char *s2 = b;
|
|
|
|
|
|
|
|
|
|
return strcmp (s1, s2);
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-16 08:28:26 +02:00
|
|
|
/* like nm_strcmp_p(), suitable for g_ptr_array_sort_with_data().
|
|
|
|
|
* g_ptr_array_sort() just casts nm_strcmp_p() to a function of different
|
|
|
|
|
* signature. I guess, in glib there are knowledgeable people that ensure
|
|
|
|
|
* that this additional argument doesn't cause problems due to different ABI
|
|
|
|
|
* for every architecture that glib supports.
|
|
|
|
|
* For NetworkManager, we'd rather avoid such stunts.
|
|
|
|
|
**/
|
|
|
|
|
int
|
|
|
|
|
nm_strcmp_p_with_data (gconstpointer a, gconstpointer b, gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
const char *s1 = *((const char **) a);
|
|
|
|
|
const char *s2 = *((const char **) b);
|
|
|
|
|
|
|
|
|
|
return strcmp (s1, s2);
|
|
|
|
|
}
|
|
|
|
|
|
2019-07-19 10:07:52 +02:00
|
|
|
int
|
|
|
|
|
nm_strcmp0_p_with_data (gconstpointer a, gconstpointer b, gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
const char *s1 = *((const char **) a);
|
|
|
|
|
const char *s2 = *((const char **) b);
|
|
|
|
|
|
|
|
|
|
return nm_strcmp0 (s1, s2);
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-16 08:28:26 +02:00
|
|
|
int
|
|
|
|
|
nm_cmp_uint32_p_with_data (gconstpointer p_a, gconstpointer p_b, gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
const guint32 a = *((const guint32 *) p_a);
|
|
|
|
|
const guint32 b = *((const guint32 *) p_b);
|
|
|
|
|
|
|
|
|
|
if (a < b)
|
|
|
|
|
return -1;
|
|
|
|
|
if (a > b)
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
nm_cmp_int2ptr_p_with_data (gconstpointer p_a, gconstpointer p_b, gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
/* p_a and p_b are two pointers to a pointer, where the pointer is
|
|
|
|
|
* interpreted as a integer using GPOINTER_TO_INT().
|
|
|
|
|
*
|
|
|
|
|
* That is the case of a hash-table that uses GINT_TO_POINTER() to
|
|
|
|
|
* convert integers as pointers, and the resulting keys-as-array
|
|
|
|
|
* array. */
|
|
|
|
|
const int a = GPOINTER_TO_INT (*((gconstpointer *) p_a));
|
|
|
|
|
const int b = GPOINTER_TO_INT (*((gconstpointer *) p_b));
|
|
|
|
|
|
|
|
|
|
if (a < b)
|
|
|
|
|
return -1;
|
|
|
|
|
if (a > b)
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-04-27 15:11:50 +02:00
|
|
|
const char *
|
|
|
|
|
nm_utils_dbus_path_get_last_component (const char *dbus_path)
|
|
|
|
|
{
|
|
|
|
|
if (dbus_path) {
|
|
|
|
|
dbus_path = strrchr (dbus_path, '/');
|
|
|
|
|
if (dbus_path)
|
|
|
|
|
return dbus_path + 1;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-26 11:34:20 +02:00
|
|
|
static gint64
|
|
|
|
|
_dbus_path_component_as_num (const char *p)
|
|
|
|
|
{
|
|
|
|
|
gint64 n;
|
|
|
|
|
|
|
|
|
|
/* no odd stuff. No leading zeros, only a non-negative, decimal integer.
|
|
|
|
|
*
|
|
|
|
|
* Otherwise, there would be multiple ways to encode the same number "10"
|
|
|
|
|
* and "010". That is just confusing. A number has no leading zeros,
|
|
|
|
|
* if it has, it's not a number (as far as we are concerned here). */
|
|
|
|
|
if (p[0] == '0') {
|
|
|
|
|
if (p[1] != '\0')
|
|
|
|
|
return -1;
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if (!(p[0] >= '1' && p[0] <= '9'))
|
|
|
|
|
return -1;
|
|
|
|
|
if (!NM_STRCHAR_ALL (&p[1], ch, (ch >= '0' && ch <= '9')))
|
|
|
|
|
return -1;
|
|
|
|
|
n = _nm_utils_ascii_str_to_int64 (p, 10, 0, G_MAXINT64, -1);
|
|
|
|
|
nm_assert (n == -1 || nm_streq0 (p, nm_sprintf_bufa (100, "%"G_GINT64_FORMAT, n)));
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
nm_utils_dbus_path_cmp (const char *dbus_path_a, const char *dbus_path_b)
|
|
|
|
|
{
|
|
|
|
|
const char *l_a, *l_b;
|
|
|
|
|
gsize plen;
|
|
|
|
|
gint64 n_a, n_b;
|
|
|
|
|
|
|
|
|
|
/* compare function for two D-Bus paths. It behaves like
|
|
|
|
|
* strcmp(), except, if both paths have the same prefix,
|
|
|
|
|
* and both end in a (positive) number, then the paths
|
|
|
|
|
* will be sorted by number. */
|
|
|
|
|
|
|
|
|
|
NM_CMP_SELF (dbus_path_a, dbus_path_b);
|
|
|
|
|
|
|
|
|
|
/* if one or both paths have no slash (and no last component)
|
|
|
|
|
* compare the full paths directly. */
|
|
|
|
|
if ( !(l_a = nm_utils_dbus_path_get_last_component (dbus_path_a))
|
|
|
|
|
|| !(l_b = nm_utils_dbus_path_get_last_component (dbus_path_b)))
|
|
|
|
|
goto comp_full;
|
|
|
|
|
|
|
|
|
|
/* check if both paths have the same prefix (up to the last-component). */
|
|
|
|
|
plen = l_a - dbus_path_a;
|
|
|
|
|
if (plen != (l_b - dbus_path_b))
|
|
|
|
|
goto comp_full;
|
|
|
|
|
NM_CMP_RETURN (strncmp (dbus_path_a, dbus_path_b, plen));
|
|
|
|
|
|
|
|
|
|
n_a = _dbus_path_component_as_num (l_a);
|
|
|
|
|
n_b = _dbus_path_component_as_num (l_b);
|
|
|
|
|
if (n_a == -1 && n_b == -1)
|
|
|
|
|
goto comp_l;
|
|
|
|
|
|
|
|
|
|
/* both components must be convertiable to a number. If they are not,
|
|
|
|
|
* (and only one of them is), then we must always strictly sort numeric parts
|
|
|
|
|
* after non-numeric components. If we wouldn't, we wouldn't have
|
|
|
|
|
* a total order.
|
|
|
|
|
*
|
|
|
|
|
* An example of a not total ordering would be:
|
|
|
|
|
* "8" < "010" (numeric)
|
|
|
|
|
* "0x" < "8" (lexical)
|
|
|
|
|
* "0x" > "010" (lexical)
|
|
|
|
|
* We avoid this, by forcing that a non-numeric entry "0x" always sorts
|
|
|
|
|
* before numeric entries.
|
|
|
|
|
*
|
|
|
|
|
* Additionally, _dbus_path_component_as_num() would also reject "010" as
|
|
|
|
|
* not a valid number.
|
|
|
|
|
*/
|
|
|
|
|
if (n_a == -1)
|
|
|
|
|
return -1;
|
|
|
|
|
if (n_b == -1)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
NM_CMP_DIRECT (n_a, n_b);
|
|
|
|
|
nm_assert (nm_streq (dbus_path_a, dbus_path_b));
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
comp_full:
|
|
|
|
|
NM_CMP_DIRECT_STRCMP0 (dbus_path_a, dbus_path_b);
|
|
|
|
|
return 0;
|
|
|
|
|
comp_l:
|
|
|
|
|
NM_CMP_DIRECT_STRCMP0 (l_a, l_b);
|
|
|
|
|
nm_assert (nm_streq (dbus_path_a, dbus_path_b));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-27 15:11:50 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2019-03-20 14:24:04 +01:00
|
|
|
static void
|
|
|
|
|
_char_lookup_table_init (guint8 lookup[static 256],
|
|
|
|
|
const char *candidates)
|
|
|
|
|
{
|
|
|
|
|
memset (lookup, 0, 256);
|
|
|
|
|
while (candidates[0] != '\0')
|
|
|
|
|
lookup[(guint8) ((candidates++)[0])] = 1;
|
|
|
|
|
}
|
|
|
|
|
|
2019-04-03 16:20:12 +02:00
|
|
|
static gboolean
|
|
|
|
|
_char_lookup_has (const guint8 lookup[static 256],
|
|
|
|
|
char ch)
|
|
|
|
|
{
|
|
|
|
|
nm_assert (lookup[(guint8) '\0'] == 0);
|
|
|
|
|
return lookup[(guint8) ch] != 0;
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-14 19:14:01 +02:00
|
|
|
/**
|
2019-04-03 15:44:19 +02:00
|
|
|
* nm_utils_strsplit_set_full:
|
2017-09-14 19:14:01 +02:00
|
|
|
* @str: the string to split.
|
2019-04-03 16:02:11 +02:00
|
|
|
* @delimiters: the set of delimiters.
|
2019-04-03 15:44:19 +02:00
|
|
|
* @flags: additional flags for controlling the operation.
|
2017-09-14 19:14:01 +02:00
|
|
|
*
|
|
|
|
|
* This is a replacement for g_strsplit_set() which avoids copying
|
|
|
|
|
* each word once (the entire strv array), but instead copies it once
|
|
|
|
|
* and all words point into that internal copy.
|
|
|
|
|
*
|
2019-04-03 17:32:59 +02:00
|
|
|
* Note that for @str %NULL and "", this always returns %NULL too. That differs
|
|
|
|
|
* from g_strsplit_set(), which would return an empty strv array for "".
|
|
|
|
|
*
|
|
|
|
|
* Note that g_strsplit_set() returns empty words as well. By default,
|
|
|
|
|
* nm_utils_strsplit_set_full() strips all empty tokens (that is, repeated
|
|
|
|
|
* delimiters. With %NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, empty tokens
|
|
|
|
|
* are not removed.
|
2017-09-14 19:14:01 +02:00
|
|
|
*
|
2019-04-03 15:44:19 +02:00
|
|
|
* If @flags has %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING, delimiters prefixed
|
|
|
|
|
* by a backslash are not treated as a separator. Such delimiters and their escape
|
2019-04-03 17:32:59 +02:00
|
|
|
* character are copied to the current word without unescaping them. In general,
|
|
|
|
|
* nm_utils_strsplit_set_full() does not remove any backslash escape characters
|
|
|
|
|
* and does not unescaping. It only considers them for skipping to split at
|
|
|
|
|
* an escaped delimiter.
|
2018-08-09 09:28:30 +02:00
|
|
|
*
|
2019-04-03 17:32:59 +02:00
|
|
|
* Returns: %NULL if @str is %NULL or "".
|
|
|
|
|
* If @str only contains delimiters and %NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY
|
|
|
|
|
* is not set, it also returns %NULL.
|
|
|
|
|
* Otherwise, a %NULL terminated strv array containing the split words.
|
|
|
|
|
* (delimiter characters are removed).
|
2017-09-14 19:14:01 +02:00
|
|
|
* The strings to which the result strv array points to are allocated
|
|
|
|
|
* after the returned result itself. Don't free the strings themself,
|
|
|
|
|
* but free everything with g_free().
|
2019-03-18 13:14:33 +01:00
|
|
|
* It is however safe and allowed to modify the indiviual strings,
|
|
|
|
|
* like "g_strstrip((char *) iter[0])".
|
2017-09-14 19:14:01 +02:00
|
|
|
*/
|
|
|
|
|
const char **
|
2019-04-03 15:44:19 +02:00
|
|
|
nm_utils_strsplit_set_full (const char *str,
|
|
|
|
|
const char *delimiters,
|
|
|
|
|
NMUtilsStrsplitSetFlags flags)
|
2017-09-14 19:14:01 +02:00
|
|
|
{
|
2019-04-05 22:44:49 +02:00
|
|
|
const char **ptr;
|
|
|
|
|
gsize num_tokens;
|
|
|
|
|
gsize i_token;
|
|
|
|
|
gsize str_len_p1;
|
|
|
|
|
const char *c_str;
|
2017-09-14 19:14:01 +02:00
|
|
|
char *s;
|
2019-04-03 16:20:12 +02:00
|
|
|
guint8 ch_lookup[256];
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED to nm_utils_strsplit_set_full()
Add a new flag that will remove escape characters after splitting
the string.
This implements a special kind of backslash escaping. It's not C escape
sequences (like '\n' or '\020'), but simply to take the special character
following the backslash verbatim. Note that the backslash is only
considered special, if it's followed by a delimiter, another backslash,
or a whitespace (in combination with %NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP).
The main purpose of this form of escaping is nmcli's list options, like
$ nmcli connection modify "$PROFILE" +ipv4.routing-rules 'priority 5 from 192.168.7.5/32 table 5, priority 6 iif a\, from 192.168.7.5/32 table 6'
It's a contrieved example, but the list options are a list of IP
addresses, rules, etc. They implement their own syntax for one element,
and are concatenated by ','. To support that one element may have
arbitrary characters (including the delimiter and whitespaces), nmcli
employs a tokenization with this special kind of escaping.
(cherry picked from commit 9522aaf22678e57787e3def3baf956bb5457fe20)
2019-04-11 19:24:15 +02:00
|
|
|
const gboolean f_escaped = NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED);
|
|
|
|
|
const gboolean f_allow_escaping = f_escaped || NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING);
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
const gboolean f_preserve_empty = NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY);
|
|
|
|
|
const gboolean f_strstrip = NM_FLAGS_HAS (flags, NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP);
|
2017-09-14 19:14:01 +02:00
|
|
|
|
|
|
|
|
if (!str)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
2019-04-03 16:02:11 +02:00
|
|
|
if (!delimiters) {
|
|
|
|
|
nm_assert_not_reached ();
|
2017-09-14 19:14:01 +02:00
|
|
|
delimiters = " \t\n";
|
2019-04-03 16:02:11 +02:00
|
|
|
}
|
2019-04-03 16:20:12 +02:00
|
|
|
_char_lookup_table_init (ch_lookup, delimiters);
|
2017-09-14 19:14:01 +02:00
|
|
|
|
2019-04-03 16:41:21 +02:00
|
|
|
nm_assert ( !f_allow_escaping
|
|
|
|
|
|| !_char_lookup_has (ch_lookup, '\\'));
|
2017-09-14 19:14:01 +02:00
|
|
|
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
if (!f_preserve_empty) {
|
2019-04-03 17:32:59 +02:00
|
|
|
while (_char_lookup_has (ch_lookup, str[0]))
|
|
|
|
|
str++;
|
|
|
|
|
}
|
2018-08-09 09:28:30 +02:00
|
|
|
|
2019-04-03 17:32:59 +02:00
|
|
|
if (!str[0]) {
|
|
|
|
|
/* We return %NULL here, also with NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY.
|
|
|
|
|
* That makes nm_utils_strsplit_set_full() with NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY
|
|
|
|
|
* different from g_strsplit_set(), which would in this case return an empty array.
|
|
|
|
|
* If you need to handle %NULL, and "" specially, then check the input string first. */
|
2017-09-14 19:14:01 +02:00
|
|
|
return NULL;
|
2019-04-03 17:32:59 +02:00
|
|
|
}
|
2017-09-14 19:14:01 +02:00
|
|
|
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
#define _char_is_escaped(str_start, str_cur) \
|
|
|
|
|
({ \
|
|
|
|
|
const char *const _str_start = (str_start); \
|
|
|
|
|
const char *const _str_cur = (str_cur); \
|
|
|
|
|
const char *_str_i = (_str_cur); \
|
|
|
|
|
\
|
|
|
|
|
while ( _str_i > _str_start \
|
|
|
|
|
&& _str_i[-1] == '\\') \
|
|
|
|
|
_str_i--; \
|
|
|
|
|
(((_str_cur - _str_i) % 2) != 0); \
|
|
|
|
|
})
|
2017-09-14 19:14:01 +02:00
|
|
|
|
2019-04-05 22:44:49 +02:00
|
|
|
num_tokens = 1;
|
|
|
|
|
c_str = str;
|
|
|
|
|
while (TRUE) {
|
2017-09-14 19:14:01 +02:00
|
|
|
|
2019-04-05 22:44:49 +02:00
|
|
|
while (G_LIKELY (!_char_lookup_has (ch_lookup, c_str[0]))) {
|
|
|
|
|
if (c_str[0] == '\0')
|
|
|
|
|
goto done1;
|
|
|
|
|
c_str++;
|
|
|
|
|
}
|
2017-09-14 19:14:01 +02:00
|
|
|
|
2019-04-05 22:44:49 +02:00
|
|
|
/* we assume escapings are not frequent. After we found
|
|
|
|
|
* this delimiter, check whether it was escaped by counting
|
|
|
|
|
* the backslashed before. */
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
if ( f_allow_escaping
|
|
|
|
|
&& _char_is_escaped (str, c_str)) {
|
|
|
|
|
/* the delimiter is escaped. This was not an accepted delimiter. */
|
|
|
|
|
c_str++;
|
|
|
|
|
continue;
|
2017-09-14 19:14:01 +02:00
|
|
|
}
|
|
|
|
|
|
2019-04-05 22:44:49 +02:00
|
|
|
c_str++;
|
|
|
|
|
|
|
|
|
|
/* if we drop empty tokens, then we now skip over all consecutive delimiters. */
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
if (!f_preserve_empty) {
|
2019-04-05 22:44:49 +02:00
|
|
|
while (_char_lookup_has (ch_lookup, c_str[0]))
|
|
|
|
|
c_str++;
|
|
|
|
|
if (c_str[0] == '\0')
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
num_tokens++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
done1:
|
|
|
|
|
|
|
|
|
|
nm_assert (c_str[0] == '\0');
|
|
|
|
|
|
|
|
|
|
str_len_p1 = (c_str - str) + 1;
|
|
|
|
|
|
|
|
|
|
nm_assert (str[str_len_p1 - 1] == '\0');
|
|
|
|
|
|
|
|
|
|
ptr = g_malloc ((sizeof (const char *) * (num_tokens + 1)) + str_len_p1);
|
|
|
|
|
s = (char *) &ptr[num_tokens + 1];
|
|
|
|
|
memcpy (s, str, str_len_p1);
|
|
|
|
|
|
|
|
|
|
i_token = 0;
|
|
|
|
|
|
|
|
|
|
while (TRUE) {
|
|
|
|
|
|
|
|
|
|
nm_assert (i_token < num_tokens);
|
|
|
|
|
ptr[i_token++] = s;
|
2017-09-14 19:14:01 +02:00
|
|
|
|
2019-04-03 17:32:59 +02:00
|
|
|
if (s[0] == '\0') {
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
nm_assert (f_preserve_empty);
|
2019-04-05 22:44:49 +02:00
|
|
|
goto done2;
|
2019-04-03 17:32:59 +02:00
|
|
|
}
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
nm_assert ( f_preserve_empty
|
2019-04-03 17:32:59 +02:00
|
|
|
|| !_char_lookup_has (ch_lookup, s[0]));
|
2017-09-14 19:14:01 +02:00
|
|
|
|
2019-04-03 16:41:21 +02:00
|
|
|
while (!_char_lookup_has (ch_lookup, s[0])) {
|
|
|
|
|
if (G_UNLIKELY ( s[0] == '\\'
|
|
|
|
|
&& f_allow_escaping)) {
|
|
|
|
|
s++;
|
|
|
|
|
if (s[0] == '\0')
|
2019-04-05 22:44:49 +02:00
|
|
|
goto done2;
|
2019-04-03 16:41:21 +02:00
|
|
|
s++;
|
|
|
|
|
} else if (s[0] == '\0')
|
2019-04-05 22:44:49 +02:00
|
|
|
goto done2;
|
2019-04-03 16:41:21 +02:00
|
|
|
else
|
|
|
|
|
s++;
|
2017-09-14 19:14:01 +02:00
|
|
|
}
|
|
|
|
|
|
2019-04-03 16:41:21 +02:00
|
|
|
nm_assert (_char_lookup_has (ch_lookup, s[0]));
|
2017-09-14 19:14:01 +02:00
|
|
|
s[0] = '\0';
|
2019-04-03 16:41:21 +02:00
|
|
|
s++;
|
2019-04-05 22:44:49 +02:00
|
|
|
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
if (!f_preserve_empty) {
|
2019-04-03 17:32:59 +02:00
|
|
|
while (_char_lookup_has (ch_lookup, s[0]))
|
|
|
|
|
s++;
|
|
|
|
|
if (s[0] == '\0')
|
2019-04-05 22:44:49 +02:00
|
|
|
goto done2;
|
2019-04-03 17:32:59 +02:00
|
|
|
}
|
2017-09-14 19:14:01 +02:00
|
|
|
}
|
2019-04-03 16:41:21 +02:00
|
|
|
|
2019-04-05 22:44:49 +02:00
|
|
|
done2:
|
|
|
|
|
nm_assert (i_token == num_tokens);
|
|
|
|
|
ptr[i_token] = NULL;
|
2017-09-14 19:14:01 +02:00
|
|
|
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP to nm_utils_strsplit_set_full()
This will essentially call g_strstrip() on each token.
There are some specialties:
- if the resulting word is empty after stripping, then according to
%NM_UTILS_STRSPLIT_SET_FLAGS_PRESERVE_EMPTY, the empty token will be
removed. If that results in an empty string array, %NULL will be
returned.
- if %NM_UTILS_STRSPLIT_SET_FLAGS_ALLOW_ESCAPING is set, then
whitespace that is backslash escaped is not removed.
Since this is a post-operation that happens after tokeninzing, it
could be done as a separate function. And we already have this function:
_nm_utils_unescape_plain() and _nm_utils_unescape_spaces().
However, that is ugly for several reasons:
- the stripping should be part of the tokenizing, you shouldn't need
several steps.
- nm_utils_strsplit_set_full() returns a "const char **" which
indicates the strings must not be freed. However, it is perfectly
valid to modify the string inplace. Hence, the post-op function
would need to cast the strings to "char *", which seems ugly
(although we do that on many places, and it's guaranteed to work).
- _nm_utils_unescape_plain()/_nm_utils_unescape_spaces() is indeed
already used together with nm_utils_strsplit_set_full(). However,
it requires to initialize the cb_lookup buffer twice. I would expect
that initializing the cb_lookup buffer is a large portion of what
the function does already (for short strings).
This issue will be solved in the next commit by adding yet another flag
which allows to unescape.
(cherry picked from commit 5b2b0dcadfd40883865f5ce4e3f8632008b2d973)
2019-04-11 13:32:43 +02:00
|
|
|
if (f_strstrip) {
|
|
|
|
|
gsize i;
|
|
|
|
|
|
|
|
|
|
i_token = 0;
|
|
|
|
|
for (i = 0; ptr[i]; i++) {
|
|
|
|
|
|
|
|
|
|
s = (char *) nm_str_skip_leading_spaces (ptr[i]);
|
|
|
|
|
if (s[0] != '\0') {
|
|
|
|
|
char *s_last;
|
|
|
|
|
|
|
|
|
|
s_last = &s[strlen (s) - 1];
|
|
|
|
|
while ( s_last > s
|
|
|
|
|
&& g_ascii_isspace (s_last[0])
|
|
|
|
|
&& ( ! f_allow_escaping
|
|
|
|
|
|| !_char_is_escaped (s, s_last)))
|
|
|
|
|
(s_last--)[0] = '\0';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( !f_preserve_empty
|
|
|
|
|
&& s[0] == '\0')
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
ptr[i_token++] = s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i_token == 0) {
|
|
|
|
|
g_free (ptr);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
ptr[i_token] = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
shared: add NM_UTILS_STRSPLIT_SET_FLAGS_ESCAPED to nm_utils_strsplit_set_full()
Add a new flag that will remove escape characters after splitting
the string.
This implements a special kind of backslash escaping. It's not C escape
sequences (like '\n' or '\020'), but simply to take the special character
following the backslash verbatim. Note that the backslash is only
considered special, if it's followed by a delimiter, another backslash,
or a whitespace (in combination with %NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP).
The main purpose of this form of escaping is nmcli's list options, like
$ nmcli connection modify "$PROFILE" +ipv4.routing-rules 'priority 5 from 192.168.7.5/32 table 5, priority 6 iif a\, from 192.168.7.5/32 table 6'
It's a contrieved example, but the list options are a list of IP
addresses, rules, etc. They implement their own syntax for one element,
and are concatenated by ','. To support that one element may have
arbitrary characters (including the delimiter and whitespaces), nmcli
employs a tokenization with this special kind of escaping.
(cherry picked from commit 9522aaf22678e57787e3def3baf956bb5457fe20)
2019-04-11 19:24:15 +02:00
|
|
|
if (f_escaped) {
|
|
|
|
|
gsize i, j;
|
|
|
|
|
|
|
|
|
|
/* We no longer need ch_lookup for its original purpose. Modify it, so it
|
|
|
|
|
* can detect the delimiters, '\\', and (optionally) whitespaces. */
|
|
|
|
|
ch_lookup[((guint8) '\\')] = 1;
|
|
|
|
|
if (f_strstrip) {
|
|
|
|
|
for (i = 0; NM_ASCII_SPACES[i]; i++)
|
|
|
|
|
ch_lookup[((guint8) (NM_ASCII_SPACES[i]))] = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i_token = 0; ptr[i_token]; i_token++) {
|
|
|
|
|
s = (char *) ptr[i_token];
|
|
|
|
|
j = 0;
|
|
|
|
|
for (i = 0; s[i] != '\0'; ) {
|
|
|
|
|
if ( s[i] == '\\'
|
|
|
|
|
&& _char_lookup_has (ch_lookup, s[i + 1]))
|
|
|
|
|
i++;
|
|
|
|
|
s[j++] = s[i++];
|
|
|
|
|
}
|
|
|
|
|
s[j] = '\0';
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-09-14 19:14:01 +02:00
|
|
|
return ptr;
|
|
|
|
|
}
|
|
|
|
|
|
shared: add nm_utils_escaped_tokens_escape()
This escapes strings so that they can be concatenated with a delimiter
and without loss tokenized with nm_utils_escaped_tokens_split().
Note that this is similar to _nm_utils_escape_plain() and
_nm_utils_escape_spaces(). The difference is that
nm_utils_escaped_tokens_escape() also escapes the last trailing
whitespace. That means, if delimiters contains all NM_ASCII_SPACES, then
it is identical to _nm_utils_escape_spaces(). Otherwise, the trailing
space is treated specially. That is, because
nm_utils_escaped_tokens_split() uses NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP,
to strip leading and trailing whitespace. To still express a trailing
whitespace, the last whitespace must be escaped. Note that
NM_UTILS_STRSPLIT_SET_FLAGS_STRSTRIP also honors escaping any whitespace
(not only at the last position), but when escaping we don't need to
escape them, because unescaped (non-trailing) whitespace are taken just
fine.
The pair nm_utils_escaped_tokens_split() and
nm_utils_escaped_tokens_escape() are proposed as default way of
tokenizing a list of items. For example, with
$ nmcli connection modify "$PROFILE" +ipv4.routing-rules 'priority 5 from 192.168.7.5/32 table 5, priority 6 iif a\, from 192.168.7.5/32 table 6'
Here we implement a to/from string function to handle one item
(nm_ip_routing_rule_{from,to}_string()). When such elements are combined with ',',
then we need to support an additional layer of escaping on top of that.
The advantage is that the indvidual to/from string functions are agnostic
to this second layer of escaping/tokenizing that nmcli employs to handle
a list of these items.
The disadvantage is that we possibly get multiple layers of backslash
escapings. That is only mitigated by the fact that nm_utils_escaped_tokens_*()
supports a syntax for which *most* characters don't need any special escaping.
Only delimiters, backslash, and the trailing space needs escaping, and
these are cases are expected to be few.
(cherry picked from commit e206e3d4d8ff1ce914b53eea650b9cceef4f3754)
2019-04-11 21:20:11 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
nm_utils_escaped_tokens_escape (const char *str,
|
|
|
|
|
const char *delimiters,
|
|
|
|
|
char **out_to_free)
|
|
|
|
|
{
|
|
|
|
|
guint8 ch_lookup[256];
|
|
|
|
|
char *ret;
|
|
|
|
|
gsize str_len;
|
|
|
|
|
gsize alloc_len;
|
|
|
|
|
gsize n_escapes;
|
|
|
|
|
gsize i, j;
|
|
|
|
|
gboolean escape_trailing_space;
|
|
|
|
|
|
|
|
|
|
if (!delimiters) {
|
|
|
|
|
nm_assert (delimiters);
|
|
|
|
|
delimiters = NM_ASCII_SPACES;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!str || str[0] == '\0') {
|
|
|
|
|
*out_to_free = NULL;
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_char_lookup_table_init (ch_lookup, delimiters);
|
|
|
|
|
|
|
|
|
|
/* also mark '\\' as requiring escaping. */
|
|
|
|
|
ch_lookup[((guint8) '\\')] = 1;
|
|
|
|
|
|
|
|
|
|
n_escapes = 0;
|
|
|
|
|
for (i = 0; str[i] != '\0'; i++) {
|
|
|
|
|
if (_char_lookup_has (ch_lookup, str[i]))
|
|
|
|
|
n_escapes++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
str_len = i;
|
|
|
|
|
nm_assert (str_len > 0 && strlen (str) == str_len);
|
|
|
|
|
|
|
|
|
|
escape_trailing_space = !_char_lookup_has (ch_lookup, str[str_len - 1])
|
|
|
|
|
&& g_ascii_isspace (str[str_len - 1]);
|
|
|
|
|
|
|
|
|
|
if ( n_escapes == 0
|
|
|
|
|
&& !escape_trailing_space) {
|
|
|
|
|
*out_to_free = NULL;
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
alloc_len = str_len + n_escapes + ((gsize) escape_trailing_space) + 1;
|
|
|
|
|
ret = g_new (char, alloc_len);
|
|
|
|
|
|
|
|
|
|
j = 0;
|
|
|
|
|
for (i = 0; str[i] != '\0'; i++) {
|
|
|
|
|
if (_char_lookup_has (ch_lookup, str[i])) {
|
|
|
|
|
nm_assert (j < alloc_len);
|
|
|
|
|
ret[j++] = '\\';
|
|
|
|
|
}
|
|
|
|
|
nm_assert (j < alloc_len);
|
|
|
|
|
ret[j++] = str[i];
|
|
|
|
|
}
|
|
|
|
|
if (escape_trailing_space) {
|
|
|
|
|
nm_assert (!_char_lookup_has (ch_lookup, ret[j - 1]) && g_ascii_isspace (ret[j - 1]));
|
|
|
|
|
ret[j] = ret[j - 1];
|
|
|
|
|
ret[j - 1] = '\\';
|
|
|
|
|
j++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nm_assert (j == alloc_len - 1);
|
|
|
|
|
ret[j] = '\0';
|
|
|
|
|
|
|
|
|
|
*out_to_free = ret;
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-02-04 17:49:30 +01:00
|
|
|
/**
|
|
|
|
|
* nm_utils_strv_find_first:
|
|
|
|
|
* @list: the strv list to search
|
|
|
|
|
* @len: the length of the list, or a negative value if @list is %NULL terminated.
|
|
|
|
|
* @needle: the value to search for. The search is done using strcmp().
|
|
|
|
|
*
|
|
|
|
|
* Searches @list for @needle and returns the index of the first match (based
|
|
|
|
|
* on strcmp()).
|
|
|
|
|
*
|
|
|
|
|
* For convenience, @list has type 'char**' instead of 'const char **'.
|
|
|
|
|
*
|
|
|
|
|
* Returns: index of first occurrence or -1 if @needle is not found in @list.
|
|
|
|
|
*/
|
|
|
|
|
gssize
|
|
|
|
|
nm_utils_strv_find_first (char **list, gssize len, const char *needle)
|
|
|
|
|
{
|
|
|
|
|
gssize i;
|
|
|
|
|
|
|
|
|
|
if (len > 0) {
|
|
|
|
|
g_return_val_if_fail (list, -1);
|
|
|
|
|
|
|
|
|
|
if (!needle) {
|
|
|
|
|
/* if we search a list with known length, %NULL is a valid @needle. */
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
if (!list[i])
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
if (list[i] && !strcmp (needle, list[i]))
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if (len < 0) {
|
|
|
|
|
g_return_val_if_fail (needle, -1);
|
|
|
|
|
|
|
|
|
|
if (list) {
|
|
|
|
|
for (i = 0; list[i]; i++) {
|
|
|
|
|
if (strcmp (needle, list[i]) == 0)
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-30 17:28:26 +02:00
|
|
|
char **
|
|
|
|
|
_nm_utils_strv_cleanup (char **strv,
|
|
|
|
|
gboolean strip_whitespace,
|
|
|
|
|
gboolean skip_empty,
|
|
|
|
|
gboolean skip_repeated)
|
|
|
|
|
{
|
|
|
|
|
guint i, j;
|
|
|
|
|
|
|
|
|
|
if (!strv || !*strv)
|
|
|
|
|
return strv;
|
|
|
|
|
|
|
|
|
|
if (strip_whitespace) {
|
2019-07-19 10:10:35 +02:00
|
|
|
/* we only modify the strings pointed to by @strv if @strip_whitespace is
|
|
|
|
|
* requested. Otherwise, the strings themselves are untouched. */
|
2017-03-30 17:28:26 +02:00
|
|
|
for (i = 0; strv[i]; i++)
|
|
|
|
|
g_strstrip (strv[i]);
|
|
|
|
|
}
|
|
|
|
|
if (!skip_empty && !skip_repeated)
|
|
|
|
|
return strv;
|
|
|
|
|
j = 0;
|
|
|
|
|
for (i = 0; strv[i]; i++) {
|
|
|
|
|
if ( (skip_empty && !*strv[i])
|
|
|
|
|
|| (skip_repeated && nm_utils_strv_find_first (strv, j, strv[i]) >= 0))
|
|
|
|
|
g_free (strv[i]);
|
|
|
|
|
else
|
|
|
|
|
strv[j++] = strv[i];
|
|
|
|
|
}
|
|
|
|
|
strv[j] = NULL;
|
|
|
|
|
return strv;
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-04 17:49:30 +01:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
int
|
2016-04-18 17:11:49 +02:00
|
|
|
_nm_utils_ascii_str_to_bool (const char *str,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
int default_value)
|
2016-04-18 17:11:49 +02:00
|
|
|
{
|
2019-04-02 12:24:40 +02:00
|
|
|
gs_free char *str_free = NULL;
|
2016-04-18 17:11:49 +02:00
|
|
|
|
|
|
|
|
if (!str)
|
|
|
|
|
return default_value;
|
|
|
|
|
|
2019-04-02 12:24:40 +02:00
|
|
|
str = nm_strstrip_avoid_copy_a (300, str, &str_free);
|
|
|
|
|
if (str[0] == '\0')
|
2016-04-18 17:11:49 +02:00
|
|
|
return default_value;
|
|
|
|
|
|
2019-04-02 12:24:40 +02:00
|
|
|
if ( !g_ascii_strcasecmp (str, "true")
|
|
|
|
|
|| !g_ascii_strcasecmp (str, "yes")
|
|
|
|
|
|| !g_ascii_strcasecmp (str, "on")
|
|
|
|
|
|| !g_ascii_strcasecmp (str, "1"))
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
if ( !g_ascii_strcasecmp (str, "false")
|
|
|
|
|
|| !g_ascii_strcasecmp (str, "no")
|
|
|
|
|
|| !g_ascii_strcasecmp (str, "off")
|
|
|
|
|
|| !g_ascii_strcasecmp (str, "0"))
|
|
|
|
|
return FALSE;
|
2016-04-18 17:11:49 +02:00
|
|
|
|
|
|
|
|
return default_value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-02-02 21:47:03 +01:00
|
|
|
NM_CACHED_QUARK_FCN ("nm-utils-error-quark", nm_utils_error_quark)
|
2016-03-18 13:59:57 +01:00
|
|
|
|
|
|
|
|
void
|
|
|
|
|
nm_utils_error_set_cancelled (GError **error,
|
|
|
|
|
gboolean is_disposing,
|
|
|
|
|
const char *instance_name)
|
|
|
|
|
{
|
|
|
|
|
if (is_disposing) {
|
|
|
|
|
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_CANCELLED_DISPOSING,
|
|
|
|
|
"Disposing %s instance",
|
|
|
|
|
instance_name && *instance_name ? instance_name : "source");
|
|
|
|
|
} else {
|
|
|
|
|
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_CANCELLED,
|
|
|
|
|
"Request cancelled");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_utils_error_is_cancelled (GError *error,
|
|
|
|
|
gboolean consider_is_disposing)
|
|
|
|
|
{
|
|
|
|
|
if (error) {
|
2018-12-12 07:23:51 +01:00
|
|
|
if (error->domain == G_IO_ERROR)
|
|
|
|
|
return NM_IN_SET (error->code, G_IO_ERROR_CANCELLED);
|
|
|
|
|
if (consider_is_disposing) {
|
|
|
|
|
if (error->domain == NM_UTILS_ERROR)
|
|
|
|
|
return NM_IN_SET (error->code, NM_UTILS_ERROR_CANCELLED_DISPOSING);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_utils_error_is_notfound (GError *error)
|
|
|
|
|
{
|
|
|
|
|
if (error) {
|
|
|
|
|
if (error->domain == G_IO_ERROR)
|
|
|
|
|
return NM_IN_SET (error->code, G_IO_ERROR_NOT_FOUND);
|
|
|
|
|
if (error->domain == G_FILE_ERROR)
|
|
|
|
|
return NM_IN_SET (error->code, G_FILE_ERROR_NOENT);
|
2016-03-18 13:59:57 +01:00
|
|
|
}
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2016-03-18 13:56:53 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_g_object_set_property:
|
|
|
|
|
* @object: the target object
|
|
|
|
|
* @property_name: the property name
|
|
|
|
|
* @value: the #GValue to set
|
|
|
|
|
* @error: (allow-none): optional error argument
|
|
|
|
|
*
|
|
|
|
|
* A reimplementation of g_object_set_property(), but instead
|
|
|
|
|
* returning an error instead of logging a warning. All g_object_set*()
|
|
|
|
|
* versions in glib require you to not pass invalid types or they will
|
|
|
|
|
* log a g_warning() -- without reporting an error. We don't want that,
|
|
|
|
|
* so we need to hack error checking around it.
|
|
|
|
|
*
|
|
|
|
|
* Returns: whether the value was successfully set.
|
|
|
|
|
*/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property (GObject *object,
|
2019-01-03 11:17:18 +01:00
|
|
|
const char *property_name,
|
2016-03-18 13:56:53 +01:00
|
|
|
const GValue *value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
GParamSpec *pspec;
|
|
|
|
|
nm_auto_unset_gvalue GValue tmp_value = G_VALUE_INIT;
|
|
|
|
|
GObjectClass *klass;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
|
|
|
|
|
g_return_val_if_fail (property_name != NULL, FALSE);
|
|
|
|
|
g_return_val_if_fail (G_IS_VALUE (value), FALSE);
|
|
|
|
|
g_return_val_if_fail (!error || !*error, FALSE);
|
|
|
|
|
|
|
|
|
|
/* g_object_class_find_property() does g_param_spec_get_redirect_target(),
|
|
|
|
|
* where we differ from a plain g_object_set_property(). */
|
|
|
|
|
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (object), property_name);
|
|
|
|
|
|
|
|
|
|
if (!pspec) {
|
|
|
|
|
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
|
|
|
|
|
_("object class '%s' has no property named '%s'"),
|
|
|
|
|
G_OBJECT_TYPE_NAME (object),
|
|
|
|
|
property_name);
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
if (!(pspec->flags & G_PARAM_WRITABLE)) {
|
|
|
|
|
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
|
|
|
|
|
_("property '%s' of object class '%s' is not writable"),
|
|
|
|
|
pspec->name,
|
|
|
|
|
G_OBJECT_TYPE_NAME (object));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY)) {
|
|
|
|
|
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
|
|
|
|
|
_("construct property \"%s\" for object '%s' can't be set after construction"),
|
|
|
|
|
pspec->name, G_OBJECT_TYPE_NAME (object));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
klass = g_type_class_peek (pspec->owner_type);
|
|
|
|
|
if (klass == NULL) {
|
|
|
|
|
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
|
|
|
|
|
_("'%s::%s' is not a valid property name; '%s' is not a GObject subtype"),
|
|
|
|
|
g_type_name (pspec->owner_type), pspec->name, g_type_name (pspec->owner_type));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* provide a copy to work from, convert (if necessary) and validate */
|
|
|
|
|
g_value_init (&tmp_value, pspec->value_type);
|
|
|
|
|
if (!g_value_transform (value, &tmp_value)) {
|
|
|
|
|
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
|
|
|
|
|
_("unable to set property '%s' of type '%s' from value of type '%s'"),
|
|
|
|
|
pspec->name,
|
|
|
|
|
g_type_name (pspec->value_type),
|
|
|
|
|
G_VALUE_TYPE_NAME (value));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
if ( g_param_value_validate (pspec, &tmp_value)
|
|
|
|
|
&& !(pspec->flags & G_PARAM_LAX_VALIDATION)) {
|
|
|
|
|
gs_free char *contents = g_strdup_value_contents (value);
|
|
|
|
|
|
|
|
|
|
g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN,
|
|
|
|
|
_("value \"%s\" of type '%s' is invalid or out of range for property '%s' of type '%s'"),
|
|
|
|
|
contents,
|
|
|
|
|
G_VALUE_TYPE_NAME (value),
|
|
|
|
|
pspec->name,
|
|
|
|
|
g_type_name (pspec->value_type));
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_object_set_property (object, property_name, &tmp_value);
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-03 11:17:18 +01:00
|
|
|
#define _set_property(object, property_name, gtype, gtype_set, value, error) \
|
|
|
|
|
G_STMT_START { \
|
|
|
|
|
nm_auto_unset_gvalue GValue gvalue = { 0 }; \
|
|
|
|
|
\
|
|
|
|
|
g_value_init (&gvalue, gtype); \
|
|
|
|
|
gtype_set (&gvalue, (value)); \
|
|
|
|
|
return nm_g_object_set_property ((object), (property_name), &gvalue, (error)); \
|
|
|
|
|
} G_STMT_END
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_string (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
const char *value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
_set_property (object, property_name, G_TYPE_STRING, g_value_set_string, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_string_static (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
const char *value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
_set_property (object, property_name, G_TYPE_STRING, g_value_set_static_string, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_string_take (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
char *value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
_set_property (object, property_name, G_TYPE_STRING, g_value_take_string, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-23 16:01:24 +01:00
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_boolean (GObject *object,
|
2019-01-03 11:17:18 +01:00
|
|
|
const char *property_name,
|
2017-11-23 16:01:24 +01:00
|
|
|
gboolean value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
2019-01-03 11:17:18 +01:00
|
|
|
_set_property (object, property_name, G_TYPE_BOOLEAN, g_value_set_boolean, !!value, error);
|
|
|
|
|
}
|
2017-11-23 16:01:24 +01:00
|
|
|
|
2019-01-03 11:17:18 +01:00
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_char (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
gint8 value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
/* glib says about G_TYPE_CHAR:
|
|
|
|
|
*
|
|
|
|
|
* The type designated by G_TYPE_CHAR is unconditionally an 8-bit signed integer.
|
|
|
|
|
*
|
|
|
|
|
* This is always a (signed!) char. */
|
|
|
|
|
_set_property (object, property_name, G_TYPE_CHAR, g_value_set_schar, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_uchar (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
guint8 value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
_set_property (object, property_name, G_TYPE_UCHAR, g_value_set_uchar, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_int (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
int value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
_set_property (object, property_name, G_TYPE_INT, g_value_set_int, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_int64 (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
gint64 value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
_set_property (object, property_name, G_TYPE_INT64, g_value_set_int64, value, error);
|
2017-11-23 16:01:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_uint (GObject *object,
|
2019-01-02 09:09:37 +01:00
|
|
|
const char *property_name,
|
2017-11-23 16:01:24 +01:00
|
|
|
guint value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
2019-01-03 11:17:18 +01:00
|
|
|
_set_property (object, property_name, G_TYPE_UINT, g_value_set_uint, value, error);
|
|
|
|
|
}
|
2017-11-23 16:01:24 +01:00
|
|
|
|
2019-01-03 11:17:18 +01:00
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_uint64 (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
guint64 value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
_set_property (object, property_name, G_TYPE_UINT64, g_value_set_uint64, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_flags (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
GType gtype,
|
|
|
|
|
guint value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
nm_assert (({
|
|
|
|
|
nm_auto_unref_gtypeclass GTypeClass *gtypeclass = g_type_class_ref (gtype);
|
|
|
|
|
G_IS_FLAGS_CLASS (gtypeclass);
|
|
|
|
|
}));
|
|
|
|
|
_set_property (object, property_name, gtype, g_value_set_flags, value, error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_g_object_set_property_enum (GObject *object,
|
|
|
|
|
const char *property_name,
|
|
|
|
|
GType gtype,
|
|
|
|
|
int value,
|
|
|
|
|
GError **error)
|
|
|
|
|
{
|
|
|
|
|
nm_assert (({
|
|
|
|
|
nm_auto_unref_gtypeclass GTypeClass *gtypeclass = g_type_class_ref (gtype);
|
|
|
|
|
G_IS_ENUM_CLASS (gtypeclass);
|
|
|
|
|
}));
|
|
|
|
|
_set_property (object, property_name, gtype, g_value_set_enum, value, error);
|
2017-11-23 16:01:24 +01:00
|
|
|
}
|
|
|
|
|
|
2017-09-07 17:56:38 +02:00
|
|
|
GParamSpec *
|
|
|
|
|
nm_g_object_class_find_property_from_gtype (GType gtype,
|
|
|
|
|
const char *property_name)
|
|
|
|
|
{
|
|
|
|
|
nm_auto_unref_gtypeclass GObjectClass *gclass = NULL;
|
|
|
|
|
|
|
|
|
|
gclass = g_type_class_ref (gtype);
|
|
|
|
|
return g_object_class_find_property (gclass, property_name);
|
|
|
|
|
}
|
|
|
|
|
|
2016-03-18 13:56:53 +01:00
|
|
|
/*****************************************************************************/
|
2017-10-13 11:56:06 +02:00
|
|
|
|
2019-02-19 08:56:18 +01:00
|
|
|
/**
|
|
|
|
|
* nm_g_type_find_implementing_class_for_property:
|
|
|
|
|
* @gtype: the GObject type which has a property @pname
|
|
|
|
|
* @pname: the name of the property to look up
|
|
|
|
|
*
|
|
|
|
|
* This is only a helper function for printf debugging. It's not
|
|
|
|
|
* used in actual code. Hence, the function just asserts that
|
|
|
|
|
* @pname and @gtype arguments are suitable. It cannot fail.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the most ancestor type of @gtype, that
|
|
|
|
|
* implements the property @pname. It means, it
|
|
|
|
|
* searches the type hierarchy to find the type
|
|
|
|
|
* that added @pname.
|
|
|
|
|
*/
|
|
|
|
|
GType
|
|
|
|
|
nm_g_type_find_implementing_class_for_property (GType gtype,
|
|
|
|
|
const char *pname)
|
|
|
|
|
{
|
|
|
|
|
nm_auto_unref_gtypeclass GObjectClass *klass = NULL;
|
|
|
|
|
GParamSpec *pspec;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (pname, G_TYPE_INVALID);
|
|
|
|
|
|
|
|
|
|
klass = g_type_class_ref (gtype);
|
|
|
|
|
g_return_val_if_fail (G_IS_OBJECT_CLASS (klass), G_TYPE_INVALID);
|
|
|
|
|
|
|
|
|
|
pspec = g_object_class_find_property (klass, pname);
|
|
|
|
|
g_return_val_if_fail (pspec, G_TYPE_INVALID);
|
|
|
|
|
|
|
|
|
|
gtype = G_TYPE_FROM_CLASS (klass);
|
|
|
|
|
|
|
|
|
|
while (TRUE) {
|
|
|
|
|
nm_auto_unref_gtypeclass GObjectClass *k = NULL;
|
|
|
|
|
|
|
|
|
|
k = g_type_class_ref (g_type_parent (gtype));
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (G_IS_OBJECT_CLASS (k), G_TYPE_INVALID);
|
|
|
|
|
|
|
|
|
|
if (g_object_class_find_property (k, pname) != pspec)
|
|
|
|
|
return gtype;
|
|
|
|
|
|
|
|
|
|
gtype = G_TYPE_FROM_CLASS (k);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-05-16 18:50:21 +02:00
|
|
|
static void
|
|
|
|
|
_str_append_escape (GString *s, char ch)
|
|
|
|
|
{
|
|
|
|
|
g_string_append_c (s, '\\');
|
|
|
|
|
g_string_append_c (s, '0' + ((((guchar) ch) >> 6) & 07));
|
|
|
|
|
g_string_append_c (s, '0' + ((((guchar) ch) >> 3) & 07));
|
|
|
|
|
g_string_append_c (s, '0' + ( ((guchar) ch) & 07));
|
|
|
|
|
}
|
|
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
gconstpointer
|
|
|
|
|
nm_utils_buf_utf8safe_unescape (const char *str, gsize *out_len, gpointer *to_free)
|
|
|
|
|
{
|
|
|
|
|
GString *gstr;
|
|
|
|
|
gsize len;
|
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (to_free, NULL);
|
|
|
|
|
g_return_val_if_fail (out_len, NULL);
|
|
|
|
|
|
|
|
|
|
if (!str) {
|
|
|
|
|
*out_len = 0;
|
|
|
|
|
*to_free = NULL;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
len = strlen (str);
|
|
|
|
|
|
|
|
|
|
s = memchr (str, '\\', len);
|
|
|
|
|
if (!s) {
|
|
|
|
|
*out_len = len;
|
|
|
|
|
*to_free = NULL;
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gstr = g_string_new_len (NULL, len);
|
|
|
|
|
|
|
|
|
|
g_string_append_len (gstr, str, s - str);
|
|
|
|
|
str = s;
|
|
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
|
char ch;
|
|
|
|
|
guint v;
|
|
|
|
|
|
|
|
|
|
nm_assert (str[0] == '\\');
|
|
|
|
|
|
|
|
|
|
ch = (++str)[0];
|
|
|
|
|
|
|
|
|
|
if (ch == '\0') {
|
|
|
|
|
// error. Trailing '\\'
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ch >= '0' && ch <= '9') {
|
|
|
|
|
v = ch - '0';
|
|
|
|
|
ch = (++str)[0];
|
|
|
|
|
if (ch >= '0' && ch <= '7') {
|
|
|
|
|
v = v * 8 + (ch - '0');
|
|
|
|
|
ch = (++str)[0];
|
|
|
|
|
if (ch >= '0' && ch <= '7') {
|
|
|
|
|
v = v * 8 + (ch - '0');
|
2018-10-04 09:37:55 +02:00
|
|
|
++str;
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
ch = v;
|
|
|
|
|
} else {
|
|
|
|
|
switch (ch) {
|
|
|
|
|
case 'b': ch = '\b'; break;
|
|
|
|
|
case 'f': ch = '\f'; break;
|
|
|
|
|
case 'n': ch = '\n'; break;
|
|
|
|
|
case 'r': ch = '\r'; break;
|
|
|
|
|
case 't': ch = '\t'; break;
|
|
|
|
|
case 'v': ch = '\v'; break;
|
|
|
|
|
default:
|
|
|
|
|
/* Here we handle "\\\\", but all other unexpected escape sequences are really a bug.
|
|
|
|
|
* Take them literally, after removing the escape character */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
str++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_string_append_c (gstr, ch);
|
|
|
|
|
|
|
|
|
|
s = strchr (str, '\\');
|
|
|
|
|
if (!s) {
|
|
|
|
|
g_string_append (gstr, str);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_string_append_len (gstr, str, s - str);
|
|
|
|
|
str = s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*out_len = gstr->len;
|
|
|
|
|
*to_free = gstr->str;
|
|
|
|
|
return g_string_free (gstr, FALSE);
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-16 18:50:21 +02:00
|
|
|
/**
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
* nm_utils_buf_utf8safe_escape:
|
|
|
|
|
* @buf: byte array, possibly in utf-8 encoding, may have NUL characters.
|
|
|
|
|
* @buflen: the length of @buf in bytes, or -1 if @buf is a NUL terminated
|
|
|
|
|
* string.
|
2017-05-16 18:50:21 +02:00
|
|
|
* @flags: #NMUtilsStrUtf8SafeFlags flags
|
|
|
|
|
* @to_free: (out): return the pointer location of the string
|
|
|
|
|
* if a copying was necessary.
|
|
|
|
|
*
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
* Based on the assumption, that @buf contains UTF-8 encoded bytes,
|
|
|
|
|
* this will return valid UTF-8 sequence, and invalid sequences
|
|
|
|
|
* will be escaped with backslash (C escaping, like g_strescape()).
|
|
|
|
|
* This is sanitize non UTF-8 characters. The result is valid
|
2017-05-16 18:50:21 +02:00
|
|
|
* UTF-8.
|
|
|
|
|
*
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
* The operation can be reverted with nm_utils_buf_utf8safe_unescape().
|
|
|
|
|
* Note that if, and only if @buf contains no NUL bytes, the operation
|
|
|
|
|
* can also be reverted with g_strcompress().
|
2017-05-16 18:50:21 +02:00
|
|
|
*
|
|
|
|
|
* Depending on @flags, valid UTF-8 characters are not escaped at all
|
|
|
|
|
* (except the escape character '\\'). This is the difference to g_strescape(),
|
|
|
|
|
* which escapes all non-ASCII characters. This allows to pass on
|
|
|
|
|
* valid UTF-8 characters as-is and can be directly shown to the user
|
|
|
|
|
* as UTF-8 -- with exception of the backslash escape character,
|
|
|
|
|
* invalid UTF-8 sequences, and other (depending on @flags).
|
|
|
|
|
*
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
* Returns: the escaped input buffer, as valid UTF-8. If no escaping
|
|
|
|
|
* is necessary, it returns the input @buf. Otherwise, an allocated
|
2017-05-16 18:50:21 +02:00
|
|
|
* string @to_free is returned which must be freed by the caller
|
|
|
|
|
* with g_free. The escaping can be reverted by g_strcompress().
|
|
|
|
|
**/
|
|
|
|
|
const char *
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
nm_utils_buf_utf8safe_escape (gconstpointer buf, gssize buflen, NMUtilsStrUtf8SafeFlags flags, char **to_free)
|
2017-05-16 18:50:21 +02:00
|
|
|
{
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
const char *const str = buf;
|
2017-05-16 18:50:21 +02:00
|
|
|
const char *p = NULL;
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
const char *s;
|
|
|
|
|
gboolean nul_terminated = FALSE;
|
|
|
|
|
GString *gstr;
|
2017-05-16 18:50:21 +02:00
|
|
|
|
|
|
|
|
g_return_val_if_fail (to_free, NULL);
|
|
|
|
|
|
|
|
|
|
*to_free = NULL;
|
|
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
if (buflen == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (buflen < 0) {
|
|
|
|
|
if (!str)
|
|
|
|
|
return NULL;
|
|
|
|
|
buflen = strlen (str);
|
|
|
|
|
if (buflen == 0)
|
|
|
|
|
return str;
|
|
|
|
|
nul_terminated = TRUE;
|
|
|
|
|
}
|
2017-05-16 18:50:21 +02:00
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
if ( g_utf8_validate (str, buflen, &p)
|
|
|
|
|
&& nul_terminated) {
|
|
|
|
|
/* note that g_utf8_validate() does not allow NUL character inside @str. Good.
|
|
|
|
|
* We can treat @str like a NUL terminated string. */
|
|
|
|
|
if (!NM_STRCHAR_ANY (str, ch,
|
|
|
|
|
( ch == '\\' \
|
|
|
|
|
|| ( NM_FLAGS_HAS (flags, NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL) \
|
|
|
|
|
&& ch < ' ') \
|
|
|
|
|
|| ( NM_FLAGS_HAS (flags, NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_NON_ASCII) \
|
|
|
|
|
&& ((guchar) ch) >= 127))))
|
|
|
|
|
return str;
|
|
|
|
|
}
|
2017-05-16 18:50:21 +02:00
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
gstr = g_string_sized_new (buflen + 5);
|
|
|
|
|
|
|
|
|
|
s = str;
|
2017-05-16 18:50:21 +02:00
|
|
|
do {
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
buflen -= p - s;
|
|
|
|
|
nm_assert (buflen >= 0);
|
|
|
|
|
|
|
|
|
|
for (; s < p; s++) {
|
|
|
|
|
char ch = s[0];
|
2017-05-16 18:50:21 +02:00
|
|
|
|
|
|
|
|
if (ch == '\\')
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
g_string_append (gstr, "\\\\");
|
2017-05-16 18:50:21 +02:00
|
|
|
else if ( ( NM_FLAGS_HAS (flags, NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL) \
|
|
|
|
|
&& ch < ' ') \
|
|
|
|
|
|| ( NM_FLAGS_HAS (flags, NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_NON_ASCII) \
|
|
|
|
|
&& ((guchar) ch) >= 127))
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
_str_append_escape (gstr, ch);
|
2017-05-16 18:50:21 +02:00
|
|
|
else
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
g_string_append_c (gstr, ch);
|
2017-05-16 18:50:21 +02:00
|
|
|
}
|
|
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
if (buflen <= 0)
|
2017-05-16 18:50:21 +02:00
|
|
|
break;
|
|
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
_str_append_escape (gstr, p[0]);
|
|
|
|
|
|
|
|
|
|
buflen--;
|
|
|
|
|
if (buflen == 0)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
s = &p[1];
|
2019-08-02 09:27:52 +02:00
|
|
|
(void) g_utf8_validate (s, buflen, &p);
|
2017-05-16 18:50:21 +02:00
|
|
|
} while (TRUE);
|
|
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
*to_free = g_string_free (gstr, FALSE);
|
2017-05-16 18:50:21 +02:00
|
|
|
return *to_free;
|
|
|
|
|
}
|
|
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
const char *
|
|
|
|
|
nm_utils_buf_utf8safe_escape_bytes (GBytes *bytes, NMUtilsStrUtf8SafeFlags flags, char **to_free)
|
|
|
|
|
{
|
|
|
|
|
gconstpointer p;
|
|
|
|
|
gsize l;
|
|
|
|
|
|
|
|
|
|
if (bytes)
|
|
|
|
|
p = g_bytes_get_data (bytes, &l);
|
|
|
|
|
else {
|
|
|
|
|
p = NULL;
|
|
|
|
|
l = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nm_utils_buf_utf8safe_escape (p, l, flags, to_free);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-05-16 18:50:21 +02:00
|
|
|
const char *
|
|
|
|
|
nm_utils_str_utf8safe_unescape (const char *str, char **to_free)
|
|
|
|
|
{
|
|
|
|
|
g_return_val_if_fail (to_free, NULL);
|
|
|
|
|
|
|
|
|
|
if (!str || !strchr (str, '\\')) {
|
|
|
|
|
*to_free = NULL;
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
return (*to_free = g_strcompress (str));
|
|
|
|
|
}
|
|
|
|
|
|
shared: add nm_utils_buf_utf8safe_escape() util
We already have nm_utils_str_utf8safe_escape() to convert a
NUL termianted string to an UTF-8 string. nm_utils_str_utf8safe_escape()
operates under the assumption, that the input strig is already valid UTF-8
and returns the input string verbatim. That way, in the common expected
cases, the string just looks like a regular UTF-8 string.
However, in case there are invalid UTF-8 sequences (or a backslash
escape characters), the function will use backslash escaping to encode
the input string as a valid UTF-8 sequence. Note that the escaped
sequence, can be reverted to the original non-UTF-8 string via
unescape.
An example, where this is useful are file names or interface names.
Which are not in a defined encoding, but NUL terminated and commonly ASCII or
UTF-8 encoded.
Extend this, to also handle not NUL terminated buffers. The same
applies, except that the process cannot be reverted via g_strcompress()
-- because the NUL character cannot be unescaped.
This will be useful to escape a Wi-Fi SSID. Commonly we expect the SSID
to be in UTF-8/ASCII encoding and we want to print it verbatim. Only
if that is not the case, we fallback to backslash escaping. However, the
orginal value can be fully recovered via unescape(). The difference
between an SSID and a filename is, that the former can contain '\0'
bytes.
2018-08-12 11:43:25 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_str_utf8safe_escape:
|
|
|
|
|
* @str: NUL terminated input string, possibly in utf-8 encoding
|
|
|
|
|
* @flags: #NMUtilsStrUtf8SafeFlags flags
|
|
|
|
|
* @to_free: (out): return the pointer location of the string
|
|
|
|
|
* if a copying was necessary.
|
|
|
|
|
*
|
|
|
|
|
* Returns the possible non-UTF-8 NUL terminated string @str
|
|
|
|
|
* and uses backslash escaping (C escaping, like g_strescape())
|
|
|
|
|
* to sanitize non UTF-8 characters. The result is valid
|
|
|
|
|
* UTF-8.
|
|
|
|
|
*
|
|
|
|
|
* The operation can be reverted with g_strcompress() or
|
|
|
|
|
* nm_utils_str_utf8safe_unescape().
|
|
|
|
|
*
|
|
|
|
|
* Depending on @flags, valid UTF-8 characters are not escaped at all
|
|
|
|
|
* (except the escape character '\\'). This is the difference to g_strescape(),
|
|
|
|
|
* which escapes all non-ASCII characters. This allows to pass on
|
|
|
|
|
* valid UTF-8 characters as-is and can be directly shown to the user
|
|
|
|
|
* as UTF-8 -- with exception of the backslash escape character,
|
|
|
|
|
* invalid UTF-8 sequences, and other (depending on @flags).
|
|
|
|
|
*
|
|
|
|
|
* Returns: the escaped input string, as valid UTF-8. If no escaping
|
|
|
|
|
* is necessary, it returns the input @str. Otherwise, an allocated
|
|
|
|
|
* string @to_free is returned which must be freed by the caller
|
|
|
|
|
* with g_free. The escaping can be reverted by g_strcompress().
|
|
|
|
|
**/
|
|
|
|
|
const char *
|
|
|
|
|
nm_utils_str_utf8safe_escape (const char *str, NMUtilsStrUtf8SafeFlags flags, char **to_free)
|
|
|
|
|
{
|
|
|
|
|
return nm_utils_buf_utf8safe_escape (str, -1, flags, to_free);
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-16 18:50:21 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_str_utf8safe_escape_cp:
|
|
|
|
|
* @str: NUL terminated input string, possibly in utf-8 encoding
|
|
|
|
|
* @flags: #NMUtilsStrUtf8SafeFlags flags
|
|
|
|
|
*
|
|
|
|
|
* Like nm_utils_str_utf8safe_escape(), except the returned value
|
|
|
|
|
* is always a copy of the input and must be freed by the caller.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the escaped input string in UTF-8 encoding. The returned
|
|
|
|
|
* value should be freed with g_free().
|
|
|
|
|
* The escaping can be reverted by g_strcompress().
|
|
|
|
|
**/
|
|
|
|
|
char *
|
|
|
|
|
nm_utils_str_utf8safe_escape_cp (const char *str, NMUtilsStrUtf8SafeFlags flags)
|
|
|
|
|
{
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
nm_utils_str_utf8safe_escape (str, flags, &s);
|
|
|
|
|
return s ?: g_strdup (str);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
nm_utils_str_utf8safe_unescape_cp (const char *str)
|
|
|
|
|
{
|
|
|
|
|
return str ? g_strcompress (str) : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
nm_utils_str_utf8safe_escape_take (char *str, NMUtilsStrUtf8SafeFlags flags)
|
|
|
|
|
{
|
|
|
|
|
char *str_to_free;
|
|
|
|
|
|
|
|
|
|
nm_utils_str_utf8safe_escape (str, flags, &str_to_free);
|
|
|
|
|
if (str_to_free) {
|
|
|
|
|
g_free (str);
|
|
|
|
|
return str_to_free;
|
|
|
|
|
}
|
|
|
|
|
return str;
|
|
|
|
|
}
|
2017-10-13 11:02:25 +02:00
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
/* taken from systemd's fd_wait_for_event(). Note that the timeout
|
|
|
|
|
* is here in nano-seconds, not micro-seconds. */
|
|
|
|
|
int
|
|
|
|
|
nm_utils_fd_wait_for_event (int fd, int event, gint64 timeout_ns)
|
|
|
|
|
{
|
|
|
|
|
struct pollfd pollfd = {
|
|
|
|
|
.fd = fd,
|
|
|
|
|
.events = event,
|
|
|
|
|
};
|
|
|
|
|
struct timespec ts, *pts;
|
|
|
|
|
int r;
|
|
|
|
|
|
|
|
|
|
if (timeout_ns < 0)
|
|
|
|
|
pts = NULL;
|
|
|
|
|
else {
|
|
|
|
|
ts.tv_sec = (time_t) (timeout_ns / NM_UTILS_NS_PER_SECOND);
|
|
|
|
|
ts.tv_nsec = (long int) (timeout_ns % NM_UTILS_NS_PER_SECOND);
|
|
|
|
|
pts = &ts;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
r = ppoll (&pollfd, 1, pts, NULL);
|
|
|
|
|
if (r < 0)
|
2019-01-31 16:53:45 +01:00
|
|
|
return -NM_ERRNO_NATIVE (errno);
|
2017-10-13 11:02:25 +02:00
|
|
|
if (r == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
return pollfd.revents;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* taken from systemd's loop_read() */
|
|
|
|
|
ssize_t
|
|
|
|
|
nm_utils_fd_read_loop (int fd, void *buf, size_t nbytes, bool do_poll)
|
|
|
|
|
{
|
|
|
|
|
uint8_t *p = buf;
|
|
|
|
|
ssize_t n = 0;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (fd >= 0, -EINVAL);
|
|
|
|
|
g_return_val_if_fail (buf, -EINVAL);
|
|
|
|
|
|
|
|
|
|
/* If called with nbytes == 0, let's call read() at least
|
|
|
|
|
* once, to validate the operation */
|
|
|
|
|
|
|
|
|
|
if (nbytes > (size_t) SSIZE_MAX)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
ssize_t k;
|
|
|
|
|
|
|
|
|
|
k = read (fd, p, nbytes);
|
|
|
|
|
if (k < 0) {
|
2019-01-31 13:29:21 +01:00
|
|
|
int errsv = errno;
|
|
|
|
|
|
|
|
|
|
if (errsv == EINTR)
|
2017-10-13 11:02:25 +02:00
|
|
|
continue;
|
|
|
|
|
|
2019-01-31 13:29:21 +01:00
|
|
|
if (errsv == EAGAIN && do_poll) {
|
2017-10-13 11:02:25 +02:00
|
|
|
|
|
|
|
|
/* We knowingly ignore any return value here,
|
|
|
|
|
* and expect that any error/EOF is reported
|
|
|
|
|
* via read() */
|
|
|
|
|
|
|
|
|
|
(void) nm_utils_fd_wait_for_event (fd, POLLIN, -1);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2019-01-31 16:53:45 +01:00
|
|
|
return n > 0 ? n : -NM_ERRNO_NATIVE (errsv);
|
2017-10-13 11:02:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (k == 0)
|
|
|
|
|
return n;
|
|
|
|
|
|
|
|
|
|
g_assert ((size_t) k <= nbytes);
|
|
|
|
|
|
|
|
|
|
p += k;
|
|
|
|
|
nbytes -= k;
|
|
|
|
|
n += k;
|
|
|
|
|
} while (nbytes > 0);
|
|
|
|
|
|
|
|
|
|
return n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* taken from systemd's loop_read_exact() */
|
|
|
|
|
int
|
|
|
|
|
nm_utils_fd_read_loop_exact (int fd, void *buf, size_t nbytes, bool do_poll)
|
|
|
|
|
{
|
|
|
|
|
ssize_t n;
|
|
|
|
|
|
|
|
|
|
n = nm_utils_fd_read_loop (fd, buf, nbytes, do_poll);
|
|
|
|
|
if (n < 0)
|
|
|
|
|
return (int) n;
|
|
|
|
|
if ((size_t) n != nbytes)
|
|
|
|
|
return -EIO;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2017-12-08 17:27:39 +01:00
|
|
|
|
2019-04-25 08:25:34 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2017-12-08 17:27:39 +01:00
|
|
|
NMUtilsNamedValue *
|
|
|
|
|
nm_utils_named_values_from_str_dict (GHashTable *hash, guint *out_len)
|
|
|
|
|
{
|
|
|
|
|
GHashTableIter iter;
|
|
|
|
|
NMUtilsNamedValue *values;
|
|
|
|
|
guint i, len;
|
|
|
|
|
|
|
|
|
|
if ( !hash
|
|
|
|
|
|| !(len = g_hash_table_size (hash))) {
|
|
|
|
|
NM_SET_OUT (out_len, 0);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
|
values = g_new (NMUtilsNamedValue, len + 1);
|
|
|
|
|
g_hash_table_iter_init (&iter, hash);
|
|
|
|
|
while (g_hash_table_iter_next (&iter,
|
|
|
|
|
(gpointer *) &values[i].name,
|
|
|
|
|
(gpointer *) &values[i].value_ptr))
|
|
|
|
|
i++;
|
|
|
|
|
nm_assert (i == len);
|
|
|
|
|
values[i].name = NULL;
|
|
|
|
|
values[i].value_ptr = NULL;
|
|
|
|
|
|
2019-04-25 08:38:35 +02:00
|
|
|
nm_utils_named_value_list_sort (values, len, NULL, NULL);
|
2017-12-08 17:27:39 +01:00
|
|
|
|
|
|
|
|
NM_SET_OUT (out_len, len);
|
|
|
|
|
return values;
|
|
|
|
|
}
|
2017-12-10 12:18:21 +01:00
|
|
|
|
2019-04-25 08:25:34 +02:00
|
|
|
gssize
|
|
|
|
|
nm_utils_named_value_list_find (const NMUtilsNamedValue *arr,
|
|
|
|
|
gsize len,
|
|
|
|
|
const char *name,
|
|
|
|
|
gboolean sorted)
|
|
|
|
|
{
|
|
|
|
|
gsize i;
|
|
|
|
|
|
|
|
|
|
nm_assert (name);
|
|
|
|
|
|
|
|
|
|
#if NM_MORE_ASSERTS > 5
|
|
|
|
|
{
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
const NMUtilsNamedValue *v = &arr[i];
|
|
|
|
|
|
|
|
|
|
nm_assert (v->name);
|
|
|
|
|
if ( sorted
|
|
|
|
|
&& i > 0)
|
|
|
|
|
nm_assert (strcmp (arr[i - 1].name, v->name) < 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nm_assert ( !sorted
|
|
|
|
|
|| nm_utils_named_value_list_is_sorted (arr, len, FALSE, NULL, NULL));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (sorted) {
|
|
|
|
|
return nm_utils_array_find_binary_search (arr,
|
|
|
|
|
sizeof (NMUtilsNamedValue),
|
|
|
|
|
len,
|
|
|
|
|
&name,
|
|
|
|
|
nm_strcmp_p_with_data,
|
|
|
|
|
NULL);
|
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
|
if (nm_streq (arr[i].name, name))
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
return ~((gssize) len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
gboolean
|
|
|
|
|
nm_utils_named_value_list_is_sorted (const NMUtilsNamedValue *arr,
|
|
|
|
|
gsize len,
|
|
|
|
|
gboolean accept_duplicates,
|
|
|
|
|
GCompareDataFunc compare_func,
|
|
|
|
|
gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
gsize i;
|
|
|
|
|
int c_limit;
|
|
|
|
|
|
|
|
|
|
if (len == 0)
|
|
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (arr, FALSE);
|
|
|
|
|
|
|
|
|
|
if (!compare_func)
|
|
|
|
|
compare_func = nm_strcmp_p_with_data;
|
|
|
|
|
|
|
|
|
|
c_limit = accept_duplicates ? 0 : -1;
|
|
|
|
|
|
|
|
|
|
for (i = 1; i < len; i++) {
|
|
|
|
|
int c;
|
|
|
|
|
|
|
|
|
|
c = compare_func (&arr[i - 1], &arr[i], user_data);
|
|
|
|
|
if (c > c_limit)
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
nm_utils_named_value_list_sort (NMUtilsNamedValue *arr,
|
|
|
|
|
gsize len,
|
|
|
|
|
GCompareDataFunc compare_func,
|
|
|
|
|
gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
if (len == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (arr);
|
|
|
|
|
|
|
|
|
|
if (len == 1)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
g_qsort_with_data (arr,
|
|
|
|
|
len,
|
|
|
|
|
sizeof (NMUtilsNamedValue),
|
|
|
|
|
compare_func ?: nm_strcmp_p_with_data,
|
|
|
|
|
user_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-03-25 14:16:07 +02:00
|
|
|
gpointer *
|
|
|
|
|
nm_utils_hash_keys_to_array (GHashTable *hash,
|
|
|
|
|
GCompareDataFunc compare_func,
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
guint *out_len)
|
2017-12-10 12:18:21 +01:00
|
|
|
{
|
2018-03-25 14:16:07 +02:00
|
|
|
guint len;
|
|
|
|
|
gpointer *keys;
|
2017-12-10 12:18:21 +01:00
|
|
|
|
2018-03-25 14:16:07 +02:00
|
|
|
/* by convention, we never return an empty array. In that
|
|
|
|
|
* case, always %NULL. */
|
2017-12-10 12:18:21 +01:00
|
|
|
if ( !hash
|
2018-03-25 14:16:07 +02:00
|
|
|
|| g_hash_table_size (hash) == 0) {
|
|
|
|
|
NM_SET_OUT (out_len, 0);
|
2017-12-10 12:18:21 +01:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-25 14:16:07 +02:00
|
|
|
keys = g_hash_table_get_keys_as_array (hash, &len);
|
|
|
|
|
if ( len > 1
|
|
|
|
|
&& compare_func) {
|
|
|
|
|
g_qsort_with_data (keys,
|
|
|
|
|
len,
|
|
|
|
|
sizeof (gpointer),
|
|
|
|
|
compare_func,
|
|
|
|
|
user_data);
|
2017-12-10 12:18:21 +01:00
|
|
|
}
|
2018-03-25 14:16:07 +02:00
|
|
|
NM_SET_OUT (out_len, len);
|
|
|
|
|
return keys;
|
2017-12-10 12:18:21 +01:00
|
|
|
}
|
2017-12-10 12:18:21 +01:00
|
|
|
|
2019-08-23 18:08:44 +02:00
|
|
|
gpointer *
|
|
|
|
|
nm_utils_hash_values_to_array (GHashTable *hash,
|
|
|
|
|
GCompareDataFunc compare_func,
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
guint *out_len)
|
|
|
|
|
{
|
|
|
|
|
GHashTableIter iter;
|
|
|
|
|
gpointer value;
|
|
|
|
|
gpointer *arr;
|
|
|
|
|
guint i, len;
|
|
|
|
|
|
|
|
|
|
if ( !hash
|
|
|
|
|
|| (len = g_hash_table_size (hash)) == 0u) {
|
|
|
|
|
NM_SET_OUT (out_len, 0);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
arr = g_new (gpointer, ((gsize) len) + 1);
|
|
|
|
|
i = 0;
|
|
|
|
|
g_hash_table_iter_init (&iter, hash);
|
|
|
|
|
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &value))
|
|
|
|
|
arr[i++] = value;
|
|
|
|
|
|
|
|
|
|
nm_assert (i == len);
|
|
|
|
|
arr[len] = NULL;
|
|
|
|
|
|
|
|
|
|
if ( len > 1
|
|
|
|
|
&& compare_func) {
|
|
|
|
|
g_qsort_with_data (arr,
|
|
|
|
|
len,
|
|
|
|
|
sizeof (gpointer),
|
|
|
|
|
compare_func,
|
|
|
|
|
user_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return arr;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-23 17:53:52 +02:00
|
|
|
gboolean
|
|
|
|
|
nm_utils_hashtable_same_keys (const GHashTable *a,
|
|
|
|
|
const GHashTable *b)
|
|
|
|
|
{
|
|
|
|
|
GHashTableIter h;
|
|
|
|
|
const char *k;
|
|
|
|
|
|
|
|
|
|
if (a == b)
|
|
|
|
|
return TRUE;
|
|
|
|
|
if (!a || !b)
|
|
|
|
|
return FALSE;
|
|
|
|
|
if (g_hash_table_size ((GHashTable *) a) != g_hash_table_size ((GHashTable *) b))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
g_hash_table_iter_init (&h, (GHashTable *) a);
|
|
|
|
|
while (g_hash_table_iter_next (&h, (gpointer) &k, NULL)) {
|
|
|
|
|
if (!g_hash_table_contains ((GHashTable *) b, k))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if NM_MORE_ASSERTS > 5
|
|
|
|
|
g_hash_table_iter_init (&h, (GHashTable *) b);
|
|
|
|
|
while (g_hash_table_iter_next (&h, (gpointer) &k, NULL))
|
|
|
|
|
nm_assert (g_hash_table_contains ((GHashTable *) a, k));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-10 12:18:21 +01:00
|
|
|
char **
|
|
|
|
|
nm_utils_strv_make_deep_copied (const char **strv)
|
|
|
|
|
{
|
|
|
|
|
gsize i;
|
|
|
|
|
|
2019-05-09 14:01:44 +02:00
|
|
|
/* it takes a strv list, and copies each
|
2017-12-10 12:18:21 +01:00
|
|
|
* strings. Note that this updates @strv *in-place*
|
|
|
|
|
* and returns it. */
|
|
|
|
|
|
|
|
|
|
if (!strv)
|
|
|
|
|
return NULL;
|
|
|
|
|
for (i = 0; strv[i]; i++)
|
|
|
|
|
strv[i] = g_strdup (strv[i]);
|
|
|
|
|
|
|
|
|
|
return (char **) strv;
|
|
|
|
|
}
|
2018-04-06 23:37:31 +02:00
|
|
|
|
2019-05-09 14:01:44 +02:00
|
|
|
char **
|
|
|
|
|
nm_utils_strv_make_deep_copied_n (const char **strv, gsize len)
|
|
|
|
|
{
|
|
|
|
|
gsize i;
|
|
|
|
|
|
|
|
|
|
/* it takes a strv array with len elements, and copies each
|
|
|
|
|
* strings. Note that this updates @strv *in-place*
|
|
|
|
|
* and returns it. */
|
|
|
|
|
|
|
|
|
|
if (!strv)
|
|
|
|
|
return NULL;
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
|
strv[i] = g_strdup (strv[i]);
|
|
|
|
|
|
|
|
|
|
return (char **) strv;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-27 10:33:14 +02:00
|
|
|
/**
|
|
|
|
|
* @strv: the strv array to copy. It may be %NULL if @len
|
|
|
|
|
* is negative or zero (in which case %NULL will be returned).
|
|
|
|
|
* @len: the length of strings in @str. If negative, strv is assumed
|
|
|
|
|
* to be a NULL terminated array.
|
|
|
|
|
*
|
|
|
|
|
* Like g_strdupv(), with two differences:
|
|
|
|
|
*
|
|
|
|
|
* - accepts a @len parameter for non-null terminated strv array.
|
|
|
|
|
*
|
|
|
|
|
* - this never returns an empty strv array, but always %NULL if
|
|
|
|
|
* there are no strings.
|
|
|
|
|
*
|
|
|
|
|
* Note that if @len is non-negative, then it still must not
|
|
|
|
|
* contain any %NULL pointers within the first @len elements.
|
|
|
|
|
* Otherwise you would leak elements if you try to free the
|
|
|
|
|
* array with g_strfreev(). Allowing that would be error prone.
|
|
|
|
|
*
|
|
|
|
|
* Returns: (transfer full): a clone of the strv array. Always
|
|
|
|
|
* %NULL terminated.
|
|
|
|
|
*/
|
|
|
|
|
char **
|
|
|
|
|
nm_utils_strv_dup (gpointer strv, gssize len)
|
|
|
|
|
{
|
|
|
|
|
gsize i, l;
|
|
|
|
|
char **v;
|
|
|
|
|
const char *const *const src = strv;
|
|
|
|
|
|
|
|
|
|
if (len < 0)
|
|
|
|
|
l = NM_PTRARRAY_LEN (src);
|
|
|
|
|
else
|
|
|
|
|
l = len;
|
|
|
|
|
if (l == 0) {
|
|
|
|
|
/* this function never returns an empty strv array. If you
|
|
|
|
|
* need that, handle it yourself. */
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
v = g_new (char *, l + 1);
|
|
|
|
|
for (i = 0; i < l; i++) {
|
|
|
|
|
|
|
|
|
|
if (G_UNLIKELY (!src[i])) {
|
|
|
|
|
/* NULL strings are not allowed. Clear the remainder of the array
|
|
|
|
|
* and return it (with assertion failure). */
|
|
|
|
|
l++;
|
|
|
|
|
for (; i < l; i++)
|
|
|
|
|
v[i] = NULL;
|
|
|
|
|
g_return_val_if_reached (v);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
v[i] = g_strdup (src[i]);
|
|
|
|
|
}
|
|
|
|
|
v[l] = NULL;
|
|
|
|
|
return v;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-06 23:37:31 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-08-01 11:03:02 +02:00
|
|
|
gssize
|
|
|
|
|
nm_utils_ptrarray_find_binary_search (gconstpointer *list,
|
|
|
|
|
gsize len,
|
|
|
|
|
gconstpointer needle,
|
|
|
|
|
GCompareDataFunc cmpfcn,
|
|
|
|
|
gpointer user_data,
|
|
|
|
|
gssize *out_idx_first,
|
|
|
|
|
gssize *out_idx_last)
|
|
|
|
|
{
|
|
|
|
|
gssize imin, imax, imid, i2min, i2max, i2mid;
|
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (list || !len, ~((gssize) 0));
|
|
|
|
|
g_return_val_if_fail (cmpfcn, ~((gssize) 0));
|
|
|
|
|
|
|
|
|
|
imin = 0;
|
|
|
|
|
if (len > 0) {
|
|
|
|
|
imax = len - 1;
|
|
|
|
|
|
|
|
|
|
while (imin <= imax) {
|
|
|
|
|
imid = imin + (imax - imin) / 2;
|
|
|
|
|
|
|
|
|
|
cmp = cmpfcn (list[imid], needle, user_data);
|
|
|
|
|
if (cmp == 0) {
|
|
|
|
|
/* we found a matching entry at index imid.
|
|
|
|
|
*
|
|
|
|
|
* Does the caller request the first/last index as well (in case that
|
|
|
|
|
* there are multiple entries which compare equal). */
|
|
|
|
|
|
|
|
|
|
if (out_idx_first) {
|
|
|
|
|
i2min = imin;
|
|
|
|
|
i2max = imid + 1;
|
|
|
|
|
while (i2min <= i2max) {
|
|
|
|
|
i2mid = i2min + (i2max - i2min) / 2;
|
|
|
|
|
|
|
|
|
|
cmp = cmpfcn (list[i2mid], needle, user_data);
|
|
|
|
|
if (cmp == 0)
|
|
|
|
|
i2max = i2mid -1;
|
|
|
|
|
else {
|
|
|
|
|
nm_assert (cmp < 0);
|
|
|
|
|
i2min = i2mid + 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*out_idx_first = i2min;
|
|
|
|
|
}
|
|
|
|
|
if (out_idx_last) {
|
|
|
|
|
i2min = imid + 1;
|
|
|
|
|
i2max = imax;
|
|
|
|
|
while (i2min <= i2max) {
|
|
|
|
|
i2mid = i2min + (i2max - i2min) / 2;
|
|
|
|
|
|
|
|
|
|
cmp = cmpfcn (list[i2mid], needle, user_data);
|
|
|
|
|
if (cmp == 0)
|
|
|
|
|
i2min = i2mid + 1;
|
|
|
|
|
else {
|
|
|
|
|
nm_assert (cmp > 0);
|
|
|
|
|
i2max = i2mid - 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
*out_idx_last = i2min - 1;
|
|
|
|
|
}
|
|
|
|
|
return imid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (cmp < 0)
|
|
|
|
|
imin = imid + 1;
|
|
|
|
|
else
|
|
|
|
|
imax = imid - 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* return the inverse of @imin. This is a negative number, but
|
|
|
|
|
* also is ~imin the position where the value should be inserted. */
|
|
|
|
|
imin = ~imin;
|
|
|
|
|
NM_SET_OUT (out_idx_first, imin);
|
|
|
|
|
NM_SET_OUT (out_idx_last, imin);
|
|
|
|
|
return imin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-07-28 12:26:37 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_array_find_binary_search:
|
|
|
|
|
* @list: the list to search. It must be sorted according to @cmpfcn ordering.
|
|
|
|
|
* @elem_size: the size in bytes of each element in the list
|
|
|
|
|
* @len: the number of elements in @list
|
|
|
|
|
* @needle: the value that is searched
|
|
|
|
|
* @cmpfcn: the compare function. The elements @list are passed as first
|
|
|
|
|
* argument to @cmpfcn, while @needle is passed as second. Usually, the
|
|
|
|
|
* needle is the same data type as inside the list, however, that is
|
|
|
|
|
* not necessary, as long as @cmpfcn takes care to cast the two arguments
|
|
|
|
|
* accordingly.
|
|
|
|
|
* @user_data: optional argument passed to @cmpfcn
|
|
|
|
|
*
|
|
|
|
|
* Performs binary search for @needle in @list. On success, returns the
|
|
|
|
|
* (non-negative) index where the compare function found the searched element.
|
|
|
|
|
* On success, it returns a negative value. Note that the return negative value
|
|
|
|
|
* is the bitwise inverse of the position where the element should be inserted.
|
|
|
|
|
*
|
|
|
|
|
* If the list contains multiple matching elements, an arbitrary index is
|
|
|
|
|
* returned.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the index to the element in the list, or the (negative, bitwise inverted)
|
|
|
|
|
* position where it should be.
|
|
|
|
|
*/
|
|
|
|
|
gssize
|
|
|
|
|
nm_utils_array_find_binary_search (gconstpointer list,
|
|
|
|
|
gsize elem_size,
|
|
|
|
|
gsize len,
|
|
|
|
|
gconstpointer needle,
|
|
|
|
|
GCompareDataFunc cmpfcn,
|
|
|
|
|
gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
gssize imin, imax, imid;
|
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (list || !len, ~((gssize) 0));
|
|
|
|
|
g_return_val_if_fail (cmpfcn, ~((gssize) 0));
|
|
|
|
|
g_return_val_if_fail (elem_size > 0, ~((gssize) 0));
|
|
|
|
|
|
|
|
|
|
imin = 0;
|
|
|
|
|
if (len == 0)
|
|
|
|
|
return ~imin;
|
|
|
|
|
|
|
|
|
|
imax = len - 1;
|
|
|
|
|
|
|
|
|
|
while (imin <= imax) {
|
|
|
|
|
imid = imin + (imax - imin) / 2;
|
|
|
|
|
|
|
|
|
|
cmp = cmpfcn (&((const char *) list)[elem_size * imid], needle, user_data);
|
|
|
|
|
if (cmp == 0)
|
|
|
|
|
return imid;
|
|
|
|
|
|
|
|
|
|
if (cmp < 0)
|
|
|
|
|
imin = imid + 1;
|
|
|
|
|
else
|
|
|
|
|
imax = imid - 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* return the inverse of @imin. This is a negative number, but
|
|
|
|
|
* also is ~imin the position where the value should be inserted. */
|
|
|
|
|
return ~imin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-07-26 17:44:21 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_hash_table_equal:
|
|
|
|
|
* @a: one #GHashTable
|
|
|
|
|
* @b: other #GHashTable
|
|
|
|
|
* @treat_null_as_empty: if %TRUE, when either @a or @b is %NULL, it is
|
|
|
|
|
* treated like an empty hash. It means, a %NULL hash will compare equal
|
|
|
|
|
* to an empty hash.
|
|
|
|
|
* @equal_func: the equality function, for comparing the values.
|
|
|
|
|
* If %NULL, the values are not compared. In that case, the function
|
|
|
|
|
* only checks, if both dictionaries have the same keys -- according
|
|
|
|
|
* to @b's key equality function.
|
|
|
|
|
* Note that the values of @a will be passed as first argument
|
|
|
|
|
* to @equal_func.
|
|
|
|
|
*
|
|
|
|
|
* Compares two hash tables, whether they have equal content.
|
|
|
|
|
* This only makes sense, if @a and @b have the same key types and
|
|
|
|
|
* the same key compare-function.
|
|
|
|
|
*
|
|
|
|
|
* Returns: %TRUE, if both dictionaries have the same content.
|
|
|
|
|
*/
|
|
|
|
|
gboolean
|
|
|
|
|
nm_utils_hash_table_equal (const GHashTable *a,
|
|
|
|
|
const GHashTable *b,
|
|
|
|
|
gboolean treat_null_as_empty,
|
|
|
|
|
NMUtilsHashTableEqualFunc equal_func)
|
|
|
|
|
{
|
|
|
|
|
guint n;
|
|
|
|
|
GHashTableIter iter;
|
|
|
|
|
gconstpointer key, v_a, v_b;
|
|
|
|
|
|
|
|
|
|
if (a == b)
|
|
|
|
|
return TRUE;
|
|
|
|
|
if (!treat_null_as_empty) {
|
|
|
|
|
if (!a || !b)
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
n = a ? g_hash_table_size ((GHashTable *) a) : 0;
|
|
|
|
|
if (n != (b ? g_hash_table_size ((GHashTable *) b) : 0))
|
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
|
|
if (n > 0) {
|
|
|
|
|
g_hash_table_iter_init (&iter, (GHashTable *) a);
|
|
|
|
|
while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &v_a)) {
|
|
|
|
|
if (!g_hash_table_lookup_extended ((GHashTable *) b, key, NULL, (gpointer *) &v_b))
|
|
|
|
|
return FALSE;
|
|
|
|
|
if ( equal_func
|
|
|
|
|
&& !equal_func (v_a, v_b))
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-04-06 23:37:31 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_get_start_time_for_pid:
|
|
|
|
|
* @pid: the process identifier
|
|
|
|
|
* @out_state: return the state character, like R, S, Z. See `man 5 proc`.
|
|
|
|
|
* @out_ppid: parent process id
|
|
|
|
|
*
|
|
|
|
|
* Originally copied from polkit source (src/polkit/polkitunixprocess.c)
|
|
|
|
|
* and adjusted.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the timestamp when the process started (by parsing /proc/$PID/stat).
|
|
|
|
|
* If an error occurs (e.g. the process does not exist), 0 is returned.
|
|
|
|
|
*
|
|
|
|
|
* The returned start time counts since boot, in the unit HZ (with HZ usually being (1/100) seconds)
|
|
|
|
|
**/
|
|
|
|
|
guint64
|
|
|
|
|
nm_utils_get_start_time_for_pid (pid_t pid, char *out_state, pid_t *out_ppid)
|
|
|
|
|
{
|
|
|
|
|
guint64 start_time;
|
|
|
|
|
char filename[256];
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
gs_free char *contents = NULL;
|
2018-04-06 23:37:31 +02:00
|
|
|
size_t length;
|
2018-05-25 15:38:21 +02:00
|
|
|
gs_free const char **tokens = NULL;
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 07:40:19 +02:00
|
|
|
char *p;
|
2018-04-06 23:37:31 +02:00
|
|
|
char state = ' ';
|
|
|
|
|
gint64 ppid = 0;
|
|
|
|
|
|
|
|
|
|
start_time = 0;
|
|
|
|
|
contents = NULL;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (pid > 0, 0);
|
|
|
|
|
|
dns/dnsmasq: refactor tracking of dnsmasq process
Several points.
- We spawn the dnsmasq process directly. That has several downsides:
- The lifetime of the process is tied to NetworkManager's. When
stopping NetworkManager, we usually also stop dnsmasq. Or we keep
the process running, but later the process is no longer a child process
of NetworkManager and we can only kill it using the pidfile.
- We don't do special sandboxing of the dnsmasq process.
- Note that we want to ensure that only one dnsmasq process is running
at any time. We should track that in a singletone. Note that NMDnsDnsmasq
is not a singleton. While there is only one instance active at any time,
the DNS plugin can be swapped (e.g. during SIGHUP). Hence, don't track the
process per-NMDnsDnsmasq instance, but in a global variable "gl_pid".
- Usually, when NetworkManager quits, it also stops the dnsmasq process.
Previously, we would always try to terminate the process based on the
pidfile. That is wrong. Most of the time, NetworkManager spawned the
process itself, as a child process. Hence, the PID is known and NetworkManager
will get a signal when dnsmasq exits. The only moment when NetworkManager should
use the pidfile, is the first time when checking to kill the previous instance.
That is: only once at the beginning, to kill instances that were
intentionally or unintentionally (crash) left running earlier.
This is now done by _gl_pid_kill_external().
- Previously, before starting a new dnsmasq instance we would kill a
possibly already running one, and block while waiting for the process to
disappear. We should never block. Especially, since we afterwards start
the process also in non-blocking way, there is no reason to kill the
existing process in a blocking way. For the most part, starting dnsmasq
is already asynchronous and so should be the killing of the dnsmasq
process.
- Drop GDBusProxy and only use GDBusConnection. It fully suffices.
- When we kill a dnsmasq instance, we actually don't have to wait at
all. That can happen fully in background. The only pecularity is that
when we restart a new instance before the previous instance is killed,
then we must wait for the previous process to terminate first. Also, if
we are about to exit while killing the dnsmasq instance, we must register
nm_shutdown_wait_obj_*() to wait until the process is fully gone.
2019-08-31 09:50:54 +02:00
|
|
|
G_STATIC_ASSERT_EXPR (sizeof (GPid) >= sizeof (pid_t));
|
|
|
|
|
|
|
|
|
|
nm_sprintf_buf (filename, "/proc/%"G_PID_FORMAT"/stat", (GPid) pid);
|
2018-04-06 23:37:31 +02:00
|
|
|
|
|
|
|
|
if (!g_file_get_contents (filename, &contents, &length, NULL))
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* start time is the token at index 19 after the '(process name)' entry - since only this
|
|
|
|
|
* field can contain the ')' character, search backwards for this to avoid malicious
|
|
|
|
|
* processes trying to fool us
|
|
|
|
|
*/
|
|
|
|
|
p = strrchr (contents, ')');
|
2018-05-25 15:38:21 +02:00
|
|
|
if (!p)
|
2018-04-06 23:37:31 +02:00
|
|
|
goto fail;
|
|
|
|
|
p += 2; /* skip ') ' */
|
|
|
|
|
if (p - contents >= (int) length)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
state = p[0];
|
|
|
|
|
|
2019-04-03 15:44:19 +02:00
|
|
|
tokens = nm_utils_strsplit_set (p, " ");
|
2018-04-06 23:37:31 +02:00
|
|
|
|
2018-05-25 15:38:21 +02:00
|
|
|
if (NM_PTRARRAY_LEN (tokens) < 20)
|
2018-04-06 23:37:31 +02:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
if (out_ppid) {
|
|
|
|
|
ppid = _nm_utils_ascii_str_to_int64 (tokens[1], 10, 1, G_MAXINT, 0);
|
|
|
|
|
if (ppid == 0)
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
start_time = _nm_utils_ascii_str_to_int64 (tokens[19], 10, 1, G_MAXINT64, 0);
|
|
|
|
|
if (start_time == 0)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
NM_SET_OUT (out_state, state);
|
|
|
|
|
NM_SET_OUT (out_ppid, ppid);
|
|
|
|
|
return start_time;
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
NM_SET_OUT (out_state, ' ');
|
|
|
|
|
NM_SET_OUT (out_ppid, 0);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2018-04-11 14:10:22 +02:00
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* _nm_utils_strv_sort:
|
|
|
|
|
* @strv: pointer containing strings that will be sorted
|
|
|
|
|
* in-place, %NULL is allowed, unless @len indicates
|
|
|
|
|
* that there are more elements.
|
|
|
|
|
* @len: the number of elements in strv. If negative,
|
|
|
|
|
* strv must be a NULL terminated array and the length
|
|
|
|
|
* will be calculated first. If @len is a positive
|
2019-07-19 10:08:50 +02:00
|
|
|
* number, @strv is allowed to contain %NULL strings
|
|
|
|
|
* too.
|
2018-04-11 14:10:22 +02:00
|
|
|
*
|
|
|
|
|
* Ascending sort of the array @strv inplace, using plain strcmp() string
|
|
|
|
|
* comparison.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
_nm_utils_strv_sort (const char **strv, gssize len)
|
|
|
|
|
{
|
2019-07-19 10:08:50 +02:00
|
|
|
GCompareDataFunc cmp;
|
2018-04-11 14:10:22 +02:00
|
|
|
gsize l;
|
|
|
|
|
|
2019-07-19 10:08:50 +02:00
|
|
|
if (len < 0) {
|
|
|
|
|
l = NM_PTRARRAY_LEN (strv);
|
|
|
|
|
cmp = nm_strcmp_p_with_data;
|
|
|
|
|
} else {
|
|
|
|
|
l = len;
|
|
|
|
|
cmp = nm_strcmp0_p_with_data;
|
|
|
|
|
}
|
2018-04-11 14:10:22 +02:00
|
|
|
|
|
|
|
|
if (l <= 1)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
nm_assert (l <= (gsize) G_MAXINT);
|
|
|
|
|
|
|
|
|
|
g_qsort_with_data (strv,
|
|
|
|
|
l,
|
|
|
|
|
sizeof (const char *),
|
2019-07-19 10:08:50 +02:00
|
|
|
cmp,
|
2018-04-11 14:10:22 +02:00
|
|
|
NULL);
|
|
|
|
|
}
|
2018-04-17 15:24:45 +02:00
|
|
|
|
2019-03-21 10:22:55 +01:00
|
|
|
/**
|
|
|
|
|
* _nm_utils_strv_cmp_n:
|
|
|
|
|
* @strv1: a string array
|
|
|
|
|
* @len1: the length of @strv1, or -1 for NULL terminated array.
|
|
|
|
|
* @strv2: a string array
|
|
|
|
|
* @len2: the length of @strv2, or -1 for NULL terminated array.
|
|
|
|
|
*
|
|
|
|
|
* Note that
|
|
|
|
|
* - len == -1 && strv == NULL
|
|
|
|
|
* is treated like a %NULL argument and compares differently from
|
|
|
|
|
* other arrays.
|
|
|
|
|
*
|
|
|
|
|
* Note that an empty array can be represented as
|
|
|
|
|
* - len == -1 && strv && !strv[0]
|
|
|
|
|
* - len == 0 && !strv
|
|
|
|
|
* - len == 0 && strv
|
|
|
|
|
* These 3 forms all compare equal.
|
|
|
|
|
* It also means, if length is 0, then it is permissible for strv to be %NULL.
|
|
|
|
|
*
|
|
|
|
|
* The strv arrays may contain %NULL strings (if len is positive).
|
|
|
|
|
*
|
|
|
|
|
* Returns: 0 if the arrays are equal (using strcmp).
|
|
|
|
|
**/
|
|
|
|
|
int
|
|
|
|
|
_nm_utils_strv_cmp_n (const char *const*strv1,
|
|
|
|
|
gssize len1,
|
|
|
|
|
const char *const*strv2,
|
|
|
|
|
gssize len2)
|
|
|
|
|
{
|
|
|
|
|
gsize n, n2;
|
|
|
|
|
|
|
|
|
|
if (len1 < 0) {
|
|
|
|
|
if (!strv1)
|
|
|
|
|
return (len2 < 0 && !strv2) ? 0 : -1;
|
|
|
|
|
n = NM_PTRARRAY_LEN (strv1);
|
|
|
|
|
} else
|
|
|
|
|
n = len1;
|
|
|
|
|
|
|
|
|
|
if (len2 < 0) {
|
|
|
|
|
if (!strv2)
|
|
|
|
|
return 1;
|
|
|
|
|
n2 = NM_PTRARRAY_LEN (strv2);
|
|
|
|
|
} else
|
|
|
|
|
n2 = len2;
|
|
|
|
|
|
|
|
|
|
NM_CMP_DIRECT (n, n2);
|
|
|
|
|
for (; n > 0; n--, strv1++, strv2++)
|
|
|
|
|
NM_CMP_DIRECT_STRCMP0 (*strv1, *strv2);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-17 15:24:45 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2019-05-20 16:38:37 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_g_slist_find_str:
|
|
|
|
|
* @list: the #GSList with NUL terminated strings to search
|
|
|
|
|
* @needle: the needle string to look for.
|
|
|
|
|
*
|
|
|
|
|
* Search the list for @needle and return the first found match
|
|
|
|
|
* (or %NULL if not found). Uses strcmp() for finding the first matching
|
|
|
|
|
* element.
|
|
|
|
|
*
|
|
|
|
|
* Returns: the #GSList element with @needle as string value or
|
|
|
|
|
* %NULL if not found.
|
|
|
|
|
*/
|
|
|
|
|
GSList *
|
|
|
|
|
nm_utils_g_slist_find_str (const GSList *list,
|
|
|
|
|
const char *needle)
|
|
|
|
|
{
|
|
|
|
|
nm_assert (needle);
|
|
|
|
|
|
|
|
|
|
for (; list; list = list->next) {
|
|
|
|
|
nm_assert (list->data);
|
|
|
|
|
if (nm_streq (list->data, needle))
|
|
|
|
|
return (GSList *) list;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-13 18:13:23 +02:00
|
|
|
/**
|
|
|
|
|
* nm_utils_g_slist_strlist_cmp:
|
|
|
|
|
* @a: the left #GSList of strings
|
|
|
|
|
* @b: the right #GSList of strings to compare.
|
|
|
|
|
*
|
|
|
|
|
* Compares two string lists. The data elements are compared with
|
|
|
|
|
* strcmp(), alloing %NULL elements.
|
|
|
|
|
*
|
|
|
|
|
* Returns: 0, 1, or -1, depending on how the lists compare.
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
nm_utils_g_slist_strlist_cmp (const GSList *a, const GSList *b)
|
|
|
|
|
{
|
2019-08-02 09:37:46 +02:00
|
|
|
while (TRUE) {
|
|
|
|
|
if (!a)
|
|
|
|
|
return !b ? 0 : -1;
|
|
|
|
|
if (!b)
|
|
|
|
|
return 1;
|
2019-06-13 18:13:23 +02:00
|
|
|
NM_CMP_DIRECT_STRCMP0 (a->data, b->data);
|
2019-08-02 09:37:46 +02:00
|
|
|
a = a->next;
|
|
|
|
|
b = b->next;
|
|
|
|
|
}
|
2019-06-13 18:13:23 +02:00
|
|
|
}
|
|
|
|
|
|
2019-09-26 09:47:55 +02:00
|
|
|
char *
|
|
|
|
|
nm_utils_g_slist_strlist_join (const GSList *a, const char *separator)
|
|
|
|
|
{
|
|
|
|
|
GString *str = NULL;
|
|
|
|
|
|
|
|
|
|
if (!a)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
for (; a; a = a->next) {
|
|
|
|
|
if (!str)
|
|
|
|
|
str = g_string_new (NULL);
|
|
|
|
|
else
|
|
|
|
|
g_string_append (str, separator);
|
|
|
|
|
g_string_append (str, a->data);
|
|
|
|
|
}
|
|
|
|
|
return g_string_free (str, FALSE);
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-20 16:38:37 +02:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2018-04-17 15:24:45 +02:00
|
|
|
gpointer
|
|
|
|
|
_nm_utils_user_data_pack (int nargs, gconstpointer *args)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
gpointer *data;
|
|
|
|
|
|
|
|
|
|
nm_assert (nargs > 0);
|
|
|
|
|
nm_assert (args);
|
|
|
|
|
|
|
|
|
|
data = g_slice_alloc (((gsize) nargs) * sizeof (gconstpointer));
|
|
|
|
|
for (i = 0; i < nargs; i++)
|
|
|
|
|
data[i] = (gpointer) args[i];
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_nm_utils_user_data_unpack (gpointer user_data, int nargs, ...)
|
|
|
|
|
{
|
|
|
|
|
gpointer *data = user_data;
|
|
|
|
|
va_list ap;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
nm_assert (data);
|
|
|
|
|
nm_assert (nargs > 0);
|
|
|
|
|
|
|
|
|
|
va_start (ap, nargs);
|
|
|
|
|
for (i = 0; i < nargs; i++) {
|
|
|
|
|
gpointer *dst;
|
|
|
|
|
|
|
|
|
|
dst = va_arg (ap, gpointer *);
|
|
|
|
|
nm_assert (dst);
|
|
|
|
|
|
|
|
|
|
*dst = data[i];
|
|
|
|
|
}
|
|
|
|
|
va_end (ap);
|
|
|
|
|
|
2019-08-02 09:30:33 +02:00
|
|
|
g_slice_free1 (((gsize) nargs) * sizeof (gconstpointer), data);
|
2018-04-17 15:24:45 +02:00
|
|
|
}
|
2018-08-09 17:53:59 +02:00
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
2018-10-11 18:02:08 +02:00
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
gpointer callback_user_data;
|
|
|
|
|
GCancellable *cancellable;
|
|
|
|
|
NMUtilsInvokeOnIdleCallback callback;
|
|
|
|
|
gulong cancelled_id;
|
|
|
|
|
guint idle_id;
|
|
|
|
|
} InvokeOnIdleData;
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
_nm_utils_invoke_on_idle_cb_idle (gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
InvokeOnIdleData *data = user_data;
|
|
|
|
|
|
|
|
|
|
data->idle_id = 0;
|
|
|
|
|
nm_clear_g_signal_handler (data->cancellable, &data->cancelled_id);
|
|
|
|
|
|
|
|
|
|
data->callback (data->callback_user_data, data->cancellable);
|
|
|
|
|
nm_g_object_unref (data->cancellable);
|
|
|
|
|
g_slice_free (InvokeOnIdleData, data);
|
|
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
_nm_utils_invoke_on_idle_cb_cancelled (GCancellable *cancellable,
|
|
|
|
|
InvokeOnIdleData *data)
|
|
|
|
|
{
|
|
|
|
|
/* on cancellation, we invoke the callback synchronously. */
|
|
|
|
|
nm_clear_g_signal_handler (data->cancellable, &data->cancelled_id);
|
|
|
|
|
nm_clear_g_source (&data->idle_id);
|
|
|
|
|
data->callback (data->callback_user_data, data->cancellable);
|
|
|
|
|
nm_g_object_unref (data->cancellable);
|
|
|
|
|
g_slice_free (InvokeOnIdleData, data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
nm_utils_invoke_on_idle (NMUtilsInvokeOnIdleCallback callback,
|
|
|
|
|
gpointer callback_user_data,
|
|
|
|
|
GCancellable *cancellable)
|
|
|
|
|
{
|
|
|
|
|
InvokeOnIdleData *data;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (callback);
|
|
|
|
|
|
|
|
|
|
data = g_slice_new (InvokeOnIdleData);
|
|
|
|
|
data->callback = callback;
|
|
|
|
|
data->callback_user_data = callback_user_data;
|
|
|
|
|
data->cancellable = nm_g_object_ref (cancellable);
|
|
|
|
|
if ( cancellable
|
|
|
|
|
&& !g_cancellable_is_cancelled (cancellable)) {
|
|
|
|
|
/* if we are passed a non-cancelled cancellable, we register to the "cancelled"
|
|
|
|
|
* signal an invoke the callback synchronously (from the signal handler).
|
|
|
|
|
*
|
|
|
|
|
* We don't do that,
|
|
|
|
|
* - if the cancellable is already cancelled (because we don't want to invoke
|
|
|
|
|
* the callback synchronously from the caller).
|
|
|
|
|
* - if we have no cancellable at hand. */
|
|
|
|
|
data->cancelled_id = g_signal_connect (cancellable,
|
|
|
|
|
"cancelled",
|
|
|
|
|
G_CALLBACK (_nm_utils_invoke_on_idle_cb_cancelled),
|
|
|
|
|
data);
|
|
|
|
|
} else
|
|
|
|
|
data->cancelled_id = 0;
|
|
|
|
|
data->idle_id = g_idle_add (_nm_utils_invoke_on_idle_cb_idle, data);
|
|
|
|
|
}
|
2018-12-23 13:51:21 +01:00
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
nm_utils_getpagesize (void)
|
|
|
|
|
{
|
|
|
|
|
static volatile int val = 0;
|
|
|
|
|
long l;
|
|
|
|
|
int v;
|
|
|
|
|
|
|
|
|
|
v = g_atomic_int_get (&val);
|
|
|
|
|
|
|
|
|
|
if (G_UNLIKELY (v == 0)) {
|
|
|
|
|
l = sysconf (_SC_PAGESIZE);
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (l > 0 && l < G_MAXINT, 4*1024);
|
|
|
|
|
|
|
|
|
|
v = (int) l;
|
|
|
|
|
if (!g_atomic_int_compare_and_exchange (&val, 0, v)) {
|
|
|
|
|
v = g_atomic_int_get (&val);
|
|
|
|
|
g_return_val_if_fail (v > 0, 4*1024);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
nm_assert (v > 0);
|
|
|
|
|
#if NM_MORE_ASSERTS > 5
|
|
|
|
|
nm_assert (v == getpagesize ());
|
|
|
|
|
nm_assert (v == sysconf (_SC_PAGESIZE));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return v;
|
|
|
|
|
}
|
2018-12-27 14:22:59 +01:00
|
|
|
|
|
|
|
|
gboolean
|
2018-12-27 14:37:21 +01:00
|
|
|
nm_utils_memeqzero (gconstpointer data, gsize length)
|
2018-12-27 14:22:59 +01:00
|
|
|
{
|
|
|
|
|
const unsigned char *p = data;
|
|
|
|
|
int len;
|
|
|
|
|
|
|
|
|
|
/* Taken from https://github.com/rustyrussell/ccan/blob/9d2d2c49f053018724bcc6e37029da10b7c3d60d/ccan/mem/mem.c#L92,
|
|
|
|
|
* CC-0 licensed. */
|
|
|
|
|
|
|
|
|
|
/* Check first 16 bytes manually */
|
|
|
|
|
for (len = 0; len < 16; len++) {
|
|
|
|
|
if (!length)
|
|
|
|
|
return TRUE;
|
|
|
|
|
if (*p)
|
|
|
|
|
return FALSE;
|
|
|
|
|
p++;
|
|
|
|
|
length--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now we know that's zero, memcmp with self. */
|
|
|
|
|
return memcmp (data, p, length) == 0;
|
|
|
|
|
}
|
2019-01-28 16:56:46 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* nm_utils_bin2hexstr_full:
|
2019-02-21 12:03:29 +01:00
|
|
|
* @addr: pointer of @length bytes. If @length is zero, this may
|
|
|
|
|
* also be %NULL.
|
|
|
|
|
* @length: number of bytes in @addr. May also be zero, in which
|
|
|
|
|
* case this will return an empty string.
|
2019-01-28 16:56:46 +01:00
|
|
|
* @delimiter: either '\0', otherwise the output string will have the
|
|
|
|
|
* given delimiter character between each two hex numbers.
|
|
|
|
|
* @upper_case: if TRUE, use upper case ASCII characters for hex.
|
|
|
|
|
* @out: if %NULL, the function will allocate a new buffer of
|
|
|
|
|
* either (@length*2+1) or (@length*3) bytes, depending on whether
|
|
|
|
|
* a @delimiter is specified. In that case, the allocated buffer will
|
|
|
|
|
* be returned and must be freed by the caller.
|
|
|
|
|
* If not %NULL, the buffer must already be preallocated and contain
|
|
|
|
|
* at least (@length*2+1) or (@length*3) bytes, depending on the delimiter.
|
2019-06-19 15:17:05 +02:00
|
|
|
* If @length is zero, then of course at least one byte will be allocated
|
|
|
|
|
* or @out (if given) must contain at least room for the trailing NUL byte.
|
2019-01-28 16:56:46 +01:00
|
|
|
*
|
|
|
|
|
* Returns: the binary value converted to a hex string. If @out is given,
|
|
|
|
|
* this always returns @out. If @out is %NULL, a newly allocated string
|
2019-06-19 15:17:05 +02:00
|
|
|
* is returned. This never returns %NULL, for buffers of length zero
|
|
|
|
|
* an empty string is returend.
|
2019-01-28 16:56:46 +01:00
|
|
|
*/
|
|
|
|
|
char *
|
|
|
|
|
nm_utils_bin2hexstr_full (gconstpointer addr,
|
|
|
|
|
gsize length,
|
|
|
|
|
char delimiter,
|
|
|
|
|
gboolean upper_case,
|
|
|
|
|
char *out)
|
|
|
|
|
{
|
|
|
|
|
const guint8 *in = addr;
|
|
|
|
|
const char *LOOKUP = upper_case ? "0123456789ABCDEF" : "0123456789abcdef";
|
|
|
|
|
char *out0;
|
|
|
|
|
|
|
|
|
|
if (out)
|
|
|
|
|
out0 = out;
|
|
|
|
|
else {
|
2019-06-19 15:17:05 +02:00
|
|
|
out0 = out = g_new (char, length == 0
|
|
|
|
|
? 1u
|
|
|
|
|
: ( delimiter == '\0'
|
|
|
|
|
? length * 2u + 1u
|
|
|
|
|
: length * 3u));
|
2019-01-28 16:56:46 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* @out must contain at least @length*3 bytes if @delimiter is set,
|
|
|
|
|
* otherwise, @length*2+1. */
|
|
|
|
|
|
2019-02-21 12:03:29 +01:00
|
|
|
if (length > 0) {
|
|
|
|
|
nm_assert (in);
|
|
|
|
|
for (;;) {
|
|
|
|
|
const guint8 v = *in++;
|
2019-01-28 16:56:46 +01:00
|
|
|
|
2019-02-21 12:03:29 +01:00
|
|
|
*out++ = LOOKUP[v >> 4];
|
|
|
|
|
*out++ = LOOKUP[v & 0x0F];
|
|
|
|
|
length--;
|
|
|
|
|
if (!length)
|
|
|
|
|
break;
|
|
|
|
|
if (delimiter)
|
|
|
|
|
*out++ = delimiter;
|
|
|
|
|
}
|
2019-01-28 16:56:46 +01:00
|
|
|
}
|
|
|
|
|
|
2019-02-21 12:03:29 +01:00
|
|
|
*out = '\0';
|
2019-01-28 16:56:46 +01:00
|
|
|
return out0;
|
|
|
|
|
}
|
2019-02-21 10:02:28 +01:00
|
|
|
|
|
|
|
|
guint8 *
|
|
|
|
|
nm_utils_hexstr2bin_full (const char *hexstr,
|
|
|
|
|
gboolean allow_0x_prefix,
|
|
|
|
|
gboolean delimiter_required,
|
|
|
|
|
const char *delimiter_candidates,
|
|
|
|
|
gsize required_len,
|
|
|
|
|
guint8 *buffer,
|
|
|
|
|
gsize buffer_len,
|
|
|
|
|
gsize *out_len)
|
|
|
|
|
{
|
|
|
|
|
const char *in = hexstr;
|
|
|
|
|
guint8 *out = buffer;
|
|
|
|
|
gboolean delimiter_has = TRUE;
|
|
|
|
|
guint8 delimiter = '\0';
|
|
|
|
|
gsize len;
|
|
|
|
|
|
|
|
|
|
nm_assert (hexstr);
|
|
|
|
|
nm_assert (buffer);
|
|
|
|
|
nm_assert (required_len > 0 || out_len);
|
|
|
|
|
|
|
|
|
|
if ( allow_0x_prefix
|
|
|
|
|
&& in[0] == '0'
|
|
|
|
|
&& in[1] == 'x')
|
|
|
|
|
in += 2;
|
|
|
|
|
|
|
|
|
|
while (TRUE) {
|
|
|
|
|
const guint8 d1 = in[0];
|
|
|
|
|
guint8 d2;
|
|
|
|
|
int i1, i2;
|
|
|
|
|
|
|
|
|
|
i1 = nm_utils_hexchar_to_int (d1);
|
|
|
|
|
if (i1 < 0)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
/* If there's no leading zero (ie "aa:b:cc") then fake it */
|
|
|
|
|
d2 = in[1];
|
|
|
|
|
if ( d2
|
|
|
|
|
&& (i2 = nm_utils_hexchar_to_int (d2)) >= 0) {
|
|
|
|
|
*out++ = (i1 << 4) + i2;
|
|
|
|
|
d2 = in[2];
|
|
|
|
|
if (!d2)
|
|
|
|
|
break;
|
|
|
|
|
in += 2;
|
|
|
|
|
} else {
|
|
|
|
|
/* Fake leading zero */
|
|
|
|
|
*out++ = i1;
|
|
|
|
|
if (!d2) {
|
|
|
|
|
if (!delimiter_has) {
|
|
|
|
|
/* when using no delimiter, there must be pairs of hex chars */
|
|
|
|
|
goto fail;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
in += 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (--buffer_len == 0)
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
if (delimiter_has) {
|
|
|
|
|
if (d2 != delimiter) {
|
|
|
|
|
if (delimiter)
|
|
|
|
|
goto fail;
|
|
|
|
|
if (delimiter_candidates) {
|
|
|
|
|
while (delimiter_candidates[0]) {
|
|
|
|
|
if (delimiter_candidates++[0] == d2)
|
|
|
|
|
delimiter = d2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!delimiter) {
|
|
|
|
|
if (delimiter_required)
|
|
|
|
|
goto fail;
|
|
|
|
|
delimiter_has = FALSE;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
in++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
len = out - buffer;
|
|
|
|
|
if ( required_len == 0
|
|
|
|
|
|| len == required_len) {
|
|
|
|
|
NM_SET_OUT (out_len, len);
|
|
|
|
|
return buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
NM_SET_OUT (out_len, 0);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
guint8 *
|
|
|
|
|
nm_utils_hexstr2bin_alloc (const char *hexstr,
|
|
|
|
|
gboolean allow_0x_prefix,
|
|
|
|
|
gboolean delimiter_required,
|
|
|
|
|
const char *delimiter_candidates,
|
|
|
|
|
gsize required_len,
|
|
|
|
|
gsize *out_len)
|
|
|
|
|
{
|
|
|
|
|
guint8 *buffer;
|
|
|
|
|
gsize buffer_len, len;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (hexstr, NULL);
|
|
|
|
|
|
|
|
|
|
nm_assert (required_len > 0 || out_len);
|
|
|
|
|
|
|
|
|
|
if ( allow_0x_prefix
|
|
|
|
|
&& hexstr[0] == '0'
|
|
|
|
|
&& hexstr[1] == 'x')
|
|
|
|
|
hexstr += 2;
|
|
|
|
|
|
|
|
|
|
if (!hexstr[0])
|
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
|
|
if (required_len > 0)
|
|
|
|
|
buffer_len = required_len;
|
|
|
|
|
else
|
|
|
|
|
buffer_len = strlen (hexstr) / 2 + 3;
|
|
|
|
|
|
|
|
|
|
buffer = g_malloc (buffer_len);
|
|
|
|
|
|
|
|
|
|
if (nm_utils_hexstr2bin_full (hexstr,
|
|
|
|
|
FALSE,
|
|
|
|
|
delimiter_required,
|
|
|
|
|
delimiter_candidates,
|
|
|
|
|
required_len,
|
|
|
|
|
buffer,
|
|
|
|
|
buffer_len,
|
|
|
|
|
&len)) {
|
|
|
|
|
NM_SET_OUT (out_len, len);
|
|
|
|
|
return buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_free (buffer);
|
|
|
|
|
|
|
|
|
|
fail:
|
|
|
|
|
NM_SET_OUT (out_len, 0);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2019-05-22 11:30:28 +02:00
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
GVariant *
|
|
|
|
|
nm_utils_gvariant_vardict_filter (GVariant *src,
|
|
|
|
|
gboolean (*filter_fcn) (const char *key,
|
|
|
|
|
GVariant *val,
|
|
|
|
|
char **out_key,
|
|
|
|
|
GVariant **out_val,
|
|
|
|
|
gpointer user_data),
|
|
|
|
|
gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
GVariantIter iter;
|
|
|
|
|
GVariantBuilder builder;
|
|
|
|
|
const char *key;
|
|
|
|
|
GVariant *val;
|
|
|
|
|
|
|
|
|
|
g_return_val_if_fail (src && g_variant_is_of_type (src, G_VARIANT_TYPE_VARDICT), NULL);
|
|
|
|
|
g_return_val_if_fail (filter_fcn, NULL);
|
|
|
|
|
|
|
|
|
|
g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
|
|
|
|
|
|
|
|
|
|
g_variant_iter_init (&iter, src);
|
|
|
|
|
while (g_variant_iter_next (&iter, "{&sv}", &key, &val)) {
|
|
|
|
|
_nm_unused gs_unref_variant GVariant *val_free = val;
|
|
|
|
|
gs_free char *key2 = NULL;
|
|
|
|
|
gs_unref_variant GVariant *val2 = NULL;
|
|
|
|
|
|
|
|
|
|
if (filter_fcn (key,
|
|
|
|
|
val,
|
|
|
|
|
&key2,
|
|
|
|
|
&val2,
|
|
|
|
|
user_data)) {
|
|
|
|
|
g_variant_builder_add (&builder,
|
|
|
|
|
"{sv}",
|
|
|
|
|
key2 ?: key,
|
|
|
|
|
val2 ?: val);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return g_variant_builder_end (&builder);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
|
_gvariant_vardict_filter_drop_one (const char *key,
|
|
|
|
|
GVariant *val,
|
|
|
|
|
char **out_key,
|
|
|
|
|
GVariant **out_val,
|
|
|
|
|
gpointer user_data)
|
|
|
|
|
{
|
|
|
|
|
return !nm_streq (key, user_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
GVariant *
|
|
|
|
|
nm_utils_gvariant_vardict_filter_drop_one (GVariant *src,
|
|
|
|
|
const char *key)
|
|
|
|
|
{
|
|
|
|
|
return nm_utils_gvariant_vardict_filter (src,
|
|
|
|
|
_gvariant_vardict_filter_drop_one,
|
|
|
|
|
(gpointer) key);
|
|
|
|
|
}
|