fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-25 14:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up how we arrange for environ to be declared

Browse source 
Annoyingly, the POSIX way to declare environ (as
"extern char **environ") is a redundant declaration in glibc with
_GNU_SOURCE; work around that.

We also have a workaround for _NSGetEnviron() needing to be used
instead of direct access to environ in at least some circumstances on
Mac OS. Attempt to sync that up between all the files that use environ,
consistently sorting the most special special-cases first (Windows
for files that are compiled there, then Mac, then GNU, with
lowest-common-denominator POSIX last).

The affected files are already OS-specific, so I'm not bothering to
introduce a nicer or higher-level API for this.

Based on the best bits of an earlier patch from me, and an earlier
patch from Thomas Zimmermann.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=97357
This commit is contained in:
Simon McVittie 2016-10-07 17:24:31 +01:00 • committed by Simon McVittie
parent 1699d16018
commit 91ae697d41
5 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -491,6 +491,10 @@ case $host_os in
;;
esac
# As a GNU extension, glibc declares environ in unistd.h, which is one of
# the AC_INCLUDES_DEFAULT.
AC_CHECK_DECLS([environ])
dnl **********************************
dnl *** va_copy checks (from GLib) ***
dnl **********************************

5
dbus/dbus-spawn.c
View file

@ -45,7 +45,12 @@
#include <systemd/sd-journal.h>
#endif
#if defined(__APPLE__)
# include <crt_externs.h>
# define environ (*_NSGetEnviron ())
#elif !HAVE_DECL_ENVIRON
extern char **environ;
#endif
/**
* @addtogroup DBusInternalsUtils

2
dbus/dbus-sysdeps-util.c
View file

@ -35,6 +35,8 @@
#elif (defined __APPLE__)
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#elif HAVE_DECL_ENVIRON && defined(HAVE_UNISTD_H)
# include <unistd.h>
#else
extern char **environ;
#endif

2
dbus/dbus-sysdeps.c
View file

@ -52,6 +52,8 @@
#elif (defined __APPLE__)
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#elif HAVE_DECL_ENVIRON && defined(HAVE_UNISTD_H)
# include <unistd.h>
#else
extern char **environ;
#endif

7
tools/dbus-update-activation-environment.c
View file

@ -62,9 +62,12 @@
#ifdef DBUS_WIN
/* The Windows C runtime uses a different name */
#define environ _environ
#elif defined(__APPLE__)
# include <crt_externs.h>
# define environ (*_NSGetEnviron ())
#elif HAVE_DECL_ENVIRON && defined(HAVE_UNISTD_H)
# include <unistd.h>
#else
/* apparently this is the portable way to get the entire environment...
* GNU platforms also put it in unistd.h but that's not portable */
extern char **environ;
#endif