2005-10-28 Yoshinori K. Okuji <okuji@enbug.org>

From Timothy Baldwin:
        * commands/ls.c (grub_ls_list_files): Close FILE with
        grub_file_close.
        * kern/misc.c (grub_vsprintf): Terminate the string S with NUL.
This commit is contained in:
okuji 2005-10-28 03:14:33 +00:00
parent 04ccf3ec6f
commit 25fe6f0349
3 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,10 @@
2005-10-28 Yoshinori K. Okuji <okuji@enbug.org>
From Timothy Baldwin:
* commands/ls.c (grub_ls_list_files): Close FILE with
grub_file_close.
* kern/misc.c (grub_vsprintf): Terminate the string S with NUL.
2005-10-24 Marco Gerards <mgerards@xs4all.nl> 2005-10-24 Marco Gerards <mgerards@xs4all.nl>
* include/grub/parser.h: New file. * include/grub/parser.h: New file.

View file

@ -130,7 +130,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
grub_printf ("%-12d", file->size); grub_printf ("%-12d", file->size);
} }
(fs->close) (file); grub_file_close (file);
} }
else else
grub_printf ("%-12s", "DIR"); grub_printf ("%-12s", "DIR");

View file

@ -577,8 +577,9 @@ grub_vsprintf (char *str, const char *fmt, va_list args)
if (p > fmt) if (p > fmt)
{ {
char s[p - fmt]; char s[p - fmt + 1];
grub_strncpy (s, fmt, p - fmt); grub_strncpy (s, fmt, p - fmt);
s[p - fmt] = 0;
if (s[0] == '0') if (s[0] == '0')
zerofill = '0'; zerofill = '0';
format1 = grub_strtoul (s, 0, 10); format1 = grub_strtoul (s, 0, 10);