vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
7285 commits 7 branches 0 tags 143 MiB
Commit graph

4678 commits

Author SHA1 Message Date
Vladimir 'phcoder' Serbinenko
ea811130ea * grub-core/lib/arg.c (grub_arg_list_alloc): Use shifts rather 
than divisions.
 2013-03-10 20:08:15 +01:00
Vladimir 'phcoder' Serbinenko
d2789cf0b8 * grub-core/commands/verify.c (grub_verify_signature): Use unsigned 
operations to have intended shifts and not divisions.
 2013-03-10 19:39:14 +01:00
Vladimir 'phcoder' Serbinenko
a9c94590dd * grub-core/loader/i386/pc/plan9.c (fill_disk): Fix types to use 
intended shifts rather than division.
 2013-03-10 19:27:50 +01:00
Vladimir 'phcoder' Serbinenko
84cfe81b1d * include/grub/datetime.h (grub_datetime2unixtime): Fix unixtime 
computation for some years before epoch. Avode confusing division
	while on it.
 2013-03-10 19:19:21 +01:00
Vladimir 'phcoder' Serbinenko
21344ef620 * grub-core/video/i386/pc/vbe.c 
(grub_video_vbe_print_adapter_specific_info): Replace division by
	shifts.
 2013-03-10 18:49:05 +01:00
Vladimir 'phcoder' Serbinenko
3f2b4d1a81 Adjust types in gdb module to have intended unsigned shifts rather than 
signed divisions.
 2013-03-10 18:36:39 +01:00
Vladimir 'phcoder' Serbinenko
3dac5878ec * grub-core/fs/hfs.c (grub_hfs_read_file): Avoid divmod64 since the 
maximum size is 4G - 1 on hfs
 2013-03-10 18:27:53 +01:00
Vladimir 'phcoder' Serbinenko
5341c0fbfc Avoid costly 64-bit division in grub_get_time_ms on most platforms. 2013-03-10 17:45:38 +01:00
Vladimir 'phcoder' Serbinenko
fc3ff2a2ad * grub-core/fs/fshelp.c (grub_fshelp_log2blksize): Remove now unused 
function.
 2013-03-10 14:27:04 +01:00
Andrey Borzenkov
81455e8e7a * grub-core/fs/iso9660.c (add_part): Remove always_inline attribute 
causing gcc error with gcc 4.7.1.
 2013-03-07 09:11:36 +01:00
Nickolai Zeldovich
efd4f11754 * grub-core/commands/acpi.c (grub_acpi_create_ebda): Don't 
dereference null pointer. While the code is technically correct, gcc
	may eliminate a null check if pointer is already dereferenced.
 2013-03-07 08:52:29 +01:00
Nickolai Zeldovich
e11645f434 * grub-core/normal/crypto.c (read_crypto_list): Fix incorrect 
OOM check.
	* grub-core/normal/term.c (read_terminal_list): Likewise.
 2013-03-07 08:41:27 +01:00
Vladimir 'phcoder' Serbinenko
774683685f Lift up core size limits on some platforms. Fix potential memory 
corruption with big core on small memory systems. Document remaining
	limits.
 2013-03-07 08:17:24 +01:00
Vladimir 'phcoder' Serbinenko
f6b58fe538 * grub-core/term/terminfo.c (grub_terminfo_cls): Issue an explicit 
gotoxy to 0,0.
 2013-03-05 20:00:51 +01:00
Vladimir 'phcoder' Serbinenko
19ce697dfd Remove all trampoline support. Add -Wtrampolines when 
present. Remove symbols used for trampolines to make
	link fail if trampolines are present.
 2013-03-03 15:57:30 +01:00
Vladimir 'phcoder' Serbinenko
73b5d90fe2 * grub-core/script/execute.c (grub_script_arglist_to_argv): Move 
append out of its parent.
 2013-03-03 15:26:29 +01:00
Vladimir 'phcoder' Serbinenko
cb758e96cc * grub-core/commands/regexp.c (set_matches): Move setvar out of its 
parent.
 2013-03-03 15:24:02 +01:00
Vladimir 'phcoder' Serbinenko
3188131f72 * grub-core/kern/env.c, include/grub/env.h: Change iterator through 
all vars to a macro. All users updated.
 2013-03-03 01:34:27 +01:00
Vladimir 'phcoder' Serbinenko
e42b251403 * grub-core/disk/ieee1275/nand.c: Fix compilation on 
i386-ieee1275.
 2013-03-03 01:30:55 +01:00
Vladimir 'phcoder' Serbinenko
83e1a1a137 * include/grub/cmos.h: Handle high CMOS addresses on sparc64. 2013-03-02 23:59:05 +01:00
Vladimir 'phcoder' Serbinenko
1d5a880fe4 * include/grub/mips/loongson/cmos.h: Fix high CMOS addresses. 2013-03-02 23:57:34 +01:00
Vladimir 'phcoder' Serbinenko
6e4146c41e Move to more hookless approach in IEEE1275 devices handling. 2013-03-02 23:51:19 +01:00
Vladimir 'phcoder' Serbinenko
99fcda8a7b * grub-core/kern/term.c (grub_term_normal_color), 
(grub_term_highlight_color): Add back lost defaults.
 2013-03-02 23:23:51 +01:00
Vladimir 'phcoder' Serbinenko
73bf57e2c8 Make elfload not use hooks. Opt for flags and iterators instead. 2013-03-02 16:45:57 +01:00
Vladimir 'phcoder' Serbinenko
7f8c105f61 * grub-core/lib/ia64/longjmp.S: Fix the name of longjmp function. 
* grub-core/lib/ia64/setjmp.S: Fix the name of setjmp function.
 2013-03-02 15:31:17 +01:00
Vladimir 'phcoder' Serbinenko
396d4091e7 * grub-core/script/execute.c (gettext_append): Remove nested functions. 2013-03-02 12:17:52 +01:00
Vladimir 'phcoder' Serbinenko
74a2742144 * grub-core/commands/loadenv.c (grub_cmd_list_env): Move print_var 
out of its parent.
 2013-03-02 11:45:01 +01:00
Vladimir 'phcoder' Serbinenko
b46d4213d5 * grub-core/fs/hfs.c: Remove nested functions. 2013-03-02 11:31:00 +01:00
Vladimir 'phcoder' Serbinenko
e114c3cc54 * grub-core/fs/hfsplus.c (grub_hfsplus_btree_iterate_node): Pass 
the context through.
	(grub_hfsplus_iterate_dir): Move nested function out of its parent.
 2013-03-01 14:02:27 +01:00
Vladimir 'phcoder' Serbinenko
f9b7d78007 * util/grub-editenv.c (list_variables): Move print_var out of its 
parent.
 2013-03-01 13:52:05 +01:00
Vladimir 'phcoder' Serbinenko
ca9c260868 * grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested 
function.
 2013-03-01 13:46:24 +01:00
Vladimir 'phcoder' Serbinenko
5d983f5fc2 * grub-core/gentrigtables.c: Make tables const. 2013-03-01 11:15:09 +01:00
Vladimir 'phcoder' Serbinenko
3056d3e752 Remove nested functions from videoinfo iterators. 2013-03-01 11:11:36 +01:00
Vladimir 'phcoder' Serbinenko
e230377407 * grub-core/loader/i386/pc/linux.c (grub_cmd_linux): Fix compilation 
for 64-bit platforms.
 2013-03-01 10:39:41 +01:00
Vladimir 'phcoder' Serbinenko
f42e3a2f67 * grub-core/disk/efi/efidisk.c: Transform iterate_child_devices into 
a FOR_CHILDREN macro.
 2013-03-01 10:37:11 +01:00
Vladimir 'phcoder' Serbinenko
be174e5ef3 * grub-core/kern/main.c (grub_set_prefix_and_root): Strip trailing 
platform from firmware path.
 2013-03-01 10:35:51 +01:00
Vladimir 'phcoder' Serbinenko
0789b67232 Enable linux16 on non-BIOS systems for i.a. memtest. 
* grub-core/loader/i386/pc/linux.c (grub_cmd_linux): Handle hole at 0
	correctly.
	* grub-core/Makefile.core.def (linux16): Enable on all x86 flavours.
 2013-02-28 22:48:41 +01:00
Vladimir 'phcoder' Serbinenko
005a9c32df * grub-core/kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate): 
Fix end of table condition.
 2013-02-28 13:16:39 +01:00
Vladimir 'phcoder' Serbinenko
ff2b3cd928 * grub-core/lib/arg.c (grub_arg_show_help): Move showargs 
out of its parent.
 2013-02-28 11:00:59 +01:00
Vladimir 'phcoder' Serbinenko
4fc40ff8f3 * grub-core/fs/jfs.c: Remove nested functions. 2013-02-28 10:51:32 +01:00
Vladimir 'phcoder' Serbinenko
be42d97a79 * grub-core/fs/minix.c: Remove nested functions. 2013-02-28 10:50:01 +01:00
Vladimir 'phcoder' Serbinenko
99373ce472 * grub-core/fs/iso9660.c: Remove nested functions. 2013-02-28 10:30:35 +01:00
Vladimir 'phcoder' Serbinenko
5aec2afe2f * grub-core/commands/parttool.c (grub_cmd_parttool): Move show_help out 
of parent function.
 2013-02-28 09:43:25 +01:00
Vladimir 'phcoder' Serbinenko
6c69e691ca * util/grub-fstest.c: Remove nested functions. 2013-02-28 09:36:55 +01:00
Vladimir 'phcoder' Serbinenko
43c918828d * grub-core/loader/machoXX.c: Remove nested functions. 2013-02-27 20:56:23 +01:00
Colin Watson
4eb8b75659 Remove nested functions from disk and file read hooks. 
* include/grub/disk.h (grub_disk_read_hook_t): New type.
	(struct grub_disk): Add read_hook_data member.
	* include/grub/file.h (struct grub_file): Likewise.
	* include/grub/fshelp.h (grub_fshelp_read_file): Add read_hook_data
	argument.

	Update all callers.
 2013-02-27 17:19:15 +01:00
Andrey Borzenkov
df6da5a52d * grub-core/partmap/msdos.c (grub_partition_msdos_iterate): 
Fix off by one error in enumerating extended partitions.
 2013-02-27 10:02:39 +01:00
Andrey Borzenkov
21aecde5f6 * grub-core/disk/efi/efidisk.c(grub_efidisk_get_device_name): Fix 
memory leak if device name is not found.
 2013-02-26 22:45:00 +01:00
Andrey Borzenkov
f1a19118e5 * grub-core/normal/menu_entry.c (update_screen): remove 
unused variable `off' which caused scroll down arrow to be always shown.
 2013-02-25 22:53:40 +01:00
Andrey Borzenkov
958bfd2067 * grub-core/normal/menu_entry.c (insert_string): fix off by one 
access to unallocated memory.
 2013-02-25 22:42:25 +01:00
Andrey Borzenkov
b7b78edb1c * Makefile.util.def: Add partmap/msdos.c to common library. 
* include/grub/msdos_partition.h: Add GRUB_PC_PARTITION_TYPE_LDM
	* grub-core/disk/ldm.c: Check for existence of
	GRUB_PC_PARTITION_TYPE_LDM.
 2013-02-25 22:11:06 +01:00
Vladimir 'phcoder' Serbinenko
28d468d6f2 * grub-core/normal/misc.c (grub_normal_print_device_info): Use KiB to display 
sizes and display sector size.
 2013-02-25 10:45:19 +01:00
Vladimir 'phcoder' Serbinenko
d55ffb0249 Implement new command cmosdump. 2013-02-24 19:44:17 +01:00
Vladimir 'phcoder' Serbinenko
b5ea6ce03a Support Openfirmware disks with non-512B sectors. 
* grub-core/disk/ieee1275/ofdisk.c (grub_ofdisk_open): Get the block
	size of the disk.
	* (grub_ofdisk_get_block_size): New function.
	* (grub_ofdisk_prepare): Use the correct block size.
	* (grub_ofdisk_read): Likewise.
	* (grub_ofdisk_write): Likewise.
	* include/grub/ieee1275/ofdisk.h (grub_ofdisk_get_block_size):
	New proto.
 2013-02-19 09:10:26 +01:00
Vladimir 'phcoder' Serbinenko
cc0e476fe8 * grub-core/commands/lsacpi.c: Fix types on 64-bit platform. 2013-02-06 17:37:29 +01:00
Vladimir 'phcoder' Serbinenko
c5dbdc3357 * grub-core/disk/cryptodisk.c (grub_cryptodisk_scan_device): Don't stop 
on first error.
 2013-02-04 15:36:03 +01:00
Vladimir 'phcoder' Serbinenko
3f078c0fca * grub-core/fs/fshelp.c (find_file): Set oldnode to zero after 
freeing it.
 2013-02-01 21:51:09 +01:00
Vladimir 'phcoder' Serbinenko
66a93674b2 Implement USBDebug (full USB stack variant). 2013-02-01 21:49:29 +01:00
Vladimir 'phcoder' Serbinenko
c9f0c1346e * grub-core/commands/lsacpi.c: Show more info. Hide some boring parts 
unless they have unexpected values.
 2013-02-01 21:45:39 +01:00
Vladimir 'phcoder' Serbinenko
cfe1288b8d * grub-core/bus/usb/usb.c (grub_usb_device_attach): Add missing 
grub_print_error.
 2013-02-01 21:43:49 +01:00
Vladimir 'phcoder' Serbinenko
e42b99698c * grub-core/bus/usb/serial/common.c (grub_usbserial_attach): Fix missing 
zero-out of port structure.
 2013-02-01 21:32:17 +01:00
Vladimir 'phcoder' Serbinenko
cf94fd6209 * grub-core/fs/xfs.c (grub_xfs_read_block): Fix computation in presence 
of extended attributes.
 2013-01-30 09:22:43 +01:00
Andrey Borzenkov
f81ef4b580 * util/grub-install.in: change misleading comment about 
device.map creation
 2013-01-27 16:17:21 +01:00
Vladimir 'phcoder' Serbinenko
af18fdb4df * grub-core/normal/menu_text.c (grub_menu_init_page): Fix behaviour 
when menu highlight color isn't set.
 2013-01-27 16:12:05 +01:00
C. Masloch
08bcec5020 Improve FreeDOS direct loading support compatibility. 
* include/grub/i386/relocator.h (grub_relocator16_state):
	New member ebp.
	* grub-core/lib/i386/relocator.c (grub_relocator16_ebp): New extern
	variable.
	(grub_relocator16_boot): Handle %ebp.
	* grub-core/lib/i386/relocator16.S: Likewise.
	* grub-core/loader/i386/pc/freedos.c:
	Load BPB to pass kernel which partition to load from.
	Check that kernel file is not too large.
	Set register dl to BIOS unit number as well.
 2013-01-27 16:07:25 +01:00
Colin Watson
7782b8a62f * util/grub-reboot.in (usage): Document the need for 
GRUB_DEFAULT=saved.
* util/grub-set-default.in (usage): Likewise.
Reported by: Brian Candler.  Fixes Ubuntu bug #1102925.
 2013-01-22 14:28:32 +00:00
Vladimir 'phcoder' Serbinenko
e661c180ea * grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Include sys/types.h rather 
than defining WORDS_BIGENDIAN manually.
 2013-01-22 07:46:29 +01:00
Vladimir 'phcoder' Serbinenko
1c22ca9a69 * include/grub/kernel.h (FOR_MODULES): Adjust to preserve alignment 
invariants.
 2013-01-21 22:44:20 +01:00
Colin Watson
d44892fed9 * grub-core/font/font.c (blit_comb: do_blit): Make static instead of 
nested.
(blit_comb: add_device_width): Likewise.
 2013-01-21 21:03:26 +00:00
Colin Watson
5fdbaed168 Remove nested functions from USB iterators. 
* include/grub/usb.h (grub_usb_iterate_hook_t): New type.
(grub_usb_controller_iterate_hook_t): Likewise.
(grub_usb_iterate): Add hook_data argument.
(grub_usb_controller_iterate): Likewise.
(struct grub_usb_controller_dev.iterate): Likewise.

Update all implementations and callers.
 2013-01-21 21:02:24 +00:00
Vladimir 'phcoder' Serbinenko
4250985ae8 * grub-core/normal/term.c (print_ucs4_terminal): Don't output right 
margin when not needed.
 2013-01-21 20:33:38 +01:00
Vladimir 'phcoder' Serbinenko
bc1369732f Make color variables global instead of it being per-terminal. 2013-01-21 17:53:41 +01:00
Vladimir 'phcoder' Serbinenko
7d8848f363 * grub-core/commands/ls.c (grub_ls_print_devices): Add missing 
asterisk.
 2013-01-21 17:46:24 +01:00
Colin Watson
ed12a00309 Fix powerpc and sparc64 build failures caused by un-nesting memory 
map iterators.
 2013-01-21 14:41:06 +00:00
Colin Watson
6a0db4492c * grub-core/disk/arc/arcdisk.c (grub_arcdisk_iterate): Fix 
parameter declarations.
 2013-01-21 13:59:28 +00:00
Vladimir 'phcoder' Serbinenko
ccd86b215f * grub-core/commands/lsmmap.c: Fix unused variable on emu. 2013-01-21 14:57:35 +01:00
Vladimir 'phcoder' Serbinenko
822b726b33 Improve spkmomdem reliability by adding a separator between bytes. 2013-01-21 14:55:30 +01:00
Colin Watson
115c2cc180 * grub-core/partmap/msdos.c (embed_signatures): Add the signature of 
an Acer registration utility with several sightings in the wild.
Reported by: Rickard Westman.  Fixes Ubuntu bug #987022.
 2013-01-21 11:10:25 +00:00
Colin Watson
fc524edf65 Remove nested functions from filesystem directory iterators. 
* include/grub/fs.h (grub_fs_dir_hook_t): New type.
(struct grub_fs.dir): Add hook_data argument.

Update all implementations and callers.
 2013-01-21 01:33:46 +00:00
Colin Watson
53d3e4e3df * docs/grub.texi (Multi-boot manual config): Fix typo for 
"recommended".
 2013-01-21 00:05:41 +00:00
Leif Lindholm
c821711f69 * util/grub-mkimage.c (main): Postpone freeing arguments.output 
until after its use in generate_image.
 2013-01-20 23:16:34 +00:00
Colin Watson
6a0debbd91 * grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the 
initrd size to addr_min, since the initrd will be allocated after
this address.
 2013-01-20 23:03:35 +00:00
Andrey Borzenkov
f41e08dbcd * conf/Makefile.common: Fix autogen rules to pass definition 
files on stdin; Makefile.util.am needs Makefile.utilgcry.def
 2013-01-20 23:44:42 +01:00
Leif Lindholm
77529e0fe2 * include/grub/elf.h: Update ARM definitions based on binutils. 2013-01-20 23:01:47 +01:00
Vladimir 'phcoder' Serbinenko
b879aa7b47 Split long USB transfers into short ones. 2013-01-20 22:45:53 +01:00
Andrey Borzenkov
8eb8284d2d * docs/grub.texi (Simple configuration): Clarify GRUB_HIDDEN_TIMEOUT 
is interrupted by ESC.
 2013-01-20 22:42:08 +01:00
Vladimir 'phcoder' Serbinenko
08dad2dcf9 * util/grub-script-check.c (main): Uniform the error message. 2013-01-20 22:05:55 +01:00
Colin Watson
6c724b85b4 Remove nested functions from ELF iterators. 2013-01-20 15:54:09 +00:00
Colin Watson
25239370fd Remove nested functions from device iterators. 
* include/grub/arc/arc.h (grub_arc_iterate_devs_hook_t): New type.
(grub_arc_iterate_devs): Add hook_data argument.
* include/grub/ata.h (grub_ata_dev_iterate_hook_t): New type.
(struct grub_ata_dev.iterate): Add hook_data argument.
* include/grub/device.h (grub_device_iterate_hook_t): New type.
(grub_device_iterate): Add hook_data argument.
* include/grub/disk.h (grub_disk_dev_iterate_hook_t): New type.
(struct grub_disk_dev.iterate): Add hook_data argument.
(grub_disk_dev_iterate): Likewise.
* include/grub/gpt_partition.h (grub_gpt_partition_map_iterate):
Likewise.
* include/grub/msdos_partition.h (grub_partition_msdos_iterate):
Likewise.
* include/grub/partition.h (grub_partition_iterate_hook_t): New
type.
(struct grub_partition_map.iterate): Add hook_data argument.
(grub_partition_iterate): Likewise.
* include/grub/scsi.h (grub_scsi_dev_iterate_hook_t): New type.
(struct grub_scsi_dev.iterate): Add hook_data argument.

Update all callers.
 2013-01-20 15:52:15 +00:00
Colin Watson
6c0314d638 Fix typos for "developer" and "development". 2013-01-20 13:24:47 +00:00
Vladimir 'phcoder' Serbinenko
600dc5f153 Add license header to spkmodem-recv.c. 2013-01-18 11:54:28 +01:00
Vladimir 'phcoder' Serbinenko
17334a6b6a Rewrite spkmodem to use PIT for timing. Double the speed. 2013-01-17 20:06:52 +01:00
Vladimir 'phcoder' Serbinenko
7d462559da Add new command pcidump. 2013-01-16 20:44:11 +01:00
Vladimir 'phcoder' Serbinenko
b78d6c32e3 New terminal outputs using serial: morse and spkmodem. 2013-01-16 20:39:54 +01:00
Vladimir 'phcoder' Serbinenko
34f71cb866 Improve bidi handling in entry editor. 2013-01-16 13:41:16 +01:00
Vladimir 'phcoder' Serbinenko
4542e71b8b * grub-core/script/lexer.c (grub_script_lexer_init): Rename getline 
argument to prevent name collision.
 2013-01-16 09:06:11 +01:00
Colin Watson
09fd6d8293 Remove nested functions from script reading and parsing. 
* grub-core/kern/parser.c (grub_parser_split_cmdline): Add
getline_data argument, passed to getline.
* grub-core/kern/rescue_parser.c (grub_rescue_parse_line): Add
getline_data argument, passed to grub_parser_split_cmdline.
* grub-core/script/lexer.c (grub_script_lexer_yywrap): Pass
lexerstate->getline_data to lexerstate->getline.
(grub_script_lexer_init): Add getline_data argument, saved in
lexerstate->getline_data.
* grub-core/script/main.c (grub_normal_parse_line): Add getline_data
argument, passed to grub_script_parse.
* grub-core/script/script.c (grub_script_parse): Add getline_data
argument, passed to grub_script_lexer_init.
* include/grub/parser.h (grub_parser_split_cmdline): Update
prototype.  Update all callers to pass appropriate getline data.
(struct grub_parser.parse_line): Likewise.
(grub_rescue_parse_line): Likewise.
* include/grub/reader.h (grub_reader_getline_t): Add void *
argument.
* include/grub/script_sh.h (struct grub_lexer_param): Add
getline_data member.
(grub_script_parse): Update prototype.  Update all callers to pass
appropriate getline data.
(grub_script_lexer_init): Likewise.
(grub_normal_parse_line): Likewise.

* grub-core/commands/legacycfg.c (legacy_file_getline): Add unused
data argument.
* grub-core/kern/parser.c (grub_parser_execute: getline): Make
static instead of nested.  Rename to ...
(grub_parser_execute_getline): ... this.
* grub-core/kern/rescue_reader.c (grub_rescue_read_line): Add unused
data argument.
* grub-core/normal/main.c (read_config_file: getline): Make static
instead of nested.  Rename to ...
(read_config_file_getline): ... this.
(grub_normal_read_line): Add unused data argument.
* grub-core/script/execute.c (grub_script_execute_sourcecode:
getline): Make static instead of nested.  Rename to ...
(grub_script_execute_sourcecode_getline): ... this.
* util/grub-script-check.c (main: get_config_line): Make static
instead of nested.
 2013-01-15 12:03:25 +00:00
Colin Watson
d0d4b8a063 Remove nested functions from memory map iterators. 
* grub-core/efiemu/mm.c (grub_efiemu_mmap_iterate): Add hook_data
argument, passed to hook.
* grub-core/kern/i386/coreboot/mmap.c
(grub_linuxbios_table_iterate): Likewise.
(grub_machine_mmap_iterate: iterate_linuxbios_table): Make static
instead of nested.
(grub_machine_mmap_iterate): Add hook_data argument.
* grub-core/kern/i386/multiboot_mmap.c (grub_machine_mmap_iterate):
Add hook_data argument, passed to hook.
* grub-core/kern/i386/pc/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/i386/qemu/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/ieee1275/mmap.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/arc/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/loongson/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/kern/mips/qemu_mips/init.c (grub_machine_mmap_iterate):
Likewise.
* grub-core/mmap/efi/mmap.c (grub_efi_mmap_iterate): Likewise.
(grub_machine_mmap_iterate): Likewise.
* grub-core/mmap/mmap.c (grub_mmap_iterate): Likewise.
* include/grub/efiemu/efiemu.h (grub_efiemu_mmap_iterate): Update
prototype.
* include/grub/memory.h (grub_memory_hook_t): Add data argument.
Remove NESTED_FUNC_ATTR from here and from all users.
(grub_mmap_iterate): Update prototype.
(grub_efi_mmap_iterate): Update prototype.  Update all callers to
pass appropriate hook data.
(grub_machine_mmap_iterate): Likewise.

* grub-core/commands/acpi.c (grub_acpi_create_ebda: find_hook): Make
static instead of nested.
* grub-core/commands/lsmmap.c (grub_cmd_lsmmap: hook): Likewise.
Rename to ...
(lsmmap_hook): ... this.
* grub-core/efiemu/mm.c (grub_efiemu_mmap_init: bounds_hook):
Likewise.
(grub_efiemu_mmap_fill: fill_hook): Likewise.
* grub-core/kern/i386/coreboot/init.c (grub_machine_init:
heap_init): Likewise.
* grub-core/kern/i386/pc/init.c (grub_machine_init: hook): Likewise.
Rename to ...
(mmap_iterate_hook): ... this.
* grub-core/kern/ieee1275/init.c (grub_claim_heap: heap_init):
Likewise.
* grub-core/lib/ieee1275/relocator.c
(grub_relocator_firmware_get_max_events: count): Likewise.
(grub_relocator_firmware_fill_events: fill): Likewise.  Rename
to ...
(grub_relocator_firmware_fill_events_iter): ... this.
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align:
hook): Likewise.  Rename to ...
(grub_relocator_alloc_chunk_align_iter): ... this.
* grub-core/loader/i386/bsd.c (generate_e820_mmap: hook): Likewise.
Rename to ...
(generate_e820_mmap_iter): ... this.
* grub-core/loader/i386/linux.c (find_mmap_size: hook): Likewise.
Rename to ...
(count_hook): ... this.
(grub_linux_boot: hook): Likewise.  Rename to ...
(grub_linux_boot_mmap_find): ... this.
(grub_linux_boot: hook_fill): Likewise.  Rename to ...
(grub_linux_boot_mmap_fill): ... this.
* grub-core/loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap:
hook): Likewise.  Rename to ...
(grub_fill_multiboot_mmap_iter): ... this.
* grub-core/loader/multiboot.c (grub_get_multiboot_mmap_count:
hook): Likewise.  Rename to ...
(count_hook): ... this.
* grub-core/loader/multiboot_mbi2.c (grub_fill_multiboot_mmap:
hook): Likewise.  Rename to ...
(grub_fill_multiboot_mmap_iter): ... this.
* grub-core/loader/powerpc/ieee1275/linux.c
(grub_linux_claimmap_iterate: alloc_mem): Likewise.
* grub-core/loader/sparc64/ieee1275/linux.c (alloc_phys: choose):
Likewise.  Rename to ...
(alloc_phys_choose): ... this.
(determine_phys_base: get_physbase): Likewise.
* grub-core/mmap/i386/mmap.c (grub_mmap_malign_and_register:
find_hook): Likewise.
* grub-core/mmap/i386/pc/mmap.c (preboot: fill_hook): Likewise.
(malloc_hook: count_hook): Likewise.
* grub-core/mmap/i386/uppermem.c (grub_mmap_get_lower: hook):
Likewise.  Rename to ...
(lower_hook): ... this.
(grub_mmap_get_upper: hook): Likewise.  Rename to ...
(upper_hook): ... this.
(grub_mmap_get_post64: hook): Likewise.  Rename to ...
(post64_hook): ... this.
* grub-core/mmap/mips/uppermem.c (grub_mmap_get_lower: hook):
Likewise.  Rename to ...
(lower_hook): ... this.
(grub_mmap_get_upper: hook): Likewise.  Rename to ...
(upper_hook): ... this.
* grub-core/mmap/mmap.c (grub_mmap_iterate: count_hook): Likewise.
(grub_mmap_iterate: fill_hook): Likewise.
(fill_mask): Pass addr and mask within a single struct.
(grub_cmd_badram: hook): Make static instead of nested.  Rename
to ...
(badram_iter): ... this.
(grub_cmd_cutmem: hook): Likewise.  Rename to ...
(cutmem_iter): ... this.
 2013-01-15 12:02:35 +00:00
Vladimir 'phcoder' Serbinenko
22099030ad * grub-core/kern/emu/hostdisk.c (read_device_map): Explicitly 
delimit path in strings using quotes.
	* util/getroot.c (grub_guess_root_devices): Likewise.
	(grub_make_system_path_relative_to_its_root): Likewise.
	* util/grub-probe.c (probe): Likewise.
	* util/ieee1275/ofpath.c (find_obppath): Likewise.
	(xrealpath): Likewise.
 2013-01-13 22:45:16 +01:00
Vladimir 'phcoder' Serbinenko
4a9950ecb0 Fix compilation with older compilers. 
* grub-core/Makefile.core.def (mpi): Add mpi-inline.c.
	* grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Remove redundant
	declarations.
	* grub-core/lib/posix_wrap/string.h: Include sys/types.h.
	* grub-core/lib/posix_wrap/sys/types.h: Add common types.
	* grub-core/lib/xzembed/xz_dec_lzma2.c (dict_put): Replace byte
	identifier with b.
	* grub-core/lib/xzembed/xz_dec_stream.c (dec_vli): Likewise.
	* include/grub/crypto.h: Add type defines.
	* util/import_gcrypth.sed: Remove duplicate type defines.
 2013-01-13 21:06:25 +01:00