dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0322-Introduce-function-grub_debug_is_enabled-void-return.patch

dbe756
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
dbe756
From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
dbe756
Date: Mon, 25 Nov 2019 09:29:53 +0100
dbe756
Subject: [PATCH] Introduce function grub_debug_is_enabled(void) returning 1 if
dbe756
 'debug' is in the environment and not empty
dbe756
MIME-Version: 1.0
dbe756
Content-Type: text/plain; charset=UTF-8
dbe756
Content-Transfer-Encoding: 8bit
dbe756
dbe756
Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
dbe756
---
dbe756
 grub-core/kern/misc.c | 13 +++++++++++++
dbe756
 include/grub/misc.h   |  1 +
dbe756
 2 files changed, 14 insertions(+)
dbe756
dbe756
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
dbe756
index 11f2974fce5..97378c48b22 100644
dbe756
--- a/grub-core/kern/misc.c
dbe756
+++ b/grub-core/kern/misc.c
dbe756
@@ -162,6 +162,19 @@ int grub_err_printf (const char *fmt, ...)
dbe756
 __attribute__ ((alias("grub_printf")));
dbe756
 #endif
dbe756
 
dbe756
+/* Return 1 if 'debug' is set and not empty */
dbe756
+int
dbe756
+grub_debug_is_enabled (void)
dbe756
+{
dbe756
+  const char *debug;
dbe756
+
dbe756
+  debug = grub_env_get ("debug");
dbe756
+  if (!debug || debug[0] == '\0')
dbe756
+    return 0;
dbe756
+
dbe756
+  return 1;
dbe756
+}
dbe756
+
dbe756
 int
dbe756
 grub_debug_enabled (const char * condition)
dbe756
 {
dbe756
diff --git a/include/grub/misc.h b/include/grub/misc.h
dbe756
index 1258ec6bbf3..6ca03c4d692 100644
dbe756
--- a/include/grub/misc.h
dbe756
+++ b/include/grub/misc.h
dbe756
@@ -367,6 +367,7 @@ grub_puts (const char *s)
dbe756
 }
dbe756
 
dbe756
 int EXPORT_FUNC(grub_puts_) (const char *s);
dbe756
+int EXPORT_FUNC(grub_debug_is_enabled) (void);
dbe756
 int EXPORT_FUNC(grub_debug_enabled) (const char *condition);
dbe756
 void EXPORT_FUNC(grub_real_dprintf) (const char *file,
dbe756
                                      const int line,