File grub2-commands-introduce-read_file-subcommand.p... of Package grub2

Overview Repositories Revisions Requests Users Attributes Meta

File grub2-commands-introduce-read_file-subcommand.patch of Package grub2 (Revision 0b661fa35c0b45943c1435fd183988e7)

Currently displaying revision 0b661fa35c0b45943c1435fd183988e7 , Show latest

From: Raymund Will <rw@suse.com>
Subject: Introduce a 'read_file' sub-command.
References: bsc#892852, bsc#891946
Patch-Mainline: not yet

Needed to allow s390x-emu to be telecontrolled via LOADPARM.

v2: Added GRUB_FILE_TYPE_READ_ENVVAR as file type by read_file sub-command
tracked by verifier framework.

---
 grub-core/commands/read.c |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Index: grub-2.04~rc1/grub-core/commands/read.c
===================================================================
--- grub-2.04~rc1.orig/grub-core/commands/read.c
+++ grub-2.04~rc1/grub-core/commands/read.c
@@ -20,6 +20,7 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
+#include <grub/normal.h>
 #include <grub/env.h>
 #include <grub/term.h>
 #include <grub/types.h>
@@ -77,16 +78,49 @@ grub_cmd_read (grub_command_t cmd __attr
   return 0;
 }
 
+static grub_err_t
+grub_cmd_read_from_file (grub_command_t cmd __attribute__ ((unused)), int argc, char **args)
+{
+  char *line;
+  int i = 0;
+  grub_file_t file;
+
+  if (argc < 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("file name expected"));
+  if (argc < 2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("variable name expected"));
+  file = grub_file_open (args[i++], GRUB_FILE_TYPE_READ_ENVVAR);
+  if (! file)
+    return grub_errno;
+  while ( i < argc )
+    {
+      line = grub_file_getline (file);
+      if ( !line )
+	break;
+      grub_env_set (args[i++], line);
+      grub_free (line);
+    }
+  grub_file_close (file);
+  if (i != argc)
+    return GRUB_ERR_OUT_OF_RANGE;
+  return 0;
+}
+
 static grub_command_t cmd;
+static grub_command_t cme;
 
 GRUB_MOD_INIT(read)
 {
   cmd = grub_register_command ("read", grub_cmd_read,
 			       N_("[ENVVAR]"),
 			       N_("Set variable with user input."));
+  cme = grub_register_command ("read_file", grub_cmd_read_from_file,
+			       N_("FILE ENVVAR [...]"),
+			       N_("Set variable(s) with line(s) from FILE."));
 }
 
 GRUB_MOD_FINI(read)
 {
   grub_unregister_command (cmd);
+  grub_unregister_command (cme);
 }
Index: grub-2.04~rc1/include/grub/file.h
===================================================================
--- grub-2.04~rc1.orig/include/grub/file.h
+++ grub-2.04~rc1/include/grub/file.h
@@ -122,6 +122,7 @@ enum grub_file_type
     GRUB_FILE_TYPE_FS_SEARCH,
     GRUB_FILE_TYPE_AUDIO,
     GRUB_FILE_TYPE_VBE_DUMP,
+    GRUB_FILE_TYPE_READ_ENVVAR,
 
     GRUB_FILE_TYPE_LOADENV,
     GRUB_FILE_TYPE_SAVEENV,

Places

File grub2-commands-introduce-read_file-subcommand.patch of Package grub2 (Revision 0b661fa35c0b45943c1435fd183988e7)

Places