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

remove all trailing whitespace

Browse source
This commit is contained in:
fzielcke 2009-06-10 21:04:23 +00:00
parent d2d4966571
commit b39f9d20a9
222 changed files with 3286 additions and 3286 deletions
Download patch file Download diff file Expand all files Collapse all files

38
normal/cmdline.c
View file

@ -72,7 +72,7 @@ grub_set_history (int newsize)
/* Copy the older part. */
grub_memmove (hist_lines, old_hist_lines + hist_pos,
(hist_size - hist_pos) * sizeof (char *));
/* Copy the newer part. */
grub_memmove (hist_lines + hist_size - hist_pos, old_hist_lines,
hist_end * sizeof (char *));
@ -162,7 +162,7 @@ print_completion (const char *item, grub_completion_type_t type, int count)
what = "things";
break;
}
grub_printf ("\nPossible %s are:\n", what);
}
@ -199,10 +199,10 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
xpos = (plen + lpos) % 79;
ypos = ystart + (plen + lpos) / 79;
grub_gotoxy (xpos, ypos);
grub_refresh ();
}
void cl_print (int pos, int c)
{
char *p;
@ -212,7 +212,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
if (xpos++ > 78)
{
grub_putchar ('\n');
xpos = 1;
if (ypos == (unsigned) (grub_getxy () & 0xFF))
ystart--;
@ -226,7 +226,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
grub_putchar (*p);
}
}
void cl_insert (const char *str)
{
grub_size_t len = grub_strlen (str);
@ -241,7 +241,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
cl_print (lpos - len, echo_char);
cl_set_pos ();
}
grub_refresh ();
}
@ -256,28 +256,28 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
cl_print (lpos, ' ');
lpos = saved_lpos;
cl_set_pos ();
grub_memmove (buf + lpos, buf + lpos + len, llen - lpos + 1);
llen -= len;
cl_print (lpos, echo_char);
cl_set_pos ();
}
grub_refresh ();
}
plen = grub_strlen (prompt);
lpos = llen = 0;
buf[0] = '\0';
if ((grub_getxy () >> 8) != 0)
grub_putchar ('\n');
grub_printf (prompt);
xpos = plen;
ystart = ypos = (grub_getxy () & 0xFF);
cl_insert (cmdline);
if (hist_used == 0)
@ -319,18 +319,18 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
{
char *insert;
int restore;
/* Backup the next character and make it 0 so it will
be easy to use string functions. */
char backup = buf[lpos];
buf[lpos] = '\0';
insert = grub_normal_do_completion (buf, &restore,
print_completion);
/* Restore the original string. */
buf[lpos] = backup;
if (restore)
{
/* Restore the prompt. */
@ -401,7 +401,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
if (lpos > 0)
{
grub_size_t n = lpos;
if (kill_buf)
grub_free (kill_buf);
@ -440,7 +440,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
else
break;
/* fall through */
case 4: /* Ctrl-d */
if (lpos < llen)
cl_delete (1);
@ -474,7 +474,7 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
grub_history_replace (histpos, buf);
grub_history_add ("");
}
grub_memcpy (cmdline, buf + lpos, llen - lpos + 1);
return 1;

52
normal/completion.c
View file

@ -69,7 +69,7 @@ add_completion (const char *completion, const char *extra,
case 2:
if (print_func)
print_func (match, type, 0);
/* Fall through. */
default:
@ -79,7 +79,7 @@ add_completion (const char *completion, const char *extra,
if (print_func)
print_func (completion, type, num_found - 1);
/* Detect the matched portion. */
while (*s && *t && *s == *t)
{
@ -92,7 +92,7 @@ add_completion (const char *completion, const char *extra,
break;
}
}
return 0;
}
@ -103,7 +103,7 @@ iterate_partition (grub_disk_t disk, const grub_partition_t p)
char *partition_name = grub_partition_get_name (p);
char *name;
int ret;
if (! partition_name)
return 1;
@ -117,7 +117,7 @@ iterate_partition (grub_disk_t disk, const grub_partition_t p)
grub_sprintf (name, "%s,%s", disk_name, partition_name);
grub_free (partition_name);
ret = add_completion (name, ")", GRUB_COMPLETION_TYPE_PARTITION);
grub_free (name);
return ret;
@ -147,7 +147,7 @@ iterate_dir (const char *filename, const struct grub_dirhook_info *info)
if (add_completion (fname, "", GRUB_COMPLETION_TYPE_FILE))
return 1;
}
return 0;
}
@ -155,10 +155,10 @@ static int
iterate_dev (const char *devname)
{
grub_device_t dev;
/* Complete the partition part. */
dev = grub_device_open (devname);
if (dev)
{
if (dev->disk && dev->disk->has_partitions)
@ -172,7 +172,7 @@ iterate_dev (const char *devname)
return 1;
}
}
grub_errno = GRUB_ERR_NONE;
return 0;
}
@ -188,7 +188,7 @@ iterate_command (grub_command_t cmd)
return 1;
}
}
return 0;
}
@ -199,7 +199,7 @@ complete_device (void)
/* Check if this is a device or a partition. */
char *p = grub_strchr (++current_word, ',');
grub_device_t dev;
if (! p)
{
/* Complete the disk part. */
@ -213,7 +213,7 @@ complete_device (void)
dev = grub_device_open (current_word);
*p = ',';
grub_errno = GRUB_ERR_NONE;
if (dev)
{
if (dev->disk && dev->disk->has_partitions)
@ -224,7 +224,7 @@ complete_device (void)
return 1;
}
}
grub_device_close (dev);
}
else
@ -244,18 +244,18 @@ complete_file (void)
grub_fs_t fs;
grub_device_t dev;
int ret = 0;
device = grub_file_get_device_name (current_word);
if (grub_errno != GRUB_ERR_NONE)
return 1;
dev = grub_device_open (device);
if (! dev)
{
ret = 1;
goto fail;
}
fs = grub_fs_probe (dev);
if (! fs)
{
@ -268,25 +268,25 @@ complete_file (void)
if (dir)
{
char *dirfile;
current_word = last_dir + 1;
dir = grub_strdup (dir);
if (! dir)
{
ret = 1;
goto fail;
}
/* Cut away the filename part. */
dirfile = grub_strrchr (dir, '/');
dirfile[1] = '\0';
/* Iterate the directory. */
(fs->dir) (dev, dir, iterate_dir);
grub_free (dir);
if (grub_errno)
{
ret = 1;
@ -302,7 +302,7 @@ complete_file (void)
ret = 1;
goto fail;
}
suffix = "";
num_found = 1;
}
@ -323,7 +323,7 @@ complete_arguments (char *command)
const struct grub_arg_option *option;
char shortarg[] = "- ";
cmd = grub_command_find (command);
cmd = grub_command_find (command);
if (!cmd || !(cmd->flags & GRUB_COMMAND_FLAG_EXTCMD))
return 0;
@ -478,13 +478,13 @@ grub_normal_do_completion (char *buf, int *restore,
if (num_found == 1)
grub_strcat (ret, suffix);
if (*ret == '\0')
{
grub_free (ret);
goto fail;
}
grub_free (argv[0]);
grub_free (match);
return ret;

16
normal/datetime.c
View file

@ -60,10 +60,10 @@ grub_unixtime2datetime (grub_int32_t nix, struct grub_datetime *datetime)
{
int i;
int div;
grub_uint8_t months[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
/* In the period of validity of unixtime all years divisible by 4
grub_uint8_t months[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
/* In the period of validity of unixtime all years divisible by 4
are bissextile*/
/* Convenience: let's have 3 consecutive non-bissextile years
/* Convenience: let's have 3 consecutive non-bissextile years
at the beginning of the epoch. So count from 1973 instead of 1970 */
nix -= 3*SECPERYEAR + SECPERDAY;
/* Transform C divisions and modulos to mathematical ones */
@ -85,15 +85,15 @@ grub_unixtime2datetime (grub_int32_t nix, struct grub_datetime *datetime)
datetime->year += nix / SECPERYEAR;
nix %= SECPERYEAR;
}
for (i = 0; i < 12
&& nix >= ((grub_int32_t) (i==1 && datetime->year % 4 == 0
for (i = 0; i < 12
&& nix >= ((grub_int32_t) (i==1 && datetime->year % 4 == 0
? 29 : months[i]))*SECPERDAY; i++)
nix -= ((grub_int32_t) (i==1 && datetime->year % 4 == 0
nix -= ((grub_int32_t) (i==1 && datetime->year % 4 == 0
? 29 : months[i]))*SECPERDAY;
datetime->month = i + 1;
datetime->month = i + 1;
datetime->day = 1 + (nix / SECPERDAY);
nix %= SECPERDAY;
datetime->hour = (nix / SECPERHOUR);
datetime->hour = (nix / SECPERHOUR);
nix %= SECPERHOUR;
datetime->minute = nix / SECPERMIN;
datetime->second = nix % SECPERMIN;

8
normal/main.c
View file

@ -112,7 +112,7 @@ grub_file_getline (grub_file_t file)
grub_free (cmdline);
cmdline = 0;
}
return cmdline;
}
@ -291,7 +291,7 @@ read_config_file (const char *config)
{
grub_file_t file;
grub_parser_t old_parser = 0;
auto grub_err_t getline (char **line, int cont);
grub_err_t getline (char **line, int cont __attribute__ ((unused)))
{
@ -406,7 +406,7 @@ grub_normal_execute (const char *config, int nested, int batch)
grub_command_execute ("parser.sh", 0, 0);
reader_nested = nested;
if (config)
{
menu = read_config_file (config);
@ -446,7 +446,7 @@ grub_cmd_normal (struct grub_command *cmd,
so that it won't get broken by longjmp. */
static char *config;
const char *prefix;
prefix = grub_env_get ("prefix");
if (prefix)
{

174
normal/menu_entry.c
View file

@ -107,7 +107,7 @@ print_line (struct line *linep, int offset, int start, int y)
{
int i;
char *p;
grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_MARGIN + start + 1,
y + GRUB_TERM_FIRST_ENTRY_Y);
@ -130,7 +130,7 @@ static void
print_empty_line (int y)
{
int i;
grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_MARGIN + 1,
y + GRUB_TERM_FIRST_ENTRY_Y);
@ -144,26 +144,26 @@ print_up (int flag)
{
grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_BORDER_WIDTH,
GRUB_TERM_FIRST_ENTRY_Y);
if (flag)
grub_putcode (GRUB_TERM_DISP_UP);
else
grub_putchar (' ');
}
/* Print a down arrow. */
static void
print_down (int flag)
{
grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_BORDER_WIDTH,
GRUB_TERM_TOP_BORDER_Y + GRUB_TERM_NUM_ENTRIES);
if (flag)
grub_putcode (GRUB_TERM_DISP_DOWN);
else
grub_putchar (' ');
}
/* Draw the lines of the screen SCREEN. */
static void
update_screen (struct screen *screen, int region_start, int region_column,
@ -174,7 +174,7 @@ update_screen (struct screen *screen, int region_start, int region_column,
int y;
int i;
struct line *linep;
/* Check if scrolling is necessary. */
if (screen->y < 0 || screen->y >= GRUB_TERM_NUM_ENTRIES)
{
@ -182,7 +182,7 @@ update_screen (struct screen *screen, int region_start, int region_column,
screen->y = 0;
else
screen->y = GRUB_TERM_NUM_ENTRIES - 1;
region_start = 0;
region_column = 0;
up = 1;
@ -203,21 +203,21 @@ update_screen (struct screen *screen, int region_start, int region_column,
linep--;
y -= get_logical_num_lines (linep);
}
if (y < 0 || i > 0)
up_flag = 1;
do
{
int column;
for (column = 0;
column <= linep->len && y < GRUB_TERM_NUM_ENTRIES;
column += GRUB_TERM_ENTRY_WIDTH, y++)
{
if (y < 0)
continue;
if (i == region_start)
{
if (region_column >= column
@ -229,34 +229,34 @@ update_screen (struct screen *screen, int region_start, int region_column,
else if (i > region_start && mode == ALL_LINES)
print_line (linep, column, 0, y);
}
if (y == GRUB_TERM_NUM_ENTRIES)
{
if (column <= linep->len || i + 1 < screen->num_lines)
down_flag = 1;
}
linep++;
i++;
if (mode == ALL_LINES && i == screen->num_lines)
for (; y < GRUB_TERM_NUM_ENTRIES; y++)
print_empty_line (y);
}
while (y < GRUB_TERM_NUM_ENTRIES);
/* Draw up and down arrows. */
if (up)
print_up (up_flag);
if (down)
print_down (down_flag);
}
/* Place the cursor. */
grub_gotoxy (GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_MARGIN + 1 + screen->x,
GRUB_TERM_FIRST_ENTRY_Y + screen->y);
grub_refresh ();
}
@ -278,7 +278,7 @@ insert_string (struct screen *screen, char *s, int update)
struct line *current_linep;
struct line *next_linep;
int size;
/* Make a new line. */
screen->num_lines++;
screen->lines = grub_realloc (screen->lines,
@ -295,15 +295,15 @@ insert_string (struct screen *screen, char *s, int update)
if (! init_line (screen->lines + screen->line + 1))
return 0;
/* Fold the line. */
current_linep = screen->lines + screen->line;
next_linep = current_linep + 1;
size = current_linep->len - screen->column;
if (! ensure_space (next_linep, size))
return 0;
grub_memmove (next_linep->buf,
current_linep->buf + screen->column,
size);
@ -319,7 +319,7 @@ insert_string (struct screen *screen, char *s, int update)
mode = ALL_LINES;
down = 1; /* XXX not optimal. */
/* Move the cursor. */
screen->column = screen->real_column = 0;
screen->line++;
@ -363,7 +363,7 @@ insert_string (struct screen *screen, char *s, int update)
region_start = screen->line;
region_column = screen->column;
}
if (orig_num != new_num)
{
mode = ALL_LINES;
@ -378,14 +378,14 @@ insert_string (struct screen *screen, char *s, int update)
screen->x += size;
screen->y += screen->x / GRUB_TERM_ENTRY_WIDTH;
screen->x %= GRUB_TERM_ENTRY_WIDTH;
s = p;
}
}
if (update)
update_screen (screen, region_start, region_column, 0, down, mode);
return 1;
}
@ -399,7 +399,7 @@ destroy_screen (struct screen *screen)
for (i = 0; i < screen->num_lines; i++)
{
struct line *linep = screen->lines + i;
if (linep)
grub_free (linep->buf);
}
@ -456,7 +456,7 @@ static int
forward_char (struct screen *screen, int update)
{
struct line *linep;
linep = screen->lines + screen->line;
if (screen->column < linep->len)
{
@ -499,7 +499,7 @@ backward_char (struct screen *screen, int update)
else if (screen->line > 0)
{
struct line *linep;
screen->line--;
linep = screen->lines + screen->line;
screen->column = linep->len;
@ -511,7 +511,7 @@ backward_char (struct screen *screen, int update)
if (update)
update_screen (screen, screen->num_lines, 0, 0, 0, NO_LINE);
return 1;
}
@ -522,24 +522,24 @@ previous_line (struct screen *screen, int update)
{
struct line *linep;
int dy;
/* How many physical lines from the current position
to the first physical line? */
dy = screen->column / GRUB_TERM_ENTRY_WIDTH;
screen->line--;
linep = screen->lines + screen->line;
if (linep->len < screen->real_column)
screen->column = linep->len;
else
screen->column = screen->real_column;
/* How many physical lines from the current position
to the last physical line? */
dy += (linep->len / GRUB_TERM_ENTRY_WIDTH
- screen->column / GRUB_TERM_ENTRY_WIDTH);
screen->y -= dy + 1;
screen->x = screen->column % GRUB_TERM_ENTRY_WIDTH;
}
@ -552,7 +552,7 @@ previous_line (struct screen *screen, int update)
if (update)
update_screen (screen, screen->num_lines, 0, 0, 0, NO_LINE);
return 1;
}
@ -563,25 +563,25 @@ next_line (struct screen *screen, int update)
{
struct line *linep;
int dy;
/* How many physical lines from the current position
to the last physical line? */
linep = screen->lines + screen->line;
dy = (linep->len / GRUB_TERM_ENTRY_WIDTH
- screen->column / GRUB_TERM_ENTRY_WIDTH);
screen->line++;
linep++;
if (linep->len < screen->real_column)
screen->column = linep->len;
else
screen->column = screen->real_column;
/* How many physical lines from the current position
to the first physical line? */
dy += screen->column / GRUB_TERM_ENTRY_WIDTH;
screen->y += dy + 1;
screen->x = screen->column % GRUB_TERM_ENTRY_WIDTH;
}
@ -598,7 +598,7 @@ next_line (struct screen *screen, int update)
if (update)
update_screen (screen, screen->num_lines, 0, 0, 0, NO_LINE);
return 1;
}
@ -611,7 +611,7 @@ beginning_of_line (struct screen *screen, int update)
if (update)
update_screen (screen, screen->num_lines, 0, 0, 0, NO_LINE);
return 1;
}
@ -619,7 +619,7 @@ static int
end_of_line (struct screen *screen, int update)
{
struct line *linep;
linep = screen->lines + screen->line;
screen->y += (linep->len / GRUB_TERM_ENTRY_WIDTH
- screen->column / GRUB_TERM_ENTRY_WIDTH);
@ -628,7 +628,7 @@ end_of_line (struct screen *screen, int update)
if (update)
update_screen (screen, screen->num_lines, 0, 0, 0, NO_LINE);
return 1;
}
@ -640,14 +640,14 @@ delete_char (struct screen *screen, int update)
int start = screen->num_lines;
int column = 0;
int down = 0;
linep = screen->lines + screen->line;
if (linep->len > screen->column)
{
int orig_num, new_num;
orig_num = get_logical_num_lines (linep);
grub_memmove (linep->buf + screen->column,
linep->buf + screen->column + 1,
linep->len - screen->column - 1);
@ -680,7 +680,7 @@ delete_char (struct screen *screen, int update)
(screen->num_lines - screen->line - 2)
* sizeof (struct line));
screen->num_lines--;
mode = ALL_LINES;
start = screen->line;
column = screen->column;
@ -703,7 +703,7 @@ backward_delete_char (struct screen *screen, int update)
saved_column = screen->column;
saved_line = screen->line;
if (! backward_char (screen, 0))
return 0;
@ -721,25 +721,25 @@ kill_line (struct screen *screen, int continuous, int update)
char *p;
int size;
int offset;
p = screen->killed_text;
if (! continuous && p)
p[0] = '\0';
linep = screen->lines + screen->line;
size = linep->len - screen->column;
if (p)
offset = grub_strlen (p);
else
offset = 0;
if (size > 0)
{
enum update_mode mode = SINGLE_LINE;
int down = 0;
int orig_num, new_num;
p = grub_realloc (p, offset + size + 1);
if (! p)
return 0;
@ -748,7 +748,7 @@ kill_line (struct screen *screen, int continuous, int update)
p[offset + size - 1] = '\0';
screen->killed_text = p;
orig_num = get_logical_num_lines (linep);
linep->len = screen->column;
new_num = get_logical_num_lines (linep);
@ -772,10 +772,10 @@ kill_line (struct screen *screen, int continuous, int update)
p[offset + 1] = '\0';
screen->killed_text = p;
return delete_char (screen, update);
}
return 1;
}
@ -792,7 +792,7 @@ static int
open_line (struct screen *screen, int update)
{
int saved_y = screen->y;
if (! insert_string (screen, "\n", 0))
return 0;
@ -812,7 +812,7 @@ static void
store_completion (const char *item, grub_completion_type_t type, int count)
{
char *p;
if (count == 0)
{
/* If this is the first time, print a label. */
@ -839,7 +839,7 @@ store_completion (const char *item, grub_completion_type_t type, int count)
what = "things";
break;
}
grub_gotoxy (0, GRUB_TERM_HEIGHT - 3);
grub_printf (" Possible %s are:\n ", what);
}
@ -849,7 +849,7 @@ store_completion (const char *item, grub_completion_type_t type, int count)
+ (int) grub_strlen (item) + 1 + 1))
{
grub_size_t new_len;
new_len = completion_buffer.len + grub_strlen (item) + 80;
p = grub_realloc (completion_buffer.buf, new_len);
if (! p)
@ -887,10 +887,10 @@ complete (struct screen *screen, int continuous, int update)
count++;
else
count = 0;
pos = grub_getxy ();
grub_gotoxy (0, GRUB_TERM_HEIGHT - 3);
completion_buffer.buf = 0;
completion_buffer.len = 0;
completion_buffer.max_len = 0;
@ -902,13 +902,13 @@ complete (struct screen *screen, int continuous, int update)
insert = grub_normal_do_completion (linep->buf, &restore, store_completion);
linep->buf[screen->column] = saved_char;
if (restore)
{
char *p = completion_buffer.buf;
screen->completion_shown = 1;
if (p)
{
int num_sections = ((completion_buffer.len + GRUB_TERM_WIDTH - 8 - 1)
@ -922,17 +922,17 @@ complete (struct screen *screen, int continuous, int update)
grub_putcode (GRUB_TERM_DISP_LEFT);
else
grub_putchar (' ');
while (*p && p < endp)
grub_putchar (*p++);
if (*p)
grub_putcode (GRUB_TERM_DISP_RIGHT);
}
}
grub_gotoxy (pos >> 8, pos & 0xFF);
if (insert)
{
insert_string (screen, insert, update);
@ -941,7 +941,7 @@ complete (struct screen *screen, int continuous, int update)
}
else if (update)
grub_refresh ();
grub_free (completion_buffer.buf);
return 1;
}
@ -952,17 +952,17 @@ clear_completions (void)
{
grub_uint16_t pos;
int i, j;
pos = grub_getxy ();
grub_gotoxy (0, GRUB_TERM_HEIGHT - 3);
for (i = 0; i < 2; i++)
{
for (j = 0; j < GRUB_TERM_WIDTH - 1; j++)
grub_putchar (' ');
grub_putchar ('\n');
}
grub_gotoxy (pos >> 8, pos & 0xFF);
grub_refresh ();
}
@ -1000,7 +1000,7 @@ run (struct screen *screen)
currline++;
return 0;
}
grub_cls ();
grub_printf (" Booting a command list\n\n");
@ -1033,7 +1033,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
{
struct screen *screen;
int prev_c;
screen = make_screen (entry);
if (! screen)
return;
@ -1044,7 +1044,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
update_screen (screen, 0, 0, 1, 1, ALL_LINES);
grub_setcursor (1);
prev_c = '\0';
while (1)
{
int c = GRUB_TERM_ASCII_CHAR (grub_getkey ());
@ -1054,7 +1054,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
clear_completions ();
screen->completion_shown = 0;
}
switch (c)
{
case 16: /* C-p */
@ -1071,7 +1071,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
if (! forward_char (screen, 1))
goto fail;
break;
case 2: /* C-b */
if (! backward_char (screen, 1))
goto fail;
@ -1086,12 +1086,12 @@ grub_menu_entry_run (grub_menu_entry_t entry)
if (! end_of_line (screen, 1))
goto fail;
break;
case '\t': /* C-i */
if (! complete (screen, prev_c == c, 1))
goto fail;
break;
case 4: /* C-d */
if (! delete_char (screen, 1))
goto fail;
@ -1101,16 +1101,16 @@ grub_menu_entry_run (grub_menu_entry_t entry)
if (! backward_delete_char (screen, 1))
goto fail;
break;
case 11: /* C-k */
if (! kill_line (screen, prev_c == c, 1))
goto fail;
break;
case 21: /* C-u */
/* FIXME: What behavior is good for this key? */
break;
case 25: /* C-y */
if (! yank (screen, 1))
goto fail;
@ -1119,7 +1119,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
case 12: /* C-l */
/* FIXME: centering. */
goto refresh;
case 15: /* C-o */
if (! open_line (screen, 1))
goto fail;
@ -1134,11 +1134,11 @@ grub_menu_entry_run (grub_menu_entry_t entry)
case '\e':
destroy_screen (screen);
return;
case 3: /* C-c */
grub_cmdline_run (1);
goto refresh;
case 24: /* C-x */
if (! run (screen))
goto fail;
@ -1149,7 +1149,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
case 20: /* C-t */
/* FIXME */
break;
default:
if (grub_isprint (c))
{
@ -1168,7 +1168,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
fail:
destroy_screen (screen);
grub_cls ();
grub_print_error ();
grub_errno = GRUB_ERR_NONE;

2
normal/menu_viewer.c
View file

@ -55,7 +55,7 @@ grub_err_t
grub_menu_viewer_show_menu (grub_menu_t menu, int nested)
{
grub_menu_viewer_t cur = get_current_menu_viewer ();
if (!cur)
if (!cur)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "No menu viewer available.");
return cur->show_menu (menu, nested);

4
normal/misc.c
View file

@ -37,7 +37,7 @@ grub_normal_print_device_info (const char *name)
grub_printf ("\tPartition %s: ", name);
else
grub_printf ("Device %s: ", name);
dev = grub_device_open (name);
if (! dev)
grub_printf ("Filesystem cannot be accessed");
@ -98,7 +98,7 @@ grub_normal_print_device_info (const char *name)
grub_printf ("Unknown filesystem");
else
grub_printf ("Partition table");
grub_device_close (dev);
}