diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2020-10-20 12:12:51 +0400 |
---|---|---|
committer | Michael Roth <michael.roth@amd.com> | 2020-11-02 19:52:08 -0600 |
commit | 6d593ab451c490b0ca941c6a519894231634751e (patch) | |
tree | 10c16308c6f477e331ed54c2c42900154003ab2e /include | |
parent | c67d2efd9d1771fd886e3b58771adaa62897f3d9 (diff) | |
download | qemu-6d593ab451c490b0ca941c6a519894231634751e.zip qemu-6d593ab451c490b0ca941c6a519894231634751e.tar.gz qemu-6d593ab451c490b0ca941c6a519894231634751e.tar.bz2 |
glib-compat: add g_unix_get_passwd_entry_qemu()
The glib function was introduced in 2.64. It's a safer version of
getpwnam, and also simpler to use than getpwnam_r.
Currently, it's only use by the next patch in qemu-ga, which doesn't
(well well...) need the thread safety guarantees. Since the fallback
version is still unsafe, I would rather keep the _qemu postfix, to make
sure it's not being misused by mistake. When/if necessary, we can
implement a safer fallback and drop the _qemu suffix.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
*fix checkpatch warnings about newlines before/after block comments
Signed-off-by: Michael Roth <michael.roth@amd.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/glib-compat.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/include/glib-compat.h b/include/glib-compat.h index 0b0ec76..695a96f 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -30,6 +30,11 @@ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #include <glib.h> +#if defined(G_OS_UNIX) +#include <glib-unix.h> +#include <sys/types.h> +#include <pwd.h> +#endif /* * Note that because of the GLIB_VERSION_MAX_ALLOWED constant above, allowing @@ -72,6 +77,29 @@ gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout); #endif +#if defined(G_OS_UNIX) +/* + * Note: The fallback implementation is not MT-safe, and it returns a copy of + * the libc passwd (must be g_free() after use) but not the content. Because of + * these important differences the caller must be aware of, it's not #define for + * GLib API substitution. + */ +static inline struct passwd * +g_unix_get_passwd_entry_qemu(const gchar *user_name, GError **error) +{ +#if GLIB_CHECK_VERSION(2, 64, 0) + return g_unix_get_passwd_entry(user_name, error); +#else + struct passwd *p = getpwnam(user_name); + if (!p) { + g_set_error_literal(error, G_UNIX_ERROR, 0, g_strerror(errno)); + return NULL; + } + return (struct passwd *)g_memdup(p, sizeof(*p)); +#endif +} +#endif /* G_OS_UNIX */ + #pragma GCC diagnostic pop #endif |