Fix build on compilers w/o __func__ or __FUNCTION__

diff --git a/include/sudo_debug.h b/include/sudo_debug.h
index 70619f1c939b76aab5dfe7376c6e6edb06411fb3..938c13744cafe8cff89b71410c7ac654ad3a9d48 100644 (file)
--- a/include/sudo_debug.h
+++ b/include/sudo_debug.h
@@ -98,12 +98,15 @@ struct sudo_conf_debug_file_list;
  * and sets sudo_debug_subsys for sudo_debug_exit().
  */
 #ifdef HAVE___FUNC__
+# define debug_decl_func(funcname)
 # define debug_decl_vars(funcname, subsys)                                    \
     const int sudo_debug_subsys = (subsys);
 #else
+# define debug_decl_func(funcname)                                            \
+    const char __func__[] = #funcname;
 # define debug_decl_vars(funcname, subsys)                                    \
     const int sudo_debug_subsys = (subsys);                                   \
-    const char __func__[] = #funcname;
+    debug_decl_func(funcname);
 #endif
 #define debug_decl(funcname, subsys)                                          \
     debug_decl_vars((funcname), (subsys))                                     \

diff --git a/lib/util/sudo_debug.c b/lib/util/sudo_debug.c
index b8efb7586d666bb07f95eb15e3e66fd8222827dc..9c884e4162001971eec8ef91b037c0cac7a8e857 100644 (file)
--- a/lib/util/sudo_debug.c
+++ b/lib/util/sudo_debug.c
@@ -253,6 +253,7 @@ sudo_debug_register_v1(const char *program, const char *const subsystems[],
     struct sudo_debug_output *output;
     struct sudo_debug_file *debug_file;
     int idx, free_idx = -1;
+    debug_decl_func(sudo_debug_register);
 
     if (debug_files == NULL)
        return SUDO_DEBUG_INSTANCE_INITIALIZER;
@@ -357,6 +358,7 @@ sudo_debug_deregister_v1(int idx)
 {
     struct sudo_debug_instance *instance;
     struct sudo_debug_output *output, *next;
+    debug_decl_func(sudo_debug_deregister);
 
     if (idx < 0 || idx > sudo_debug_last_instance) {
        sudo_warnx_nodebug("%s: invalid instance ID %d, max %d",
@@ -577,6 +579,7 @@ sudo_debug_vprintf2_v1(const char *func, const char *file, int lineno, int level
     char static_buf[1024], *buf = static_buf;
     struct sudo_debug_instance *instance;
     struct sudo_debug_output *output;
+    debug_decl_func(sudo_debug_vprintf2);
 
     if (sudo_debug_active_instance == -1)
        goto out;
@@ -667,6 +670,7 @@ sudo_debug_execve2_v1(int level, const char *path, char *const argv[], char *con
     char * const *av;
     char *cp, static_buf[4096], *buf = static_buf;
     size_t plen;
+    debug_decl_func(sudo_debug_execve2);
 
     if (sudo_debug_active_instance == -1)
        goto out;