* include/grub/command.h (GRUB_COMMAND_FLAG_CMDLINE): Removed. All

	users updated.
	(GRUB_COMMAND_FLAG_MENU): Likewise.
	(GRUB_COMMAND_FLAG_BOTH): Likewise.
	(GRUB_COMMAND_FLAG_TITLE): Removed.
	(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
	(GRUB_COMMAND_FLAG_EXTCMD): Moved into enum.
	(GRUB_COMMAND_FLAG_DYNCMD): Likewise.
	(GRUB_COMMAND_FLAG_BLOCKS): Likewise.
	(grub_command_flags_t): New enum. All users updated.

diff --git a/ChangeLog b/ChangeLog
index 8b8f7db267a77381728a36f2404d7b16bbdb9085..4bb294fabe51d1890bc1047ae0070355fbc0e062 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/command.h (GRUB_COMMAND_FLAG_CMDLINE): Removed. All
+       users updated.
+       (GRUB_COMMAND_FLAG_MENU): Likewise.
+       (GRUB_COMMAND_FLAG_BOTH): Likewise.
+       (GRUB_COMMAND_FLAG_TITLE): Removed.
+       (GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
+       (GRUB_COMMAND_FLAG_EXTCMD): Moved into enum.
+       (GRUB_COMMAND_FLAG_DYNCMD): Likewise.
+       (GRUB_COMMAND_FLAG_BLOCKS): Likewise.
+       (grub_command_flags_t): New enum. All users updated.
+
 2010-09-14  Seth Goldberg <seth.goldberg@oracle.com>
 
        Fix solaris compilation.

diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
index 9d5e93495b95398057483b2bbb8b02c3885eea1e..931b2e39ddf2b12fbb39b793134748569c8fb783 100644 (file)
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -758,8 +758,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(acpi)
 {
-  cmd = grub_register_extcmd ("acpi", grub_cmd_acpi,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("acpi", grub_cmd_acpi, 0,
                              N_("[-1|-2] [--exclude=TABLE1,TABLE2|"
                              "--load-only=table1,table2] FILE1"
                              " [FILE2] [...]"),

diff --git a/grub-core/commands/cat.c b/grub-core/commands/cat.c
index 68ca83c5dd50a781447fe8282ca230a3431afa4b..f3d08e960518db293691652814d8b6f45113fcb6 100644 (file)
--- a/grub-core/commands/cat.c
+++ b/grub-core/commands/cat.c
@@ -91,7 +91,7 @@ static grub_extcmd_t cmd;
 \f
 GRUB_MOD_INIT(cat)
 {
-  cmd = grub_register_extcmd ("cat", grub_cmd_cat, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("cat", grub_cmd_cat, 0,
                              N_("FILE"), N_("Show the contents of a file."),
                              options);
 }

diff --git a/grub-core/commands/echo.c b/grub-core/commands/echo.c
index 6bc00eae877e9f73585702f4365ca6ff8113111e..6d69bc3f08115cc2bab269b8f3e9bf089d5a41a0 100644 (file)
--- a/grub-core/commands/echo.c
+++ b/grub-core/commands/echo.c
@@ -113,7 +113,7 @@ static grub_extcmd_t cmd;
 \f
 GRUB_MOD_INIT(echo)
 {
-  cmd = grub_register_extcmd ("echo", grub_cmd_echo, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("echo", grub_cmd_echo, 0,
                              N_("[-e|-n] STRING"), N_("Display a line of text."),
                              options);
 }

diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c
index 44a4b6cfd64b69680e90588f581ebd6f391b055d..e9274fbab412ea9b12cdcc4c958db4c2d2ee5895 100644 (file)
--- a/grub-core/commands/extcmd.c
+++ b/grub-core/commands/extcmd.c
@@ -66,7 +66,7 @@ grub_extcmd_dispatch (struct grub_command *cmd, int argc, char **args)
 
 grub_extcmd_t
 grub_register_extcmd_prio (const char *name, grub_extcmd_func_t func,
-                          unsigned flags, const char *summary,
+                          grub_command_flags_t flags, const char *summary,
                           const char *description,
                           const struct grub_arg_option *parser,
                           int prio)
@@ -99,7 +99,7 @@ grub_register_extcmd_prio (const char *name, grub_extcmd_func_t func,
 
 grub_extcmd_t
 grub_register_extcmd (const char *name, grub_extcmd_func_t func,
-                     unsigned flags, const char *summary,
+                     grub_command_flags_t flags, const char *summary,
                      const char *description,
                      const struct grub_arg_option *parser)
 {

diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c
index 6f65b4ab3d3f38569c2ad0d8f207d1ae9d938ddb..e926c043527e4eb970a0df8264cd97d5afec3b5b 100644 (file)
--- a/grub-core/commands/hashsum.c
+++ b/grub-core/commands/hashsum.c
@@ -252,26 +252,22 @@ static grub_extcmd_t cmd, cmd_md5, cmd_sha256, cmd_sha512;
 
 GRUB_MOD_INIT(hashsum)
 {
-  cmd = grub_register_extcmd ("hashsum", grub_cmd_hashsum,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("hashsum", grub_cmd_hashsum, 0,
                              "hashsum -h HASH [-c FILE [-p PREFIX]] "
                              "[FILE1 [FILE2 ...]]",
                              "Compute or check hash checksum.",
                              options);
-  cmd_md5 = grub_register_extcmd ("md5sum", grub_cmd_hashsum,
-                                 GRUB_COMMAND_FLAG_BOTH,
+  cmd_md5 = grub_register_extcmd ("md5sum", grub_cmd_hashsum, 0,
                                  N_("[-c FILE [-p PREFIX]] "
                                     "[FILE1 [FILE2 ...]]"),
                                  N_("Compute or check hash checksum."),
                                  options);
-  cmd_sha256 = grub_register_extcmd ("sha256sum", grub_cmd_hashsum,
-                                    GRUB_COMMAND_FLAG_BOTH,
+  cmd_sha256 = grub_register_extcmd ("sha256sum", grub_cmd_hashsum, 0,
                                     N_("[-c FILE [-p PREFIX]] "
                                        "[FILE1 [FILE2 ...]]"),
                                     "Compute or check hash checksum.",
                                     options);
-  cmd_sha512 = grub_register_extcmd ("sha512sum", grub_cmd_hashsum,
-                                    GRUB_COMMAND_FLAG_BOTH,
+  cmd_sha512 = grub_register_extcmd ("sha512sum", grub_cmd_hashsum, 0,
                                     N_("[-c FILE [-p PREFIX]] "
                                        "[FILE1 [FILE2 ...]]"),
                                     N_("Compute or check hash checksum."),

diff --git a/grub-core/commands/hdparm.c b/grub-core/commands/hdparm.c
index 54724077d8a5e1ae768ee52a3632d50c5f8b418f..b6ab7875516c24b12a16ccdfd0df94e4728bce18 100644 (file)
--- a/grub-core/commands/hdparm.c
+++ b/grub-core/commands/hdparm.c
@@ -409,8 +409,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(hdparm)
 {
-  cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm, 0,
                              N_("[OPTIONS] DISK"),
                              N_("Get/set ATA disk parameters."), options);
 }

diff --git a/grub-core/commands/help.c b/grub-core/commands/help.c
index 1ca46aa7e5cb34e446aa500d311ba7ceabf07858..ff6d7ed2e783e2e85e87a4bf037237f46850ddbb 100644 (file)
--- a/grub-core/commands/help.c
+++ b/grub-core/commands/help.c
@@ -38,8 +38,7 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
       grub_command_t cmd;
       FOR_COMMANDS(cmd)
       {
-       if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE) &&
-           (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE))
+       if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE))
          {
            struct grub_term_output *term;
            const char *summary_translated = _(cmd->summary);
@@ -131,8 +130,7 @@ static grub_extcmd_t cmd;
 \f
 GRUB_MOD_INIT(help)
 {
-  cmd = grub_register_extcmd ("help", grub_cmd_help,
-                             GRUB_COMMAND_FLAG_CMDLINE,
+  cmd = grub_register_extcmd ("help", grub_cmd_help, 0,
                              N_("[PATTERN ...]"),
                              N_("Show a help message."), 0);
 }

diff --git a/grub-core/commands/hexdump.c b/grub-core/commands/hexdump.c
index 08a94eb64b702050584b8000373bca27196f2817..629f2a0695d0d75cf5ef45b47789a7b2cf7b3042 100644 (file)
--- a/grub-core/commands/hexdump.c
+++ b/grub-core/commands/hexdump.c
@@ -119,8 +119,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT (hexdump)
 {
-  cmd = grub_register_extcmd ("hexdump", grub_cmd_hexdump,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("hexdump", grub_cmd_hexdump, 0,
                              N_("[OPTIONS] FILE_OR_DEVICE"),
                              N_("Dump the contents of a file or memory."),
                              options);

diff --git a/grub-core/commands/i386/cpuid.c b/grub-core/commands/i386/cpuid.c
index 412b284d08d7d947c271cd91e08b86092a41f010..f5f0f15a8c73a9f8aa0185301af3e7ee3457146b 100644 (file)
--- a/grub-core/commands/i386/cpuid.c
+++ b/grub-core/commands/i386/cpuid.c
@@ -88,7 +88,7 @@ GRUB_MOD_INIT(cpuid)
 done:
 #endif
 
-  cmd = grub_register_extcmd ("cpuid", grub_cmd_cpuid, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("cpuid", grub_cmd_cpuid, 0,
                              "[-l]", N_("Check for CPU features."), options);
 }
 

diff --git a/grub-core/commands/i386/pc/drivemap.c b/grub-core/commands/i386/pc/drivemap.c
index 7ecfe745493a502c00989b621ec959958310f2a0..d4871de52fb412c86f166589770b59f00c411cc1 100644 (file)
--- a/grub-core/commands/i386/pc/drivemap.c
+++ b/grub-core/commands/i386/pc/drivemap.c
@@ -401,8 +401,7 @@ GRUB_MOD_INIT (drivemap)
 {
   grub_get_root_biosnumber_saved = grub_get_root_biosnumber;
   grub_get_root_biosnumber = grub_get_root_biosnumber_drivemap;
-  cmd = grub_register_extcmd ("drivemap", grub_cmd_drivemap,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("drivemap", grub_cmd_drivemap, 0,
                              N_("-l | -r | [-s] grubdev osdisk."),
                              N_("Manage the BIOS drive mappings."),
                              options);

diff --git a/grub-core/commands/i386/pc/halt.c b/grub-core/commands/i386/pc/halt.c
index 44a88bb0539180bf1862055f6d5bf89902399f8b..81eb6a1bb0fcb8d8de1912d6fa9554a2a8d49b8d 100644 (file)
--- a/grub-core/commands/i386/pc/halt.c
+++ b/grub-core/commands/i386/pc/halt.c
@@ -114,8 +114,7 @@ static grub_extcmd_t cmd;
 \f
 GRUB_MOD_INIT(halt)
 {
-  cmd = grub_register_extcmd ("halt", grub_cmd_halt, GRUB_COMMAND_FLAG_BOTH,
-                             "[-n]",
+  cmd = grub_register_extcmd ("halt", grub_cmd_halt, 0, "[-n]",
                              N_("Halt the system, if possible using APM."),
                              options);
 }

diff --git a/grub-core/commands/i386/pc/sendkey.c b/grub-core/commands/i386/pc/sendkey.c
index 1f506b3cdd702d3c121d2218e6835969cee3ac76..c777ea60ac76be4ea31c41382e75b02982dd84a3 100644 (file)
--- a/grub-core/commands/i386/pc/sendkey.c
+++ b/grub-core/commands/i386/pc/sendkey.c
@@ -366,8 +366,7 @@ static void *preboot_hook;
 
 GRUB_MOD_INIT (sendkey)
 {
-  cmd = grub_register_extcmd ("sendkey", grub_cmd_sendkey, 
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("sendkey", grub_cmd_sendkey, 0,
                              "sendkey [KEYSTROKE1] [KEYSTROKE2] ...",
                              "Emulate a keystroke", options);
 

diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
index 5157ebd4c479ba06960ec5cefd8ae5987770a358..20d203e9222c4734dae353bde567bc0398064e36 100644 (file)
--- a/grub-core/commands/iorw.c
+++ b/grub-core/commands/iorw.c
@@ -117,13 +117,13 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
 GRUB_MOD_INIT(memrw)
 {
   cmd_read_byte =
-    grub_register_extcmd ("inb", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("inb", grub_cmd_read, 0,
                          N_("PORT"), N_("Read byte from PORT."), options);
   cmd_read_word =
-    grub_register_extcmd ("inw", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("inw", grub_cmd_read, 0,
                          N_("PORT"), N_("Read word from PORT."), options);
   cmd_read_dword =
-    grub_register_extcmd ("inl", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("inl", grub_cmd_read, 0,
                          N_("PORT"), N_("Read dword from PORT."), options);
   cmd_write_byte =
     grub_register_command ("outb", grub_cmd_write,

diff --git a/grub-core/commands/keystatus.c b/grub-core/commands/keystatus.c
index c83c00560e258cf986ca1a8697a1af85ac88c386..64e5a08d752d805becbc5ec3a37e498a53dcea0d 100644 (file)
--- a/grub-core/commands/keystatus.c
+++ b/grub-core/commands/keystatus.c
@@ -80,8 +80,7 @@ static grub_extcmd_t cmd;
 \f
 GRUB_MOD_INIT(keystatus)
 {
-  cmd = grub_register_extcmd ("keystatus", grub_cmd_keystatus,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("keystatus", grub_cmd_keystatus, 0,
                              N_("[--shift] [--ctrl] [--alt]"),
                              N_("Check key modifier status."),
                              options);

diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index 9a1873ba9c1745f98a48d575ef65c20362c9b005..38b3a84c673dd88aa800cd987b1e6f8dcb9c1ccb 100644 (file)
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -375,20 +375,15 @@ static grub_extcmd_t cmd_load, cmd_list, cmd_save;
 GRUB_MOD_INIT(loadenv)
 {
   cmd_load =
-    grub_register_extcmd ("load_env", grub_cmd_load_env,
-                         GRUB_COMMAND_FLAG_BOTH,
-                         N_("[-f FILE]"),
+    grub_register_extcmd ("load_env", grub_cmd_load_env, 0, N_("[-f FILE]"),
                          N_("Load variables from environment block file."),
                          options);
   cmd_list =
-    grub_register_extcmd ("list_env", grub_cmd_list_env,
-                         GRUB_COMMAND_FLAG_BOTH,
-                         N_("[-f FILE]"),
+    grub_register_extcmd ("list_env", grub_cmd_list_env, 0, N_("[-f FILE]"),
                          N_("List variables from environment block file."),
                          options);
   cmd_save =
-    grub_register_extcmd ("save_env", grub_cmd_save_env,
-                         GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("save_env", grub_cmd_save_env, 0,
                          N_("[-f FILE] variable_name [...]"),
                          N_("Save variables to environment block file."),
                          options);

diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index ed8afd4ae123bd049acd14146f5209f221ca2095..3bd6607be2cebe23b0ea64f560f9c178185b9a5b 100644 (file)
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -269,7 +269,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(ls)
 {
-  cmd = grub_register_extcmd ("ls", grub_cmd_ls, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("ls", grub_cmd_ls, 0,
                              N_("[-l|-h|-a] [FILE]"),
                              N_("List devices and files."), options);
 }

diff --git a/grub-core/commands/lsacpi.c b/grub-core/commands/lsacpi.c
index 149de6b79fbd5369d7d05c9582f8897085cb5060..64b5596651f66f5f3d6855b8cc688a4ca92ca1a8 100644 (file)
--- a/grub-core/commands/lsacpi.c
+++ b/grub-core/commands/lsacpi.c
@@ -238,8 +238,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(lsapi)
 {
-  cmd = grub_register_extcmd ("lsacpi", grub_cmd_lsacpi, GRUB_COMMAND_FLAG_BOTH,
-                             N_("[-1|-2]"),
+  cmd = grub_register_extcmd ("lsacpi", grub_cmd_lsacpi, 0, N_("[-1|-2]"),
                              N_("Show ACPI information."), options);
 }
 

diff --git a/grub-core/commands/lspci.c b/grub-core/commands/lspci.c
index bc52e060a6228d9fb2ff44d418981cc105a9cccf..fd2d4eaf22b4c4525329ec6921d95606e3c55328 100644 (file)
--- a/grub-core/commands/lspci.c
+++ b/grub-core/commands/lspci.c
@@ -224,8 +224,8 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(lspci)
 {
-  cmd = grub_register_extcmd ("lspci", grub_cmd_lspci, GRUB_COMMAND_FLAG_BOTH,
-                             "[-i]", N_("List PCI devices."), options);
+  cmd = grub_register_extcmd ("lspci", grub_cmd_lspci, 0, "[-i]",
+                             N_("List PCI devices."), options);
 }
 
 GRUB_MOD_FINI(lspci)

diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
index d28f45ec1e6ddf0623fea27b2542ad3955a1a841..28aac7d811cedd77d42460a5992cafe690e7c02f 100644 (file)
--- a/grub-core/commands/memrw.c
+++ b/grub-core/commands/memrw.c
@@ -119,13 +119,13 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
 GRUB_MOD_INIT(memrw)
 {
   cmd_read_byte =
-    grub_register_extcmd ("read_byte", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("read_byte", grub_cmd_read, 0,
                          N_("ADDR"), N_("Read byte from ADDR."), options);
   cmd_read_word =
-    grub_register_extcmd ("read_word", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("read_word", grub_cmd_read, 0,
                          N_("ADDR"), N_("Read word from ADDR."), options);
   cmd_read_dword =
-    grub_register_extcmd ("read_dword", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("read_dword", grub_cmd_read, 0,
                          N_("ADDR"), N_("Read dword from ADDR."), options);
   cmd_write_byte =
     grub_register_command ("write_byte", grub_cmd_write,

diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index c28c6ef6fd723a9a533174b91d32dc871d684064..9c4139d7de50f430533333f48d33ad1000a5559c 100644 (file)
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -274,7 +274,7 @@ void
 grub_menu_init (void)
 {
   cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
-                             GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
+                             GRUB_COMMAND_FLAG_BLOCKS,
                              N_("BLOCK"), N_("Define a menuentry."), options);
 }
 

diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c
index f3941e0295daba42d2d0f0cb7d6a2daa740f4a07..abe84895d91136bc1a75dc3d28e52799dc373499 100644 (file)
--- a/grub-core/commands/probe.c
+++ b/grub-core/commands/probe.c
@@ -150,8 +150,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT (probe)
 {
-  cmd = grub_register_extcmd ("probe", grub_cmd_probe, GRUB_COMMAND_FLAG_BOTH,
-                             N_("[DEVICE]"),
+  cmd = grub_register_extcmd ("probe", grub_cmd_probe, 0, N_("[DEVICE]"),
                              N_("Retrieve device info."), options);
 }
 

diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
index 4329483af2a52ed60afa1e3b9ff48bc9765134e7..f27a147afe483e5bd538b7c137190a7abaa8ab01 100644 (file)
--- a/grub-core/commands/regexp.c
+++ b/grub-core/commands/regexp.c
@@ -136,8 +136,7 @@ static grub_extcmd_t cmd;
 \f
 GRUB_MOD_INIT(regexp)
 {
-  cmd = grub_register_extcmd ("regexp", grub_cmd_regexp,
-                             GRUB_COMMAND_FLAG_BOTH, N_("REGEXP STRING"),
+  cmd = grub_register_extcmd ("regexp", grub_cmd_regexp, 0, N_("REGEXP STRING"),
                              N_("Test if REGEXP matches STRING."), options);
 
   /* Setup GRUB script wildcard translator.  */

diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
index 61eb7820365c3b8ada44b8819125b97452ce0376..402421f652b070735c62fa3d9ad1a4acc23f4a23 100644 (file)
--- a/grub-core/commands/search_wrap.c
+++ b/grub-core/commands/search_wrap.c
@@ -90,8 +90,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(search)
 {
   cmd =
-    grub_register_extcmd ("search", grub_cmd_search,
-                         GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("search", grub_cmd_search, 0,
                          N_("[-f|-l|-u|-s|-n] [--hint HINT [--hint HINT] ...]"
                             " NAME"),
                          N_("Search devices by file, filesystem label"

diff --git a/grub-core/commands/setpci.c b/grub-core/commands/setpci.c
index 5e947cd7d82de6b311372c597168873d04fcb38e..7b194ed173d15635921c39de819a8cbe469ab69d 100644 (file)
--- a/grub-core/commands/setpci.c
+++ b/grub-core/commands/setpci.c
@@ -329,7 +329,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(setpci)
 {
-  cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, 0,
                              N_("[-s POSITION] [-d DEVICE] [-v VAR] "
                                 "[REGISTER][=VALUE[:MASK]]"),
                              N_("Manipulate PCI devices."), options);

diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c
index ee0875cf76756be6d7aefd477dff8bf936e88821..da99375484a24f8deb6cb6cd1615b16377775dc6 100644 (file)
--- a/grub-core/commands/sleep.c
+++ b/grub-core/commands/sleep.c
@@ -101,7 +101,7 @@ static grub_extcmd_t cmd;
 \f
 GRUB_MOD_INIT(sleep)
 {
-  cmd = grub_register_extcmd ("sleep", grub_cmd_sleep, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("sleep", grub_cmd_sleep, 0,
                              N_("NUMBER_OF_SECONDS"),
                              N_("Wait for a specified number of seconds."),
                              options);

diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
index c8ee52580a0b847b436922b2dd35bd95715ef272..ae4cb9a9c0bbaab7121b7df8ebc0d9da72b9b039 100644 (file)
--- a/grub-core/disk/loopback.c
+++ b/grub-core/disk/loopback.c
@@ -221,8 +221,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(loopback)
 {
-  cmd = grub_register_extcmd ("loopback", grub_cmd_loopback,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("loopback", grub_cmd_loopback, 0,
                              N_("[-d|-p] DEVICENAME FILE."),
                              N_("Make a device of a file."), options);
   grub_disk_dev_register (&grub_loopback_dev);

diff --git a/grub-core/hello/hello.c b/grub-core/hello/hello.c
index 183ee7798837e4bccb6b855a90a8e871a9ae1558..77c4c96b1f110b475ade66511fd2cb188bd92a68 100644 (file)
--- a/grub-core/hello/hello.c
+++ b/grub-core/hello/hello.c
@@ -39,8 +39,8 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(hello)
 {
-  cmd = grub_register_extcmd ("hello", grub_cmd_hello, GRUB_COMMAND_FLAG_BOTH,
-                             0, N_("Say \"Hello World\"."), 0);
+  cmd = grub_register_extcmd ("hello", grub_cmd_hello, 0, 0,
+                             N_("Say \"Hello World\"."), 0);
 }
 
 GRUB_MOD_FINI(hello)

diff --git a/grub-core/kern/command.c b/grub-core/kern/command.c
index 477240d5706655a641c1b1ddd24c7bc7dd61a6e1..7f353b6532e0de0bb22b9654a330131cd182317e 100644 (file)
--- a/grub-core/kern/command.c
+++ b/grub-core/kern/command.c
@@ -40,7 +40,7 @@ grub_register_command_prio (const char *name,
   cmd->summary = (summary) ? summary : "";
   cmd->description = description;
 
-  cmd->flags = GRUB_COMMAND_FLAG_BOTH;
+  cmd->flags = 0;
   cmd->prio = prio;
 
   grub_prio_list_insert (GRUB_AS_PRIO_LIST_P (&grub_command_list),

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 2e92bc42f6a3e2de7b77baf4d99ec4736341ae40..16dfc731c1e49a36f0cdeb49aaa6f649b93f57d7 100644 (file)
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1942,16 +1942,13 @@ GRUB_MOD_INIT (bsd)
   /* Net and OpenBSD kernels are often compressed.  */
   grub_dl_load ("gzio");
 
-  cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd,
-                                     GRUB_COMMAND_FLAG_BOTH,
+  cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd, 0,
                                      N_("FILE"), N_("Load kernel of FreeBSD."),
                                      freebsd_opts);
-  cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd,
-                                     GRUB_COMMAND_FLAG_BOTH,
+  cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd, 0,
                                      N_("FILE"), N_("Load kernel of OpenBSD."),
                                      openbsd_opts);
-  cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,
-                                    GRUB_COMMAND_FLAG_BOTH,
+  cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,  0,
                                     N_("FILE"), N_("Load kernel of NetBSD."),
                                     netbsd_opts);
   cmd_freebsd_loadenv =

diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
index ece65611adaa9308bfda63a5f43f2306b62803a4..d0b32dc6f28c571bb8e650ebb7834a25dcf069b7 100644 (file)
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -1434,8 +1434,7 @@ GRUB_MOD_INIT(xnu)
                                       "Load XNU ramdisk. "
                                       "It will be seen as md0.");
   cmd_splash = grub_register_extcmd ("xnu_splash",
-                                    grub_cmd_xnu_splash,
-                                    GRUB_COMMAND_FLAG_BOTH, 0,
+                                    grub_cmd_xnu_splash, 0, 0,
                                     N_("Load a splash image for XNU."),
                                     xnu_splash_cmd_options);
 

diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index f19919d1d63e1c1f2bdd3b95c85dd89a4ae5f3cc..197cb1145f2b46a0415ce66de6f1640d4a498752 100644 (file)
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -429,11 +429,8 @@ grub_normal_do_completion (char *buf, int *restore,
       {
        if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
          {
-           if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
-             {
-               if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
-                 goto fail;
-             }
+           if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
+             goto fail;
          }
       }
     }

diff --git a/grub-core/normal/dyncmd.c b/grub-core/normal/dyncmd.c
index 3519253f612417127beaa0d13ef459a8fe219f8e..ed98855eb18b885dc0e3f32befc8a1c885553ac8 100644 (file)
--- a/grub-core/normal/dyncmd.c
+++ b/grub-core/normal/dyncmd.c
@@ -155,7 +155,6 @@ read_command_list (const char *prefix)
                                                   grub_dyncmd_dispatcher,
                                                   GRUB_COMMAND_FLAG_BLOCKS
                                                   | GRUB_COMMAND_FLAG_EXTCMD
-                                                  | GRUB_COMMAND_FLAG_CMDLINE
                                                   | GRUB_COMMAND_FLAG_DYNCMD,
                                                   0, N_("not loaded"), 0,
                                                   prio);

diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
index 3616eb453c23e76fb693d044e4cbc6451a516af9..9a10d47b0b96fbc2c083908fb195134f81a3f728 100644 (file)
--- a/grub-core/term/gfxterm.c
+++ b/grub-core/term/gfxterm.c
@@ -1207,8 +1207,7 @@ GRUB_MOD_INIT(gfxterm)
   grub_term_register_output ("gfxterm", &grub_video_term);
   background_image_cmd_handle =
     grub_register_extcmd ("background_image",
-                          grub_gfxterm_background_image_cmd,
-                          GRUB_COMMAND_FLAG_BOTH,
+                          grub_gfxterm_background_image_cmd, 0,
                           N_("[-m (stretch|normal)] FILE"),
                           N_("Load background image for active terminal."),
                           background_image_cmd_options);

diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c
index 394fc1576ec1ff5e47ec6a88d0a2ca39cc1a98c9..6c8a872250d5e069e4de33fcd7278e7068a39ac2 100644 (file)
--- a/grub-core/term/serial.c
+++ b/grub-core/term/serial.c
@@ -341,8 +341,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(serial)
 {
-  cmd = grub_register_extcmd ("serial", grub_cmd_serial,
-                             GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("serial", grub_cmd_serial, 0,
                              N_("[OPTIONS...]"),
                              N_("Configure serial port."), options);
 #ifndef GRUB_MACHINE_EMU

diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c
index 82bf372c0ec7363cdadfd0e9c60b1055ec726162..521f4ad226db0418f66e0c6f18893bfd79fe356e 100644 (file)
--- a/grub-core/tests/lib/functional_test.c
+++ b/grub-core/tests/lib/functional_test.c
@@ -37,8 +37,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT (functional_test)
 {
-  cmd = grub_register_extcmd ("functional_test", grub_functional_test,
-                             GRUB_COMMAND_FLAG_CMDLINE, 0,
+  cmd = grub_register_extcmd ("functional_test", grub_functional_test, 0, 0,
                              "Run all functional tests.", 0);
 }
 

diff --git a/grub-core/tests/test_blockarg.c b/grub-core/tests/test_blockarg.c
index bb6f3c3f0739a582b6b2ad91ac4ea8a4e2758fd5..41460fb7e1c80360bfeb58a6b7477d06a7a37cab 100644 (file)
--- a/grub-core/tests/test_blockarg.c
+++ b/grub-core/tests/test_blockarg.c
@@ -40,7 +40,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(test_blockarg)
 {
   cmd = grub_register_extcmd ("test_blockarg", test_blockarg,
-                             GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
+                             GRUB_COMMAND_FLAG_BLOCKS,
                              N_("BLOCK"),
                              N_("Print and execute block argument."), 0);
 }

diff --git a/include/grub/command.h b/include/grub/command.h
index 599b994374d6fe811df1425ad642b00f84a6027f..31b6395481114f751bb9a9d8ff9d921b077fd378 100644 (file)
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -23,22 +23,15 @@
 #include <grub/err.h>
 #include <grub/list.h>
 
-/* Can be run in the command-line.  */
-#define GRUB_COMMAND_FLAG_CMDLINE      0x1
-/* Can be run in the menu.  */
-#define GRUB_COMMAND_FLAG_MENU         0x2
-/* Can be run in both interfaces.  */
-#define GRUB_COMMAND_FLAG_BOTH         0x3
-/* Only for the command title.  */
-#define GRUB_COMMAND_FLAG_TITLE                0x4
-/* Don't print the command on booting.  */
-#define GRUB_COMMAND_FLAG_NO_ECHO      0x8
-/* This is an extended command.  */
-#define GRUB_COMMAND_FLAG_EXTCMD       0x10
-/* This is an dynamic command.  */
-#define GRUB_COMMAND_FLAG_DYNCMD       0x20
-/* This command accepts block arguments.  */
-#define GRUB_COMMAND_FLAG_BLOCKS       0x40
+typedef enum grub_command_flags
+  {
+    /* This is an extended command.  */
+    GRUB_COMMAND_FLAG_EXTCMD = 0x10,
+    /* This is an dynamic command.  */
+    GRUB_COMMAND_FLAG_DYNCMD = 0x20,
+    /* This command accepts block arguments.  */
+    GRUB_COMMAND_FLAG_BLOCKS = 0x40
+  } grub_command_flags_t;
 
 struct grub_command;
 
@@ -61,7 +54,7 @@ struct grub_command
   grub_command_func_t func;
 
   /* The flags.  */
-  unsigned flags;
+  grub_command_flags_t flags;
 
   /* The summary of the command usage.  */
   const char *summary;

diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h
index 773e47854e25a69b63f3e68973d8cd4780727475..c34a1df665014e597b1c89c95dd396c26ef2d856 100644 (file)
--- a/include/grub/extcmd.h
+++ b/include/grub/extcmd.h
@@ -57,14 +57,14 @@ typedef struct grub_extcmd_context *grub_extcmd_context_t;
 
 grub_extcmd_t grub_register_extcmd (const char *name,
                                    grub_extcmd_func_t func,
-                                   unsigned flags,
+                                   grub_command_flags_t flags,
                                    const char *summary,
                                    const char *description,
                                    const struct grub_arg_option *parser);
 
 grub_extcmd_t grub_register_extcmd_prio (const char *name,
                                         grub_extcmd_func_t func,
-                                        unsigned flags,
+                                        grub_command_flags_t flags,
                                         const char *summary,
                                         const char *description,
                                         const struct grub_arg_option *parser,