summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--client/bemenu-run.c1
-rw-r--r--client/common/common.c1
-rw-r--r--lib/library.c4
-rw-r--r--lib/renderers/curses/curses.c3
-rw-r--r--lib/renderers/wayland/registry.c1
-rw-r--r--lib/renderers/wayland/wayland.c1
-rw-r--r--lib/renderers/wayland/window.c1
-rw-r--r--lib/renderers/x11/x11.c1
-rw-r--r--test/bm_menu_new.c1
10 files changed, 4 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index db40db7..9bf2b2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,8 @@ INCLUDE(CTest)
INCLUDE(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-# C99
-ADD_DEFINITIONS(-std=c99)
+# C99 and _GNU_SOURCE for secure_getenv
+ADD_DEFINITIONS(-std=c99 -D_GNU_SOURCE)
# Compile library
ADD_SUBDIRECTORY(lib)
diff --git a/client/bemenu-run.c b/client/bemenu-run.c
index 32f758c..b68e715 100644
--- a/client/bemenu-run.c
+++ b/client/bemenu-run.c
@@ -1,4 +1,3 @@
-#define _DEFAULT_SOURCE
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/client/common/common.c b/client/common/common.c
index e5eede5..6bb2ec7 100644
--- a/client/common/common.c
+++ b/client/common/common.c
@@ -1,4 +1,3 @@
-#define _DEFAULT_SOURCE
#include "common.h"
#include <stdlib.h>
#include <string.h>
diff --git a/lib/library.c b/lib/library.c
index f28d223..2dc59fc 100644
--- a/lib/library.c
+++ b/lib/library.c
@@ -123,12 +123,12 @@ bm_init(void)
return true;
static const char *rpath = INSTALL_PREFIX "/lib/bemenu";
- const char *path = getenv("BEMENU_RENDERER");
+ const char *path = secure_getenv("BEMENU_RENDERER");
if (path)
return load_to_list(path);
- path = getenv("BEMENU_RENDERERS");
+ path = secure_getenv("BEMENU_RENDERERS");
if (!path || access(path, R_OK) == -1)
path = rpath;
diff --git a/lib/renderers/curses/curses.c b/lib/renderers/curses/curses.c
index 6a7010d..78449ac 100644
--- a/lib/renderers/curses/curses.c
+++ b/lib/renderers/curses/curses.c
@@ -1,6 +1,3 @@
-#define _DEFAULT_SOURCE
-#define _XOPEN_SOURCE_EXTENDED
-
#include "internal.h"
#include "version.h"
diff --git a/lib/renderers/wayland/registry.c b/lib/renderers/wayland/registry.c
index d83c797..e761633 100644
--- a/lib/renderers/wayland/registry.c
+++ b/lib/renderers/wayland/registry.c
@@ -1,4 +1,3 @@
-#define _DEFAULT_SOURCE
#include "wayland.h"
#include <unistd.h>
diff --git a/lib/renderers/wayland/wayland.c b/lib/renderers/wayland/wayland.c
index 5d85479..a3866c6 100644
--- a/lib/renderers/wayland/wayland.c
+++ b/lib/renderers/wayland/wayland.c
@@ -1,4 +1,3 @@
-#define _DEFAULT_SOURCE
#include "internal.h"
#include "version.h"
#include "wayland.h"
diff --git a/lib/renderers/wayland/window.c b/lib/renderers/wayland/window.c
index bfff232..fb4a8f0 100644
--- a/lib/renderers/wayland/window.c
+++ b/lib/renderers/wayland/window.c
@@ -1,4 +1,3 @@
-#define _DEFAULT_SOURCE
#include "internal.h"
#include "wayland.h"
diff --git a/lib/renderers/x11/x11.c b/lib/renderers/x11/x11.c
index 3e9ced9..3e29efe 100644
--- a/lib/renderers/x11/x11.c
+++ b/lib/renderers/x11/x11.c
@@ -1,4 +1,3 @@
-#define _DEFAULT_SOURCE
#include "internal.h"
#include "version.h"
#include "x11.h"
diff --git a/test/bm_menu_new.c b/test/bm_menu_new.c
index e30b549..b1f667e 100644
--- a/test/bm_menu_new.c
+++ b/test/bm_menu_new.c
@@ -1,4 +1,3 @@
-#define _DEFAULT_SOURCE
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>