Vladimir 'phcoder' Serbinenko
2aa6398b64
Remove second part of list_iterate usage auth.c
2010-03-26 19:21:01 +01:00
Vladimir 'phcoder' Serbinenko
fbc5a383e2
Remove list_iterate usage auth.c
2010-03-26 19:18:19 +01:00
Vladimir 'phcoder' Serbinenko
d85da27cc0
Remove grub_commands_iterate
2010-03-26 19:14:24 +01:00
Vladimir 'phcoder' Serbinenko
696fd607c6
2010-03-06 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/cmdline.c (grub_cmdline_get): Fix gabled line after
completition in the middle of string.
2010-03-06 17:48:15 +01:00
Vladimir 'phcoder' Serbinenko
41168ea49c
2010-03-04 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/autofs.c (autoload_fs_module): Handle errors.
2010-03-04 21:30:58 +01:00
Vladimir 'phcoder' Serbinenko
f209b5b230
2010-03-04 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/crypto.c (read_crypto_list): Fix a typo.
Reported by: Seth Goldberg.
2010-03-04 16:13:35 +01:00
Vladimir 'phcoder' Serbinenko
c6f2fe52f1
2010-03-01 Vladimir Serbinenko <phcoder@gmail.com>
...
Wait for user entry basing on presence of output rather than on errors.
* include/grub/normal.h (grub_normal_get_line_counter): New proto.
(grub_install_newline_hook): Likewise.
* normal/main.c (GRUB_MOD_INIT): Call grub_install_newline_hook.
* normal/menu.c (show_menu): Check line_counter to determine presence
of output.
* normal/term.c (grub_normal_line_counter): New variable.
(grub_normal_get_line_counter): New function.
(grub_install_newline_hook): Likewise.
2010-03-01 20:58:45 +01:00
Vladimir 'phcoder' Serbinenko
4a8a763c7b
2010-02-24 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/crypto.c (read_crypto_list): Fix a memory leak.
* normal/term.c (read_terminal_list): Likewise.
* normal/main.c (grub_normal_init_page): Likewise.
(grub_normal_read_line_real): Likewise.
2010-02-24 15:24:21 +01:00
Vladimir 'phcoder' Serbinenko
1f534b6908
Merge mainline into gfxmenu
2010-02-03 01:24:07 +01:00
Vladimir 'phcoder' Serbinenko
63533ab093
2010-01-27 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle
of the line.
2010-01-27 17:47:36 +01:00
Vladimir 'phcoder' Serbinenko
61c501a941
merge mainline into newenv
2010-01-20 21:31:39 +01:00
Vladimir 'phcoder' Serbinenko
61eb45eee7
Rename asprint into xasprintf and avsprintf into xvasprintf
2010-01-20 09:12:47 +01:00
Vladimir 'phcoder' Serbinenko
b09a4a8dff
add missing error handling
2010-01-20 09:01:25 +01:00
Vladimir 'phcoder' Serbinenko
2d49abe9e7
merge mainline into asprintf
2010-01-20 07:36:17 +01:00
Robert Millan
55ff526642
2009-12-20 Robert Millan <rmh.grub@aybabtu.com>
...
* normal/menu.c (notify_execution_failure): Clarify error message.
2010-01-20 02:50:36 +00:00
carles
cca15b52c1
2010-01-14 Carles Pina i Estany <carles@pina.cat>
...
* normal/cmdline.c (print_completion): Gettextizze.
2010-01-14 23:07:44 +00:00
Colin Watson
7d1468e4b6
merge from trunk
2010-01-14 14:04:44 +00:00
Vladimir 'phcoder' Serbinenko
e9060a9d3b
2010-01-10 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/cmdline.c (grub_cmdline_get): Fix off-by-one error
which resulted in garbled command line at the end of screen.
2010-01-10 22:34:25 +01:00
Vladimir 'phcoder' Serbinenko
3b88cbbda5
Warning fixes
2010-01-07 22:22:11 +01:00
Vladimir 'phcoder' Serbinenko
fc054c9cb8
Various cleanups
2010-01-07 22:18:59 +01:00
Vladimir 'phcoder' Serbinenko
44fcb2bc59
merge mainline into multiterm
2010-01-07 21:34:43 +01:00
Robert Millan
53108d92ba
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
...
2010-01-07 Vladimir Serbinenko <phcoder@gmail.com>
Fix breakage introduced with previous commit.
* normal/dyncmd.c (read_command_list): Avoid unregistering kernel
commands.
* normal/handler.c (read_handler_list): Revert part of previous commit
affecting this file.
* normal/main.c (read_lists): Move read_handler_list() call back to ...
(grub_normal_execute): ... here.
2010-01-07 16:53:29 +00:00
Robert Millan
c1d2f1d81b
Merge from trunk
2010-01-07 00:58:54 +00:00
Robert Millan
e2e936b2f2
2010-01-07 Robert Millan <rmh.grub@aybabtu.com>
...
Merge prefix-redefinition-fix branch.
* normal/autofs.c (read_fs_list): Make function capable of being
run multiple times, gracefuly replacing the previous data
structures.
* normal/dyncmd.c (read_command_list): Likewise.
* normal/handler.c (read_handler_list): Likewise.
* normal/main.c (read_lists): New function. Calls all the
list reading functions.
(grub_normal_execute): Use read_lists() instead of calling all
list reading functions explicitly. Register read_lists() as a
variable hook attached to ${prefix}.
2010-01-07 00:52:56 +00:00
Vladimir 'phcoder' Serbinenko
607a3701db
2010-01-07 Vladimir Serbinenko <phcoder@gmail.com>
...
Merge crypto branch.
* Makefile.in (pkglib_DATA): Add crypto.lst.
(crypto.lst): New target.
* commands/hashsum.c: New file.
* commands/password.c (check_password): Use grub_crypto_memcmp.
* commands/password_pbkdf2.c: New file.
* commands/xnu_uuid.c: Remove MD5. Use GRUB_MD_MD5.
* conf/any-emu.rmk (grub_emu_SOURCES): Add lib/crypto.c,
normal/crypto.c and lib/libgcrypt-grub/cipher/md5.c.
(grub_emu_CFLAGS): Add -Wno-missing-field-initializers -Wno-error
-I$(srcdir)/lib/libgcrypt_wrap.
* conf/common.rmk (normal_mod_SOURCES): Add normal/crypto.c.
(pkglib_MODULES): Add crypto.mod, hashsum.mod, pbkdf2.mod and
password_pbkdf2.mod.
(crypto_mod_SOURCES): New variable.
(crypto_mod_CFLAGS): Likewise.
(crypto_mod_LDFLAGS): Likewise.
(hashsum_mod_SOURCES): New variable.
(hashsum_mod_CFLAGS): Likewise.
(hashsum_mod_LDFLAGS): Likewise.
(pbkdf2_mod_SOURCES): New variable.
(pbkdf2_mod_CFLAGS): Likewise.
(pbkdf2_mod_LDFLAGS): Likewise.
(password_pbkdf2_mod_SOURCES): New variable.
(password_pbkdf2_mod_CFLAGS): Likewise.
(password_pbkdf2_mod_LDFLAGS): Likewise.
(bin_UTILITIES): Add grub-mkpasswd-pbkdf2.
(grub_mkpasswd_pbkdf2_SOURCES): New variable.
(grub_mkpasswd_pbkdf2_CFLAGS): Likewise.
Include conf/gcry.rmk.
* include/grub/auth.h: Rewritten.
* include/grub/crypto.h: New file.
* include/grub/disk.h (grub_disk_dev_id): Add GRUB_DISK_DEVICE_LUKS_ID.
* include/grub/normal.h (read_crypto_list): New prototype.
* lib/crypto.c: New file.
* lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
* lib/pbkdf2.c: Likewise.
* normal/auth.c (grub_auth_strcmp): Removed.
(grub_iswordseparator): Likewise.
(grub_auth_strword): Likewise.
(is_authenticated): Use grub_strword.
(grub_auth_check_authentication): Use grub_strcmp, grub_password_get
and grub_strword. Pass entered password to authentication callback.
* normal/crypto.c: New file.
* normal/main.c: Call read_crypto_list.
* util/grub-mkpasswd-pbkdf2.c: New file.
* util/import_gcry.py: Generate crypto.lst. Add hash blocklen.
2010-01-07 01:13:01 +01:00
Vladimir 'phcoder' Serbinenko
4d253049d5
Fix non-clearing of timeout. Template support for timeout text.
2010-01-06 01:42:21 +01:00
Vladimir 'phcoder' Serbinenko
e6e86df1de
Merge multiterm into gfxmenu+multiterm
2010-01-05 16:34:10 +01:00
Vladimir 'phcoder' Serbinenko
519634516f
Merge mainline into multiterm
2010-01-05 16:27:41 +01:00
Colin Watson
bc11fee9f5
merge from trunk
2010-01-05 10:53:03 +00:00
Robert Millan
58bc8bd5b1
2010-01-03 Robert Millan <rmh.grub@aybabtu.com>
...
* boot/i386/pc/boot.S: Update copyright year.
* boot/i386/pc/cdboot.S: Likewise.
* boot/i386/pc/diskboot.S: Likewise.
* boot/i386/pc/lnxboot.S: Likewise.
* boot/i386/pc/pxeboot.S: Likewise.
* bus/pci.c: Likewise.
* commands/cmp.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/ls.c: Likewise.
* commands/test.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Likewise.
* disk/ieee1275/nand.c: Likewise.
* disk/ieee1275/ofdisk.c: Likewise.
* disk/lvm.c: Likewise.
* disk/raid.c: Likewise.
* disk/raid6_recover.c: Likewise.
* disk/scsi.c: Likewise.
* fs/affs.c: Likewise.
* fs/cpio.c: Likewise.
* fs/ext2.c: Likewise.
* fs/hfs.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/ntfs.c: Likewise.
* fs/sfs.c: Likewise.
* fs/udf.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* gencmdlist.sh: Likewise.
* genmk.rb: Likewise.
* include/grub/disk.h: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/efi.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/elf.h: Likewise.
* include/grub/fs.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* include/grub/i386/pc/vbe.h: Likewise.
* include/grub/i386/pci.h: Likewise.
* include/grub/i386/tsc.h: Likewise.
* include/grub/ieee1275/ieee1275.h: Likewise.
* include/grub/ntfs.h: Likewise.
* include/grub/sparc64/ieee1275/ieee1275.h: Likewise.
* include/grub/sparc64/libgcc.h: Likewise.
* include/grub/symbol.h: Likewise.
* include/grub/types.h: Likewise.
* include/multiboot2.h: Likewise.
* io/gzio.c: Likewise.
* kern/device.c: Likewise.
* kern/disk.c: Likewise.
* kern/efi/efi.c: Likewise.
* kern/efi/mm.c: Likewise.
* kern/elf.c: Likewise.
* kern/file.c: Likewise.
* kern/i386/dl.c: Likewise.
* kern/i386/pc/init.c: Likewise.
* kern/i386/pc/startup.S: Likewise.
* kern/ieee1275/ieee1275.c: Likewise.
* kern/ieee1275/init.c: Likewise.
* kern/main.c: Likewise.
* kern/mm.c: Likewise.
* kern/powerpc/dl.c: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/x86_64/dl.c: Likewise.
* lib/hexdump.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/multiboot2.c: Likewise.
* loader/ieee1275/multiboot2.c: Likewise.
* loader/multiboot2.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* normal/completion.c: Likewise.
* normal/menu_entry.c: Likewise.
* partmap/apple.c: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/hostfs.c: Likewise.
* video/readers/png.c: Likewise.
2010-01-03 22:05:07 +00:00
carles
a173283f78
2010-01-03 Carles Pina i Estany <carles@pina.cat>
...
* normal/menu_text.c (print_message): Change messages.
2010-01-03 21:48:09 +01:00
carles
7fa7ff7439
2010-01-03 Carles Pina i Estany <carles@pina.cat>
...
* normal/menu_entry.c (store_completion): Gettextizze.
2010-01-03 21:30:04 +01:00
carles
3393790450
2010-01-01 Carles Pina i Estany <carles@pina.cat>
...
* commands/help.c: Include `grub/mm.h' and `grub/normal.h'.
(grub_cmd_help): Print the cmd->name before the cmd->summary. Cut the
string using string width.
* normal/menu_text.c (grub_print_message_indented): Use
grub_print_spaces and not print_spaces.
(print_timeout): Likewise.
(print_spaces): Move to...
* include/grub/term.h: ... here. Change the name to grub_print_spaces.
2010-01-01 18:58:00 +01:00
Vladimir 'phcoder' Serbinenko
acea847040
Merge mainline into asprintf
2009-12-30 14:08:10 +01:00
Vladimir 'phcoder' Serbinenko
f8882fe8f9
Fix mismerge
2009-12-29 22:50:38 +01:00
Vladimir 'phcoder' Serbinenko
c99f206280
Merge multiterm into gfxmenu+multiterm
2009-12-29 17:56:46 +01:00
Vladimir 'phcoder' Serbinenko
d8a1cbbd0b
Fix compilation warning
2009-12-29 17:54:27 +01:00
Vladimir 'phcoder' Serbinenko
07e727f751
Add missing include
2009-12-29 17:53:10 +01:00
Vladimir 'phcoder' Serbinenko
18bcc99806
merge multiterm into gfxmenu+multiterm
2009-12-29 13:04:44 +01:00
Vladimir 'phcoder' Serbinenko
37f7fb26a3
always_inline cl_print to avoid regparm=3 bug
2009-12-29 13:03:22 +01:00
Vladimir 'phcoder' Serbinenko
c0a426b887
merge multiterm into gfxmenu+multiterm
2009-12-29 10:25:15 +01:00
Vladimir 'phcoder' Serbinenko
bd2b242ea2
Fix space after completion
2009-12-29 10:24:10 +01:00
Vladimir 'phcoder' Serbinenko
8b442f3f4c
asprintf and snprintf support
2009-12-29 10:04:06 +01:00
carles
465b5a8130
2009-12-28 Carles Pina i Estany <carles@pina.cat>
...
* normal/misc.c (grub_normal_print_device_info): Add spaces and double
quotes.
2009-12-28 19:11:59 +01:00
Vladimir 'phcoder' Serbinenko
7f1f423cda
merge multiterm gfxmenu+multiterm
2009-12-27 22:38:22 +01:00
Vladimir 'phcoder' Serbinenko
f45e1a9fb7
Allocate correct size
2009-12-27 22:34:49 +01:00
Vladimir 'phcoder' Serbinenko
9c8739a456
2009-12-27 Vladimir Serbinenko <phcoder@gmail.com>
...
* normal/menu_text.c (grub_print_message_indented): Prevent
past-the-end-of-array dereference.
2009-12-27 22:32:52 +01:00
carles
64fd18edbc
2009-12-27 Carles Pina i Estany <carles@pina.cat>
...
* normal/cmdline.c (grub_cmdline_get): Print a space after prompt.
* normal/main.c (grub_normal_read_line): Remove a space from the
default prompt.
2009-12-27 00:43:21 +01:00
Vladimir 'phcoder' Serbinenko
e20d3e608c
merge multiterm into gfxmenu+multiterm
2009-12-26 16:42:55 +01:00
Vladimir 'phcoder' Serbinenko
27a8ee52b4
Remove menu init hooks. They are useless
2009-12-26 16:39:16 +01:00