vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make menus work again.

Browse source
This commit is contained in:
gord 1999-05-03 22:49:53 +00:00
parent 0efa52337e
commit d654cfa0fd
4 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
1999-05-03 Gordon Matzigkeit <gord@trick.fig.org>
From Pavel Roskin:
* shared_src/shared.h: Redeclare.
* grub/main.c (main): Use strncpy rather than pointer assignment
to set the config file name.
* grub/asmstub.c: Make config_file a static array, not a pointer.
Correct the value of VERSION_STRING.
1999-04-10 Gordon Matzigkeit <gord@trick.fig.org> 1999-04-10 Gordon Matzigkeit <gord@trick.fig.org>
* debian/rules (build): Install into /lib instead of /share. * debian/rules (build): Install into /lib instead of /share.

24
grub/asmstub.c
View file

@ -60,8 +60,8 @@ int grub_stage2 (void);
unsigned long install_partition = 0x20000; unsigned long install_partition = 0x20000;
unsigned long boot_drive = 0; unsigned long boot_drive = 0;
char version_string[] = "0.5"; char version_string[] = VERSION;
char *config_file = "/boot/grub/menu.lst"; char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
/* Emulation requirements. */ /* Emulation requirements. */
char *grub_scratch_mem = 0; char *grub_scratch_mem = 0;
@ -123,16 +123,16 @@ grub_stage2 (void)
assert (device_map == 0); assert (device_map == 0);
device_map = malloc (NUM_DISKS * sizeof (char *)); device_map = malloc (NUM_DISKS * sizeof (char *));
assert (device_map); assert (device_map);
/* Probe devices for creating the device map. */ /* Probe devices for creating the device map. */
/* Iniitialize DEVICE_MAP. */ /* Iniitialize DEVICE_MAP. */
memset (device_map, 0, NUM_DISKS * sizeof (char *)); memset (device_map, 0, NUM_DISKS * sizeof (char *));
/* Floppies. */ /* Floppies. */
device_map[0] = strdup ("/dev/fd0"); device_map[0] = strdup ("/dev/fd0");
device_map[1] = strdup ("/dev/fd1"); device_map[1] = strdup ("/dev/fd1");
/* IDE disks. */ /* IDE disks. */
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
@ -156,7 +156,7 @@ grub_stage2 (void)
device_map[i + 0x80] = strdup (name); device_map[i + 0x80] = strdup (name);
} }
first_scsi_disk = i + 0x80; first_scsi_disk = i + 0x80;
/* The rest is SCSI disks. */ /* The rest is SCSI disks. */
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
@ -170,7 +170,7 @@ grub_stage2 (void)
#endif #endif
device_map[i + first_scsi_disk] = name; device_map[i + first_scsi_disk] = name;
} }
/* Check some invariants. */ /* Check some invariants. */
assert ((SCRATCHSEG << 4) == SCRATCHADDR); assert ((SCRATCHSEG << 4) == SCRATCHADDR);
assert ((BUFFERSEG << 4) == BUFFERADDR); assert ((BUFFERSEG << 4) == BUFFERADDR);
@ -412,7 +412,7 @@ getkey (void)
return c; return c;
} }
#endif #endif
return getchar (); return getchar ();
} }
@ -432,7 +432,7 @@ checkkey (void)
return c; return c;
} }
#endif #endif
/* Just pretend they hit the space bar. */ /* Just pretend they hit the space bar. */
return ' '; return ' ';
} }
@ -473,10 +473,10 @@ get_diskinfo (int drive, struct geometry *geometry)
/* The unpartitioned device name: /dev/XdX */ /* The unpartitioned device name: /dev/XdX */
char *devname = device_map[drive]; char *devname = device_map[drive];
char buf[512]; char buf[512];
if (! devname) if (! devname)
return -1; return -1;
/* Open read/write, or read-only if that failed. */ /* Open read/write, or read-only if that failed. */
disks[drive].flags = open (devname, O_RDWR); disks[drive].flags = open (devname, O_RDWR);
if (! disks[drive].flags) if (! disks[drive].flags)
@ -489,7 +489,7 @@ get_diskinfo (int drive, struct geometry *geometry)
disks[drive].flags = 0; disks[drive].flags = 0;
return -1; return -1;
} }
if (disks[drive].flags) if (disks[drive].flags)
{ {
#ifdef __linux__ #ifdef __linux__

3
grub/main.c
View file

@ -130,7 +130,8 @@ main (int argc, char **argv)
break; break;
case OPT_CONFIG_FILE: case OPT_CONFIG_FILE:
config_file = strdup (optarg); strncpy (config_file, optarg, 127); /* FIXME: arbitrary */
config_file[127] = '\0';
break; break;
case OPT_INSTALL_PARTITION: case OPT_INSTALL_PARTITION:

2
shared_src/shared.h
View file

@ -280,7 +280,7 @@ typedef enum
extern unsigned long install_partition; extern unsigned long install_partition;
extern unsigned long boot_drive; extern unsigned long boot_drive;
extern char version_string[]; extern char version_string[];
extern char *config_file; extern char config_file[];
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
/* If not using config file, this variable is set to zero, /* If not using config file, this variable is set to zero,