27a4da
From 2dfde7888d4bcd31b3c88680a96e1e935f01cec6 Mon Sep 17 00:00:00 2001
27a4da
From: Peter Jones <pjones@redhat.com>
27a4da
Date: Wed, 26 Feb 2014 21:49:12 -0500
27a4da
Subject: [PATCH 234/260] Make "exit" take a return code.
27a4da
27a4da
This adds "exit" with a return code.  With this patch, any "exit"
27a4da
command /may/ include a return code, and on platforms that support
27a4da
returning with an exit status, we will do so.  By default we return the
27a4da
same exit status we did before this patch.
27a4da
27a4da
Signed-off-by: Peter Jones <pjones@redhat.com>
27a4da
---
27a4da
 grub-core/commands/minicmd.c         | 20 ++++++++++++++++----
27a4da
 grub-core/kern/efi/efi.c             |  9 +++++++--
27a4da
 grub-core/kern/emu/main.c            |  6 ++++++
27a4da
 grub-core/kern/emu/misc.c            |  5 +++--
27a4da
 grub-core/kern/i386/coreboot/init.c  |  2 +-
27a4da
 grub-core/kern/i386/qemu/init.c      |  2 +-
27a4da
 grub-core/kern/ieee1275/init.c       |  2 +-
27a4da
 grub-core/kern/mips/arc/init.c       |  2 +-
27a4da
 grub-core/kern/mips/loongson/init.c  |  2 +-
27a4da
 grub-core/kern/mips/qemu_mips/init.c |  2 +-
27a4da
 grub-core/kern/misc.c                |  2 +-
27a4da
 grub-core/kern/uboot/init.c          |  6 +++---
27a4da
 grub-core/kern/xen/init.c            |  2 +-
27a4da
 include/grub/misc.h                  |  2 +-
27a4da
 14 files changed, 44 insertions(+), 20 deletions(-)
27a4da
27a4da
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
27a4da
index a3a118241..b25ca4b9f 100644
27a4da
--- a/grub-core/commands/minicmd.c
27a4da
+++ b/grub-core/commands/minicmd.c
27a4da
@@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
27a4da
 }
27a4da
 
27a4da
 /* exit */
27a4da
-static grub_err_t __attribute__ ((noreturn))
27a4da
+static grub_err_t
27a4da
 grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
27a4da
-		    int argc __attribute__ ((unused)),
27a4da
-		    char *argv[] __attribute__ ((unused)))
27a4da
+		    int argc, char *argv[])
27a4da
 {
27a4da
-  grub_exit ();
27a4da
+  int retval = -1;
27a4da
+  unsigned long n;
27a4da
+
27a4da
+  if (argc < 0 || argc > 1)
27a4da
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
27a4da
+
27a4da
+  if (argc == 1)
27a4da
+    {
27a4da
+      n = grub_strtoul (argv[0], 0, 10);
27a4da
+      if (n != ~0UL)
27a4da
+	retval = n;
27a4da
+    }
27a4da
+
27a4da
+  grub_exit (retval);
27a4da
   /* Not reached.  */
27a4da
 }
27a4da
 
27a4da
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
27a4da
index 7dfe2ef14..453f97a75 100644
27a4da
--- a/grub-core/kern/efi/efi.c
27a4da
+++ b/grub-core/kern/efi/efi.c
27a4da
@@ -155,11 +155,16 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
27a4da
 }
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+grub_exit (int retval)
27a4da
 {
27a4da
+  int rc = GRUB_EFI_LOAD_ERROR;
27a4da
+
27a4da
+  if (retval == 0)
27a4da
+    rc = GRUB_EFI_SUCCESS;
27a4da
+
27a4da
   grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);
27a4da
   efi_call_4 (grub_efi_system_table->boot_services->exit,
27a4da
-              grub_efi_image_handle, GRUB_EFI_LOAD_ERROR, 0, 0);
27a4da
+              grub_efi_image_handle, rc, 0, 0);
27a4da
   for (;;) ;
27a4da
 }
27a4da
 
27a4da
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
27a4da
index 4b509139c..d7c880c0c 100644
27a4da
--- a/grub-core/kern/emu/main.c
27a4da
+++ b/grub-core/kern/emu/main.c
27a4da
@@ -66,6 +66,12 @@ grub_reboot (void)
27a4da
 }
27a4da
 
27a4da
 void
27a4da
+grub_exit (int retval __attribute__((unused)))
27a4da
+{
27a4da
+  grub_reboot ();
27a4da
+}
27a4da
+
27a4da
+void
27a4da
 grub_machine_init (void)
27a4da
 {
27a4da
 }
27a4da
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
27a4da
index bb606da28..258a5649e 100644
27a4da
--- a/grub-core/kern/emu/misc.c
27a4da
+++ b/grub-core/kern/emu/misc.c
27a4da
@@ -135,9 +135,10 @@ xasprintf (const char *fmt, ...)
27a4da
 #endif
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+__attribute__ ((noreturn))
27a4da
+grub_exit (int rc)
27a4da
 {
27a4da
-  exit (1);
27a4da
+  exit (rc < 0 ? 1 : rc);
27a4da
 }
27a4da
 
27a4da
 grub_uint64_t
27a4da
diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
27a4da
index 3314f027f..36f9134b7 100644
27a4da
--- a/grub-core/kern/i386/coreboot/init.c
27a4da
+++ b/grub-core/kern/i386/coreboot/init.c
27a4da
@@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
27a4da
 extern grub_uint8_t _edata[];
27a4da
 
27a4da
 void  __attribute__ ((noreturn))
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc __attribute__((unused)))
27a4da
 {
27a4da
   /* We can't use grub_fatal() in this function.  This would create an infinite
27a4da
      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
27a4da
diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
27a4da
index 271b6fbfa..9fafe98f0 100644
27a4da
--- a/grub-core/kern/i386/qemu/init.c
27a4da
+++ b/grub-core/kern/i386/qemu/init.c
27a4da
@@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
27a4da
 extern grub_uint8_t _edata[];
27a4da
 
27a4da
 void  __attribute__ ((noreturn))
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc __attribute__((unused)))
27a4da
 {
27a4da
   /* We can't use grub_fatal() in this function.  This would create an infinite
27a4da
      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
27a4da
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
27a4da
index 8ca4bf79f..e2540bc41 100644
27a4da
--- a/grub-core/kern/ieee1275/init.c
27a4da
+++ b/grub-core/kern/ieee1275/init.c
27a4da
@@ -60,7 +60,7 @@ grub_addr_t grub_ieee1275_original_stack;
27a4da
 #endif
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc __attribute__((unused)))
27a4da
 {
27a4da
   grub_ieee1275_exit ();
27a4da
 }
27a4da
diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
27a4da
index b4f50e496..90049cb53 100644
27a4da
--- a/grub-core/kern/mips/arc/init.c
27a4da
+++ b/grub-core/kern/mips/arc/init.c
27a4da
@@ -276,7 +276,7 @@ grub_halt (void)
27a4da
 }
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc __attribute__((unused)))
27a4da
 {
27a4da
   GRUB_ARC_FIRMWARE_VECTOR->exit ();
27a4da
 
27a4da
diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
27a4da
index 7b96531b9..dff598ca7 100644
27a4da
--- a/grub-core/kern/mips/loongson/init.c
27a4da
+++ b/grub-core/kern/mips/loongson/init.c
27a4da
@@ -304,7 +304,7 @@ grub_halt (void)
27a4da
 }
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc __attribute__((unused)))
27a4da
 {
27a4da
   grub_halt ();
27a4da
 }
27a4da
diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
27a4da
index be88b77d2..8b6c55ffc 100644
27a4da
--- a/grub-core/kern/mips/qemu_mips/init.c
27a4da
+++ b/grub-core/kern/mips/qemu_mips/init.c
27a4da
@@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
27a4da
 }
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc __attribute__((unused)))
27a4da
 {
27a4da
   grub_halt ();
27a4da
 }
27a4da
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
27a4da
index 392c697db..240396c55 100644
27a4da
--- a/grub-core/kern/misc.c
27a4da
+++ b/grub-core/kern/misc.c
27a4da
@@ -1278,7 +1278,7 @@ grub_abort (void)
27a4da
       grub_getkey ();
27a4da
     }
27a4da
 
27a4da
-  grub_exit ();
27a4da
+  grub_exit (1);
27a4da
 }
27a4da
 
27a4da
 #if defined (__clang__) && !defined (GRUB_UTIL)
27a4da
diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
27a4da
index 5dcc106ed..430c62b66 100644
27a4da
--- a/grub-core/kern/uboot/init.c
27a4da
+++ b/grub-core/kern/uboot/init.c
27a4da
@@ -43,9 +43,9 @@ extern grub_uint32_t grub_uboot_machine_type;
27a4da
 extern grub_addr_t grub_uboot_boot_data;
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc)
27a4da
 {
27a4da
-  grub_uboot_return (0);
27a4da
+  grub_uboot_return (rc < 0 ? 1 : rc);
27a4da
 }
27a4da
 
27a4da
 grub_uint32_t
27a4da
@@ -94,7 +94,7 @@ grub_machine_init (void)
27a4da
   if (!ver)
27a4da
     {
27a4da
       /* Don't even have a console to log errors to... */
27a4da
-      grub_exit ();
27a4da
+      grub_exit (-1);
27a4da
     }
27a4da
   else if (ver > API_SIG_VERSION)
27a4da
     {
27a4da
diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
27a4da
index 0559c033c..fce526d41 100644
27a4da
--- a/grub-core/kern/xen/init.c
27a4da
+++ b/grub-core/kern/xen/init.c
27a4da
@@ -549,7 +549,7 @@ grub_machine_init (void)
27a4da
 }
27a4da
 
27a4da
 void
27a4da
-grub_exit (void)
27a4da
+grub_exit (int rc __attribute__((unused)))
27a4da
 {
27a4da
   struct sched_shutdown arg;
27a4da
 
27a4da
diff --git a/include/grub/misc.h b/include/grub/misc.h
27a4da
index 342502919..c6851fb9d 100644
27a4da
--- a/include/grub/misc.h
27a4da
+++ b/include/grub/misc.h
27a4da
@@ -398,7 +398,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
27a4da
 char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
27a4da
      __attribute__ ((format (GNU_PRINTF, 1, 2))) WARN_UNUSED_RESULT;
27a4da
 char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args) WARN_UNUSED_RESULT;
27a4da
-void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
27a4da
+void EXPORT_FUNC(grub_exit) (int rc) __attribute__ ((noreturn));
27a4da
 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
27a4da
 					  grub_uint64_t d,
27a4da
 					  grub_uint64_t *r);
27a4da
-- 
27a4da
2.13.0
27a4da