vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/commands/xnu_uuid.c (grub_cmd_xnu_uuid): Support

Browse source 
-l argument. Add newline at the end if printing.
	(GRUB_MOD_INIT): Document -l.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-10-27 02:55:07 +02:00
parent 52a050751b
commit 8e32442e80
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2011-10-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/xnu_uuid.c (grub_cmd_xnu_uuid): Support
-l argument. Add newline at the end if printing.
(GRUB_MOD_INIT): Document -l.
2011-10-26 Vladimir Serbinenko <phcoder@gmail.com> 2011-10-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/nilfs2.c (grub_nilfs2_uuid): Add missing field length. * grub-core/fs/nilfs2.c (grub_nilfs2_uuid): Add missing field length.

16
grub-core/commands/xnu_uuid.c
View file

@ -51,10 +51,18 @@ grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
char uuid_string[sizeof ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")]; char uuid_string[sizeof ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")];
char *ptr; char *ptr;
grub_uint8_t ctx[GRUB_MD_MD5->contextsize]; grub_uint8_t ctx[GRUB_MD_MD5->contextsize];
int low = 0;
if (argc < 1) if (argc < 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "UUID required"); return grub_error (GRUB_ERR_BAD_ARGUMENT, "UUID required");
if (argc > 1 && grub_strcmp (args[0], "-l") == 0)
{
low = 1;
argc--;
args++;
}
serial = grub_cpu_to_be64 (grub_strtoull (args[0], 0, 16)); serial = grub_cpu_to_be64 (grub_strtoull (args[0], 0, 16));
GRUB_MD_MD5->init (&ctx); GRUB_MD_MD5->init (&ctx);
@ -75,10 +83,11 @@ grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
(unsigned int) xnu_uuid[10], (unsigned int) xnu_uuid[11], (unsigned int) xnu_uuid[10], (unsigned int) xnu_uuid[11],
(unsigned int) xnu_uuid[12], (unsigned int) xnu_uuid[13], (unsigned int) xnu_uuid[12], (unsigned int) xnu_uuid[13],
(unsigned int) xnu_uuid[14], (unsigned int) xnu_uuid[15]); (unsigned int) xnu_uuid[14], (unsigned int) xnu_uuid[15]);
if (!low)
for (ptr = uuid_string; *ptr; ptr++) for (ptr = uuid_string; *ptr; ptr++)
*ptr = grub_toupper (*ptr); *ptr = grub_toupper (*ptr);
if (argc == 1) if (argc == 1)
grub_printf ("%s", uuid_string); grub_printf ("%s\n", uuid_string);
if (argc > 1) if (argc > 1)
grub_env_set (args[1], uuid_string); grub_env_set (args[1], uuid_string);
@ -91,9 +100,10 @@ static grub_command_t cmd;
GRUB_MOD_INIT (xnu_uuid) GRUB_MOD_INIT (xnu_uuid)
{ {
cmd = grub_register_command ("xnu_uuid", grub_cmd_xnu_uuid, cmd = grub_register_command ("xnu_uuid", grub_cmd_xnu_uuid,
N_("GRUBUUID [VARNAME]"), N_("[-l] GRUBUUID [VARNAME]"),
N_("Transform 64-bit UUID to format " N_("Transform 64-bit UUID to format "
"suitable for XNU.")); "suitable for XNU. If -l is given keep "
"it lowercase as done by blkid."));
} }
GRUB_MOD_FINI (xnu_uuid) GRUB_MOD_FINI (xnu_uuid)