Blame SOURCES/0234-Make-exit-take-a-return-code.patch

f725e3
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f725e3
From: Peter Jones <pjones@redhat.com>
f725e3
Date: Wed, 26 Feb 2014 21:49:12 -0500
f725e3
Subject: [PATCH] Make "exit" take a return code.
f725e3
f725e3
This adds "exit" with a return code.  With this patch, any "exit"
f725e3
command /may/ include a return code, and on platforms that support
f725e3
returning with an exit status, we will do so.  By default we return the
f725e3
same exit status we did before this patch.
f725e3
f725e3
Signed-off-by: Peter Jones <pjones@redhat.com>
f725e3
---
f725e3
 grub-core/commands/minicmd.c         | 20 ++++++++++++++++----
f725e3
 grub-core/kern/efi/efi.c             |  9 +++++++--
f725e3
 grub-core/kern/emu/main.c            |  6 ++++++
f725e3
 grub-core/kern/emu/misc.c            |  5 +++--
f725e3
 grub-core/kern/i386/coreboot/init.c  |  2 +-
f725e3
 grub-core/kern/i386/qemu/init.c      |  2 +-
f725e3
 grub-core/kern/ieee1275/init.c       |  2 +-
f725e3
 grub-core/kern/mips/arc/init.c       |  2 +-
f725e3
 grub-core/kern/mips/loongson/init.c  |  2 +-
f725e3
 grub-core/kern/mips/qemu_mips/init.c |  2 +-
f725e3
 grub-core/kern/misc.c                |  2 +-
f725e3
 grub-core/kern/uboot/init.c          |  6 +++---
f725e3
 grub-core/kern/xen/init.c            |  2 +-
f725e3
 include/grub/misc.h                  |  2 +-
f725e3
 14 files changed, 44 insertions(+), 20 deletions(-)
f725e3
f725e3
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
f725e3
index a3a11824172..b25ca4b9f17 100644
f725e3
--- a/grub-core/commands/minicmd.c
f725e3
+++ b/grub-core/commands/minicmd.c
f725e3
@@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
f725e3
 }
f725e3
 
f725e3
 /* exit */
f725e3
-static grub_err_t __attribute__ ((noreturn))
f725e3
+static grub_err_t
f725e3
 grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
f725e3
-		    int argc __attribute__ ((unused)),
f725e3
-		    char *argv[] __attribute__ ((unused)))
f725e3
+		    int argc, char *argv[])
f725e3
 {
f725e3
-  grub_exit ();
f725e3
+  int retval = -1;
f725e3
+  unsigned long n;
f725e3
+
f725e3
+  if (argc < 0 || argc > 1)
f725e3
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
f725e3
+
f725e3
+  if (argc == 1)
f725e3
+    {
f725e3
+      n = grub_strtoul (argv[0], 0, 10);
f725e3
+      if (n != ~0UL)
f725e3
+	retval = n;
f725e3
+    }
f725e3
+
f725e3
+  grub_exit (retval);
f725e3
   /* Not reached.  */
f725e3
 }
f725e3
 
f725e3
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
f725e3
index 7dfe2ef1455..453f97a7595 100644
f725e3
--- a/grub-core/kern/efi/efi.c
f725e3
+++ b/grub-core/kern/efi/efi.c
f725e3
@@ -155,11 +155,16 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
f725e3
 }
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+grub_exit (int retval)
f725e3
 {
f725e3
+  int rc = GRUB_EFI_LOAD_ERROR;
f725e3
+
f725e3
+  if (retval == 0)
f725e3
+    rc = GRUB_EFI_SUCCESS;
f725e3
+
f725e3
   grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);
f725e3
   efi_call_4 (grub_efi_system_table->boot_services->exit,
f725e3
-              grub_efi_image_handle, GRUB_EFI_LOAD_ERROR, 0, 0);
f725e3
+              grub_efi_image_handle, rc, 0, 0);
f725e3
   for (;;) ;
f725e3
 }
f725e3
 
f725e3
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
f725e3
index 4b509139c4a..d7c880c0c1f 100644
f725e3
--- a/grub-core/kern/emu/main.c
f725e3
+++ b/grub-core/kern/emu/main.c
f725e3
@@ -65,6 +65,12 @@ grub_reboot (void)
f725e3
   longjmp (main_env, 1);
f725e3
 }
f725e3
 
f725e3
+void
f725e3
+grub_exit (int retval __attribute__((unused)))
f725e3
+{
f725e3
+  grub_reboot ();
f725e3
+}
f725e3
+
f725e3
 void
f725e3
 grub_machine_init (void)
f725e3
 {
f725e3
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
f725e3
index bb606da2803..258a5649e2d 100644
f725e3
--- a/grub-core/kern/emu/misc.c
f725e3
+++ b/grub-core/kern/emu/misc.c
f725e3
@@ -135,9 +135,10 @@ xasprintf (const char *fmt, ...)
f725e3
 #endif
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+__attribute__ ((noreturn))
f725e3
+grub_exit (int rc)
f725e3
 {
f725e3
-  exit (1);
f725e3
+  exit (rc < 0 ? 1 : rc);
f725e3
 }
f725e3
 
f725e3
 grub_uint64_t
f725e3
diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
f725e3
index 3314f027fec..36f9134b7b7 100644
f725e3
--- a/grub-core/kern/i386/coreboot/init.c
f725e3
+++ b/grub-core/kern/i386/coreboot/init.c
f725e3
@@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
f725e3
 extern grub_uint8_t _edata[];
f725e3
 
f725e3
 void  __attribute__ ((noreturn))
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc __attribute__((unused)))
f725e3
 {
f725e3
   /* We can't use grub_fatal() in this function.  This would create an infinite
f725e3
      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
f725e3
diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
f725e3
index 271b6fbfabd..9fafe98f015 100644
f725e3
--- a/grub-core/kern/i386/qemu/init.c
f725e3
+++ b/grub-core/kern/i386/qemu/init.c
f725e3
@@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
f725e3
 extern grub_uint8_t _edata[];
f725e3
 
f725e3
 void  __attribute__ ((noreturn))
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc __attribute__((unused)))
f725e3
 {
f725e3
   /* We can't use grub_fatal() in this function.  This would create an infinite
f725e3
      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
f725e3
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
f725e3
index 8ca4bf79f09..e2540bc41ce 100644
f725e3
--- a/grub-core/kern/ieee1275/init.c
f725e3
+++ b/grub-core/kern/ieee1275/init.c
f725e3
@@ -60,7 +60,7 @@ grub_addr_t grub_ieee1275_original_stack;
f725e3
 #endif
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc __attribute__((unused)))
f725e3
 {
f725e3
   grub_ieee1275_exit ();
f725e3
 }
f725e3
diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
f725e3
index b4f50e49642..90049cb53ce 100644
f725e3
--- a/grub-core/kern/mips/arc/init.c
f725e3
+++ b/grub-core/kern/mips/arc/init.c
f725e3
@@ -276,7 +276,7 @@ grub_halt (void)
f725e3
 }
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc __attribute__((unused)))
f725e3
 {
f725e3
   GRUB_ARC_FIRMWARE_VECTOR->exit ();
f725e3
 
f725e3
diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
f725e3
index 7b96531b983..dff598ca7b0 100644
f725e3
--- a/grub-core/kern/mips/loongson/init.c
f725e3
+++ b/grub-core/kern/mips/loongson/init.c
f725e3
@@ -304,7 +304,7 @@ grub_halt (void)
f725e3
 }
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc __attribute__((unused)))
f725e3
 {
f725e3
   grub_halt ();
f725e3
 }
f725e3
diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
f725e3
index be88b77d22d..8b6c55ffc01 100644
f725e3
--- a/grub-core/kern/mips/qemu_mips/init.c
f725e3
+++ b/grub-core/kern/mips/qemu_mips/init.c
f725e3
@@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
f725e3
 }
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc __attribute__((unused)))
f725e3
 {
f725e3
   grub_halt ();
f725e3
 }
f725e3
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
f725e3
index 392c697db03..240396c55f3 100644
f725e3
--- a/grub-core/kern/misc.c
f725e3
+++ b/grub-core/kern/misc.c
f725e3
@@ -1278,7 +1278,7 @@ grub_abort (void)
f725e3
       grub_getkey ();
f725e3
     }
f725e3
 
f725e3
-  grub_exit ();
f725e3
+  grub_exit (1);
f725e3
 }
f725e3
 
f725e3
 #if defined (__clang__) && !defined (GRUB_UTIL)
f725e3
diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
f725e3
index 5dcc106ed9b..430c62b66e0 100644
f725e3
--- a/grub-core/kern/uboot/init.c
f725e3
+++ b/grub-core/kern/uboot/init.c
f725e3
@@ -43,9 +43,9 @@ extern grub_uint32_t grub_uboot_machine_type;
f725e3
 extern grub_addr_t grub_uboot_boot_data;
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc)
f725e3
 {
f725e3
-  grub_uboot_return (0);
f725e3
+  grub_uboot_return (rc < 0 ? 1 : rc);
f725e3
 }
f725e3
 
f725e3
 grub_uint32_t
f725e3
@@ -94,7 +94,7 @@ grub_machine_init (void)
f725e3
   if (!ver)
f725e3
     {
f725e3
       /* Don't even have a console to log errors to... */
f725e3
-      grub_exit ();
f725e3
+      grub_exit (-1);
f725e3
     }
f725e3
   else if (ver > API_SIG_VERSION)
f725e3
     {
f725e3
diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
f725e3
index 0559c033c3d..fce526d417b 100644
f725e3
--- a/grub-core/kern/xen/init.c
f725e3
+++ b/grub-core/kern/xen/init.c
f725e3
@@ -549,7 +549,7 @@ grub_machine_init (void)
f725e3
 }
f725e3
 
f725e3
 void
f725e3
-grub_exit (void)
f725e3
+grub_exit (int rc __attribute__((unused)))
f725e3
 {
f725e3
   struct sched_shutdown arg;
f725e3
 
f725e3
diff --git a/include/grub/misc.h b/include/grub/misc.h
f725e3
index 34250291908..c6851fb9dcf 100644
f725e3
--- a/include/grub/misc.h
f725e3
+++ b/include/grub/misc.h
f725e3
@@ -398,7 +398,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
f725e3
 char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
f725e3
      __attribute__ ((format (GNU_PRINTF, 1, 2))) WARN_UNUSED_RESULT;
f725e3
 char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args) WARN_UNUSED_RESULT;
f725e3
-void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
f725e3
+void EXPORT_FUNC(grub_exit) (int rc) __attribute__ ((noreturn));
f725e3
 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
f725e3
 					  grub_uint64_t d,
f725e3
 					  grub_uint64_t *r);