2dc163bf69
ieee1275: Fix segfault in grub-ofpathname
...
Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2017-12-06 12:55:55 +01:00
ae5540d3d4
Move set_program_name and init_nls to host_init. On windows
...
fix in this fuction console and argument charset as well.
2013-10-13 20:03:42 +02:00
9a2c903f28
* util/ieee1275/ofpath.c: Move to ...
...
* grub-core/osdep/linux/ofpath.c: ..here, split stub into ...
* grub-core/osdep/basic/ofpath.c: ..here.
2013-10-08 18:25:49 +02:00
8c8c87b7d4
* util/ieee1275/ofpath.c (grub_util_devname_to_ofpath) [_WIN32]:
...
Replace with a dummy.
2013-08-22 17:29:23 +02:00
1dd70ebd58
* util/ieee1275/ofpath.c (of_path_of_scsi): Fix path output for sas
...
disks.
(check_sas): Get sas_adress info.
2013-04-27 22:03:13 +02:00
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
007ae52dac
* util/ieee1275/ofpath.c (of_path_of_scsi): Fix wrong format specifier.
2012-06-04 23:15:54 +02:00
4557a36d2c
Handle IBM OFW path.
...
* util/ieee1275/ofpath.c (find_obppath): Use devspec if obppath isn't
available.
(of_path_of_scsi): Handle vdevice.
2012-06-04 22:37:39 +02:00
0d3d137e79
* util/ieee1275/ofpath.c (check_sas): Fix sas path.
2012-06-02 14:53:23 +02:00
48afcb75fa
* util/ieee1275/ofpath.c (my_isdigit): New function.
...
(trailing_digits): Use my_isdigit.
(strip_trailing_digits): Likewise.
2012-03-02 11:21:01 +01:00
d9dbf11e16
* util/ieee1275/ofpath.c: Rename devname to sys_devname everywhere to
...
avoid conflicts.
2012-02-29 14:10:04 +01:00
0c42a45dcc
* util/ieee1275/grub-ofpathname.c: Add missing config.h include.
2012-02-29 14:08:58 +01:00
dbebaf9291
* util/ieee1275/ofpath.c: Remove include of malloc.h since stdlib is
...
already included.
Reported by: Eren D.
2012-02-22 16:50:14 +01:00
b525fd834d
Clarify and unify messages.
...
* grub-core/commands/hashsum.c (options): Unify messages.
* grub-core/commands/keystatus.c (GRUB_MOD_INIT): Don't mark a
literal-only message as translatable.
* grub-core/commands/lsacpi.c (GRUB_MOD_INIT): Likewise.
* grub-core/loader/ia64/efi/linux.c (GRUB_MOD_INIT): Likewise.
* grub-core/commands/legacycfg.c (GRUB_MOD_INIT): Add quoting around
commands.
* grub-core/commands/menuentry.c (options): Clarify that it's a keyboard
key, not the key used to unlock. Clarify what it's used for.
* grub-core/kern/emu/hostdisk.c (read_device_map): Unify error message.
* grub-core/loader/xnu.c (grub_xnu_load_driver): Remove erroneous colon.
* grub-core/script/main.c (GRUB_MOD_INIT): Clarify [n] to be [NUM].
* util/grub-editenv.c (options): Unify "verbose" message.
* util/grub-fstest.c (read_file): Unify error message.
(fstest): Add quotes around commands.
(options): Unify "verbose" message.
* util/grub-install.in: Add quotes around variable name.
* util/grub-kbdcomp.in: Unify error message.
* util/grub-mkfont.c (main): Likewise.
* util/grub-mkrescue.in: Likewise.
* util/grub-mklayout.c (options): Unify "verbose" message.
* util/grub-mkstandalone.in: Unify help and verbose messages.
* util/grub-mount.c (options): Unify "verbose" message.
* util/grub-probe.c (options): Likewise.
* util/grub-script-check.c (options): Likewise.
* util/grub-setup.c (setup): Unify no-terminator message.
(options): Use DEVICE and not DEV.
Unify "verbose" message.
* util/ieee1275/ofpath.c (xrealpath): Unify error message.
2012-02-05 11:23:47 +01:00
0ae70393ba
Improve and unify messages.
...
* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors): Add argument
name. All users updated.
Print filename in error.
(read_device_map): Print filename in error.
* util/getroot.c (grub_guess_root_devices): Print filename in error.
(grub_util_get_os_disk): Likewise.
(grub_util_biosdisk_get_grub_dev): Likewise.
(grub_util_check_block_device): Likewise.
(grub_util_check_char_device): Likewise.
(grub_make_system_path_relative_to_its_root): Likewise.
* util/grub-editenv.c (create_envblk_file): Likewise.
(open_envblk_file): Likewise.
(write_envblk): Likewise.
* util/grub-fstest.c (cmd_cp): Likewise.
(cmd_cat): Likewise.
(cmd_cmp): Likewise.
* util/grub-menulst2cfg.c (main): Likewise.
* util/grub-mkfont.c (write_font_ascii_bitmap): Likewise.
(write_font_width_spec): Likewise.
(write_font_pf2): Likewise.
* util/grub-mkimage.c (generate_image): New argument outname.
All users updated.
Remove unreacheable message.
(options): Unify messages.
(help_filter): Likewise.
* util/grub-mklayout.c (usage): Removed (unused).
(main): Print filename in error.
* util/grub-mkrescue.in: Fix wrong quoting.
* util/grub-setup.c (setup): Print filename in error.
* util/ieee1275/ofpath.c (vendor_is_ATA): Likewise.
(check_sas): Likewise.
* util/misc.c (grub_util_get_fp_size): Removed.
(grub_util_get_image_size): Print filename in error.
(grub_util_read_at): Removed.
(grub_util_read_image): Print filename in error.
(grub_util_load_image): Likewise.
(grub_util_write_image_at): New argument filename. All users updated.
Print filename in error.
(grub_util_write_image): New argument filename. All users updated.
Print filename in error.
* util/raid.c (grub_util_raid_getmembers): Print filename in error.
* util/resolve.c (grub_util_resolve_dependencies): Likewise.
2012-02-05 11:07:33 +01:00
5f47782c29
Eliminate ofpath limits and possible overflows.
...
* util/ieee1275/ofpath.c (grub_util_info) [STANDALONE]: New function.
(OF_PATH_MAX): Removed.
(MAX_DISK_CAT): New const.
(find_obppath): Use allocated rather than preallocated buffer.
Return result. Argument of_path removed. All users updated.
Add missing fdstat.
(xrealpath): New function.
(block_device_get_sysfs_path_and_link): Remove sysfs argument.
Allocate rather than use preallocated buffer. All users updated.
(__of_path_common): Use allocated rather than preallocatecd buffer.
Return result. Argument of_path removed. All users updated.
(vendor_is_ATA): Read only needed part form the file.
(check_sas): Allocate depending on contents rather than fixed.
(main) [STANDALONE]: Handle NULL result.
2012-01-29 18:51:21 +01:00
2b5c1a0810
merge mainline into hints
2011-12-24 02:52:43 +01:00
165099ea42
* util/ieee1275/ofpath.c (of_path_of_ide): Fix address for secondary
...
channel.
2011-12-24 02:46:47 +01:00
2980502850
Fix few bugs and memory leaks
2011-12-23 19:25:24 +01:00
17785932df
merge mainline into hints
2011-12-23 18:49:00 +01:00
6babad5e59
Initial integration of hints
2011-12-23 18:19:16 +01:00
10f0117bf9
* grub-core/commands/efi/fixvideo.c: Gettextize.
...
* grub-core/commands/hashsum.c: Likewise.
* grub-core/commands/i386/cmostest.c: Likewise.
* grub-core/commands/i386/pc/drivemap.c: Likewise.
* grub-core/commands/i386/pc/lsapm.c: Likewise.
* grub-core/commands/i386/pc/sendkey.c: Likewise.
* grub-core/commands/lsmmap.c: Likewise.
* grub-core/commands/menuentry.c: Likewise.
* grub-core/commands/mips/loongson/lsspd.c: Likewise.
* grub-core/commands/setpci.c: Likewise.
* grub-core/loader/i386/bsd.c: Likewise.
* grub-core/loader/i386/linux.c: Likewise.
* util/getroot.c: Likewise.
* util/grub-editenv.c: Likewise.
* util/grub-fstest.c: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mkimage.c: Likewise.
* util/grub-mkpasswd-pbkdf2.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/grub-setup.c: Likewise.
* util/ieee1275/ofpath.c: Likewise.
* util/misc.c: Likewise.
* util/raid.c: Likewise.
2011-11-12 00:34:14 +01:00
6e0632e28c
* grub-core/commands/acpihalt.c: Gettextized.
...
* grub-core/commands/cacheinfo.c: Likewise.
* grub-core/commands/cmp.c: Likewise.
* grub-core/commands/efi/loadbios.c: Likewise.
* grub-core/commands/gptsync.c: Likewise.
* grub-core/commands/ieee1275/suspend.c: Likewise.
* grub-core/commands/legacycfg.c: Likewise.
* grub-core/commands/memrw.c: Likewise.
* grub-core/commands/minicmd.c: Likewise.
* grub-core/commands/parttool.c: Likewise.
* grub-core/commands/time.c: Likewise.
* grub-core/commands/videoinfo.c: Likewise.
* grub-core/disk/geli.c: Likewise.
* grub-core/disk/i386/pc/biosdisk.c: Likewise.
* grub-core/disk/luks.c: Likewise.
* grub-core/disk/lvm.c: Likewise.
* grub-core/font/font_cmd.c: Likewise.
* grub-core/fs/zfs/zfscrypt.c: Likewise.
* grub-core/fs/zfs/zfsinfo.c: Likewise.
* grub-core/gfxmenu/view.c: Likewise.
* grub-core/kern/emu/hostdisk.c: Likewise.
* grub-core/kern/emu/main.c: Likewise.
* grub-core/kern/emu/misc.c: Likewise.
* grub-core/kern/emu/mm.c: Likewise.
* grub-core/kern/mips/arc/init.c: Likewise.
* grub-core/kern/mips/loongson/init.c: Likewise.
* grub-core/kern/partition.c: Likewise.
* grub-core/lib/i386/halt.c: Likewise.
* grub-core/lib/mips/arc/reboot.c: Likewise.
* grub-core/lib/mips/loongson/reboot.c: Likewise.
* grub-core/loader/i386/pc/chainloader.c: Likewise.
* grub-core/loader/i386/xnu.c: Likewise.
* grub-core/loader/multiboot.c: Likewise.
* grub-core/net/bootp.c: Likewise.
* grub-core/net/net.c: Likewise.
* grub-core/normal/term.c: Likewise.
* grub-core/partmap/bsdlabel.c: Likewise.
* grub-core/parttool/msdospart.c: Likewise.
* grub-core/term/gfxterm.c: Likewise.
* grub-core/term/terminfo.c: Likewise.
* grub-core/video/i386/pc/vbe.c: Likewise.
* util/grub-menulst2cfg.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-mklayout.c: Likewise.
* util/grub-mkrelpath.c: Likewise.
* util/grub-script-check.c: Likewise.
* util/ieee1275/grub-ofpathname.c: Likewise.
* util/resolve.c: Likewise.
2011-11-11 21:44:56 +01:00
f8bc22a832
* util/ieee1275/grub-ofpathname.c: Add missing include.
2011-10-23 23:20:11 +02:00
b28c56559b
* util/ieee1275/grub-ofpathname.c (main): Handle --help and --version
...
so that help2man doesn't fail.
2011-06-27 12:16:00 +02:00
fe12fd5b43
* util/ieee1275/ofpath.c (check_sas): Close fd.
...
(main): Free of_path.
Reported by: David Volgyes <dvolgyes>.
2011-06-23 22:18:31 +02:00
0b5e127b0d
* util/ieee1275/ofpath.c (grub_util_devname_to_ofpath): Use the
...
realpath'ed device string.
Handle floppy (somewhat).
Issue error in unknown case rather than garbage.
Reported by: Axel Beckert.
2011-01-12 19:58:32 +01:00
8111f933ec
remove ieee1275/grub-install and adapt grub-install for ieee1275
2010-08-30 19:30:34 +02:00
463711215f
* util/ieee1275/grub-install.in: Don't use empty grub_device.
...
Reported by: Lennart Sorensen.
2010-07-28 18:25:48 +03:00
d6d0c209d9
merge with mainline
2010-06-12 16:21:10 +05:30
0ea7c4f93c
Make --version uniform and avoid hard-coded program name.
2010-06-08 12:52:42 +02:00
88d046d01e
Switch to new grub-mkimage syntax
2010-04-26 21:27:41 +02:00
6e86896ed8
Use ofpathname in grub-setup on sparc
2010-04-18 14:02:13 +02:00
b02c7c8fb5
added getopt like error for missing option parameters
2010-04-12 21:33:03 +05:30
8f33d5549f
merged with mainline
2010-04-12 20:47:25 +05:30
50479febcf
* util/grub-install.in: Use mkdir -p to create grub directory.
...
* util/i386/efi/grub-install.in: Likewise.
* util/ieee1275/grub-install.in: Likewise.
2010-04-03 20:48:36 +02:00
09f38ecd5a
fix remaining scripts
2010-02-07 10:31:04 +05:30
85f90358b1
Remove part_ prefix
2010-02-06 19:33:53 +01:00
bf7fcba2d7
2010-01-28 Christian Schmitt <chris@ilovelinux.de>
...
* util/ieee1275/grub-install.in: Fix nvsetenv arguments.
2010-01-28 23:10:37 +01:00
70a14d3d49
2010-01-16 Carles Pina i Estany <carles@pina.cat>
...
* util/misc.c (grub_util_warn): Gettextizze, print full stop after
the message.
(grub_util_info): Likewise.
(grub_util_error): Likewise.
* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
and/or new lines in `grub_util_warna', `grub_util_info',
`grub_util_error' calls.
* util/getroot.c: Likewise.
* util/grub-editenv.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-fstest.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mkpasswd-pbkdf2.c: Likewise.
* util/grub-mkrelpath.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/hostdisk.c: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/ieee1275/ofpath.c: Likewise.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/write.c: Likewise.
* util/raid.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
2010-01-16 00:26:52 +00:00
bc11fee9f5
merge from trunk
2010-01-05 10:53:03 +00:00
e0a6ca52f2
2009-12-19 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/types.h (UNUSED): Removed since it conflicts with
NetBSD headers. All users changed to direct __attribute__ ((unused)).
Reported by Grégoire Sutre.
2009-12-20 14:09:16 +01:00
242f0731c7
reimported savedefault by cjwatson and myself
...
Also-By: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
2009-11-20 09:41:20 +01:00
67e23c9004
* disk/ieee1275/ofdisk.c (compute_dev_path): New.
...
(grub_ofdisk_open): Use it to un-escape "," characters.
* kern/disk.c (find_part_sep): New.
(grub_disk_open): Use it to find the first non-escaped ','
character in the disk name.
* util/ieee1275/devicemap.c (escape_of_path): New.
(grub_util_emit_devicemap_entry): Use it.
* util/sparc64/ieee1275/grub-install.in: Update script to
strip partition specifiers properly by not triggering on
'\' escaped ',' characters.
2009-05-04 23:13:53 +00:00
a1447506fe
* util/sparc64/ieee1275/misc.c: New file.
...
* util/sparc64/ieee1275/grub-setup.c: New file.
* util/sparc64/ieee1275/grub-ofpathname.c: New file.
* util/sparc64/ieee1275/grub-mkimage.c: New file.
* util/sparc64/ieee1275/grub-install.in: New file.
* util/ieee1275/ofpath.c: New file.
* util/ieee1275/devicemap.c: New file.
* util/devicemap.c: New file.
* util/deviceiter.c: New file.
* kern/sparc64/ieee1275/init.c: New file.
* include/grub/util/ofpath.h: New file.
* include/grub/util/deviceiter.h: New file.
* util/grub-mkdevicemap.c: Include deviceiter.h.
Implement using grub_util_emit_devicemap_entry and
grub_util_iterate_devices.
* conf/i386-corebook.rmk: Build util/deviceiter.c and
util/devicemap.c into grub-mkdevicemap
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Add rules to build boot block
images and installation utilities. Build kernel as image
instead of as elf binary. Use common rules as much as possible.
2009-04-22 09:57:39 +00:00
0e981d36bb
Forgot to remove files / run autogen.sh
2008-09-25 14:17:43 +00:00
d2a367b86f
2008-09-25 Robert Millan <rmh@aybabtu.com>
...
* conf/i386-pc.rmk (grub_mkdevicemap_SOURCES): Remove
`util/i386/get_disk_name.c'.
* conf/i386-efi.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk (grub_mkdevicemap_SOURCES): Remove
`util/ieee1275/get_disk_name.c'.
* include/grub/util/misc.h (grub_util_get_disk_name): Remove.
* util/ieee1275/get_disk_name.c: Remove file.
* util/i386/get_disk_name.c: Remove file.
* util/grub-mkdevicemap.c (make_device_map): Back to hardcoding
"hd%d" for device.map entries, rather than using
grub_util_get_disk_name().
2008-09-25 14:15:24 +00:00
eba0ce9f97
2008-08-14 Robert Millan <rmh@aybabtu.com>
...
* conf/common.rmk (bin_UTILITIES): Add `grub-mkelfimage'.
(grub_mkelfimage_SOURCES): New variable.
(util/elf/grub-mkimage.c_DEPENDENCIES): Likewise.
* conf/i386-coreboot.rmk (bin_UTILITIES, grub_mkimage_SOURCES)
(grub_mkimage_LDFLAGS, util/elf/grub-mkimage.c_DEPENDENCIES): Remove.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* kern/ieee1275/init.c: Include `<grub/cpu/kernel.h>'.
* kern/i386/coreboot/init.c: Likewise.
* kern/i386/ieee1275/startup.S: Replace `<grub/machine/kernel.h>'
with `<grub/cpu/kernel.h>'.
(GRUB_KERNEL_MACHINE_PREFIX, GRUB_KERNEL_MACHINE_DATA_END): Renamed
to ...
(GRUB_KERNEL_CPU_PREFIX, GRUB_KERNEL_CPU_DATA_END): ... this.
* kern/i386/coreboot/startup.S: Likewise.
* include/grub/powerpc/ieee1275/kernel.h (GRUB_MOD_ALIGN)
(GRUB_MOD_GAP): Remove.
* include/grub/powerpc/kernel.h: New file.
* include/grub/i386/ieee1275/kernel.h (GRUB_KERNEL_MACHINE_PREFIX)
(GRUB_KERNEL_MACHINE_DATA_END): Remove.
* include/grub/i386/kernel.h: New file.
* include/grub/i386/coreboot/kernel.h (GRUB_MOD_ALIGN)
(GRUB_MOD_GAP, GRUB_KERNEL_MACHINE_PREFIX)
(GRUB_KERNEL_MACHINE_DATA_END): Remove.
* util/ieee1275/grub-install.in (grub_mkimage): Initialize to use
`grub-mkelfimage'.
Use --directory when invoking grub_mkimage.
* util/elf/grub-mkimage.c: Include `<grub/cpu/kernel.h>'.
(add_segments): Replace GRUB_KERNEL_MACHINE_DATA_END and
GRUB_KERNEL_MACHINE_PREFIX with GRUB_KERNEL_CPU_DATA_END
and GRUB_KERNEL_CPU_PREFIX.
2008-08-14 18:59:33 +00:00
eee96e0837
2008-05-29 Robert Millan <rmh@aybabtu.com>
...
* util/powerpc/ieee1275/grub-install.in: Move from here ...
* util/ieee1275/grub-install.in: ... to here.
* powerpc-ieee1275.rmk (grub_install_SOURCES): Update location.
* i386-ieee1275.rmk (sbin_SCRIPTS): New variable.
(grub_install_SOURCES): Likewise.
2008-05-29 16:27:24 +00:00
070e49e4e8
2008-04-04 Pavel Roskin <proski@gnu.org>
...
* kern/powerpc/ieee1275/cmain.c (grub_ieee1275_find_options):
Fix signedness warnings.
* kern/powerpc/ieee1275/openfw.c (grub_available_iterate):
Likewise.
* util/ieee1275/get_disk_name.c: Include config.h so that
_GNU_SOURCE is defined and getline() is declared. Mark an
unused argument as such. Fix a signedness warning.
2008-04-04 06:45:07 +00:00
Eric Snowberg