mirror of
https://git.proxmox.com/git/grub2
synced 2025-08-05 10:23:46 +00:00
992ffbbebb
* normal/misc.c: New file.
* DISTLIST: Added normal/misc.c.
* partmap/amiga.c (amiga_partition_map_iterate): Add an argument
DISK to HOOK. Call HOOK with DISK.
* partmap/apple.c (apple_partition_map_iterate): Likewise.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/sun.c (sun_partition_map_iterate): Likewise.
* normal/menu_entry.c (struct screen): Added a new member
"completion_shown".
(completion_buffer): New global variable.
(make_screen): Set SCREEN->COMPLETION_SHOWN to zero.
(store_completion): New function.
(complete): Likewise.
(clear_completions): Likewise.
(grub_menu_entry_run): If SCREEN->COMPLETION_SHOWN is non-zero,
call clear_completions and reset SCREEN->COMPLETION_SHOWN. If C is
a tab, call complete.
* normal/completion.c (disk_dev): Removed.
(print_simple_completion): Likewise.
(print_partition_completion): Likewise.
(print_func): New global variable.
(add_completion): Do not take the arguments WHAT or PRINT any
longer. Added a new argument TYPE. Instead of printing directly,
call PRINT_FUNC if not NULL.
All callers changed.
(complete_device): Use a local variable DEV instead of
DISK_DEV. Do not move CURRENT_WORD to the end of a device name.
(grub_normal_do_completion): Take a new argument HOOK. Do not
initialize DISK_DEV. Initialize PRINT_FUNC to HOOK. If RET is an
empty string, return NULL instead.
All callers changed.
* normal/cmdline.c (print_completion): New function.
* kern/partition.c (grub_partition_iterate): Add an argument DISK
to HOOK.
All callers changed.
* kern/disk.c (grub_print_partinfo): Removed.
* include/grub/partition.h (struct grub_partition_map): Add a new
argument DISK into HOOK of ITERATE.
(grub_partition_iterate): Add a new argument DISK to HOOK.
* include/grub/normal.h (enum grub_completion_type): New enum.
(grub_completion_type_t): New type.
(GRUB_COMPLETION_TYPE_COMMAND): New constant.
(GRUB_COMPLETION_TYPE_DEVICE): Likewise.
(GRUB_COMPLETION_TYPE_PARTITION): Likewise.
(GRUB_COMPLETION_TYPE_FILE): Likewise.
(grub_normal_do_completion): Added a new argument HOOK.
(grub_normal_print_device_info): New prototype.
* include/grub/disk.h (grub_print_partinfo): Removed.
* conf/i386-pc.rmk (grub_emu_SOURCES): Added normal/misc.c.
(normal_mod_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
* commands/ls.c (grub_ls_list_disks): Use
grub_normal_print_device_info instead of grub_print_partinfo. Free
PNAME.
(grub_ls_list_files): Use grub_normal_print_device_info instead of
duplicating the code.
109 lines
3.2 KiB
C
109 lines
3.2 KiB
C
/*
|
||
* GRUB -- GRand Unified Bootloader
|
||
* Copyright (C) 1999,2000,2001,2002,2004 Free Software Foundation, Inc.
|
||
*
|
||
* GRUB is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2 of the License, or
|
||
* (at your option) any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with GRUB; if not, write to the Free Software
|
||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||
*/
|
||
|
||
#ifndef GRUB_PART_HEADER
|
||
#define GRUB_PART_HEADER 1
|
||
|
||
#include <grub/dl.h>
|
||
|
||
struct grub_disk;
|
||
|
||
typedef struct grub_partition *grub_partition_t;
|
||
|
||
/* Partition map type. */
|
||
struct grub_partition_map
|
||
{
|
||
/* The name of the partition map type. */
|
||
const char *name;
|
||
|
||
/* Call HOOK with each partition, until HOOK returns non-zero. */
|
||
grub_err_t (*iterate) (struct grub_disk *disk,
|
||
int (*hook) (struct grub_disk *disk, const grub_partition_t partition));
|
||
|
||
/* Return the partition named STR on the disk DISK. */
|
||
grub_partition_t (*probe) (struct grub_disk *disk,
|
||
const char *str);
|
||
|
||
/* Return the name of the partition PARTITION. */
|
||
char *(*get_name) (const grub_partition_t partition);
|
||
|
||
/* The next partition map type. */
|
||
struct grub_partition_map *next;
|
||
};
|
||
typedef struct grub_partition_map *grub_partition_map_t;
|
||
|
||
/* Partition description. */
|
||
struct grub_partition
|
||
{
|
||
/* The start sector. */
|
||
unsigned long start;
|
||
|
||
/* The length in sector units. */
|
||
unsigned long len;
|
||
|
||
/* The offset of the partition table. */
|
||
unsigned long offset;
|
||
|
||
/* The index of this partition in the partition table. */
|
||
int index;
|
||
|
||
/* Partition map type specific data. */
|
||
void *data;
|
||
|
||
/* The type partition map. */
|
||
grub_partition_map_t partmap;
|
||
};
|
||
|
||
grub_partition_t EXPORT_FUNC(grub_partition_probe) (struct grub_disk *disk,
|
||
const char *str);
|
||
grub_err_t EXPORT_FUNC(grub_partition_iterate) (struct grub_disk *disk,
|
||
int (*hook) (struct grub_disk *disk, const grub_partition_t partition));
|
||
char *EXPORT_FUNC(grub_partition_get_name) (const grub_partition_t partition);
|
||
|
||
int EXPORT_FUNC(grub_partition_map_iterate) (int (*hook) (const grub_partition_map_t partmap));
|
||
|
||
void EXPORT_FUNC(grub_partition_map_register) (grub_partition_map_t partmap);
|
||
|
||
void EXPORT_FUNC(grub_partition_map_unregister) (grub_partition_map_t partmap);
|
||
|
||
#ifdef GRUB_UTIL
|
||
void grub_pc_partition_map_init (void);
|
||
void grub_pc_partition_map_fini (void);
|
||
void grub_amiga_partition_map_init (void);
|
||
void grub_amiga_partition_map_fini (void);
|
||
void grub_apple_partition_map_init (void);
|
||
void grub_apple_partition_map_fini (void);
|
||
void grub_sun_partition_map_init (void);
|
||
void grub_sun_partition_map_fini (void);
|
||
#endif
|
||
|
||
static inline unsigned long
|
||
grub_partition_get_start (const grub_partition_t p)
|
||
{
|
||
return p->start;
|
||
}
|
||
|
||
static inline unsigned long
|
||
grub_partition_get_len (const grub_partition_t p)
|
||
{
|
||
return p->len;
|
||
}
|
||
|
||
#endif /* ! GRUB_PART_HEADER */
|