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

* grub-core/commands/hdparm.c (grub_cmd_hdparm): Accept device name

Browse source 
without quotes.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-08 20:12:41 +01:00
parent 71645f6ec2
commit 667478942a
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/hdparm.c (grub_cmd_hdparm): Accept device name
without quotes.
2012-02-08 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/net.c (GRUB_MOD_INIT): Don't register netfs. * grub-core/net/net.c (GRUB_MOD_INIT): Don't register netfs.

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

@ -275,19 +275,25 @@ static int get_int_arg (const struct grub_arg_list *state)
} }
static grub_err_t static grub_err_t
grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args) // state???? grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args)
{ {
struct grub_arg_list *state = ctxt->state; struct grub_arg_list *state = ctxt->state;
struct grub_ata *ata; struct grub_ata *ata;
const char *diskname;
/* Check command line. */ /* Check command line. */
if (argc != 1) if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "missing device name argument"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
if (args[0][0] == '(')
{
grub_size_t len = grub_strlen (args[0]); grub_size_t len = grub_strlen (args[0]);
if (! (args[0][0] == '(' && args[0][len - 1] == ')')) if (args[0][len - 1] == ')')
return grub_error (GRUB_ERR_BAD_ARGUMENT, "argument is not a device name");
args[0][len - 1] = 0; args[0][len - 1] = 0;
diskname = &args[0][1];
}
else
diskname = &args[0][0];
int i = 0; int i = 0;
int apm = get_int_arg (&state[i++]); int apm = get_int_arg (&state[i++]);
@ -304,7 +310,7 @@ grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args) // state????
quiet = state[i++].set; quiet = state[i++].set;
/* Open disk. */ /* Open disk. */
grub_disk_t disk = grub_disk_open (&args[0][1]); grub_disk_t disk = grub_disk_open (diskname);
if (! disk) if (! disk)
return grub_errno; return grub_errno;