Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-06-12 19:22:46 +00:00
Code Issues Projects Releases Wiki Activity

don't check if a file is gzipped (cannot manage correctly ramdisk), add "vga default" parameter

Browse Source
This commit is contained in:
Laurent Vivier 2007-08-31 22:34:39 +00:00
parent d9885d3bf2
commit 18f005c3a0
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libemile/emile_floppy_create_image.c
View File

@ -150,23 +150,6 @@ int emile_floppy_create(char *image, char* first_level, char* second_level)
return fd;
}
static int is_gzipped(char *name)
{
int fd;
unsigned char magic[2];
magic[0] = magic[1] = 0;
fd = open(name, O_RDONLY);
if (fd == -1)
return 0;
read(fd, magic, 2);
close(fd);
return (magic[0] == 0x1f) && (magic[1] == 0x8b);
}
char* emile_floppy_add(int fd, char *image)
{
off_t offset;
@ -183,10 +166,7 @@ char* emile_floppy_add(int fd, char *image)
if (size == -1)
return NULL;
if (is_gzipped(image))
sprintf(buf, "block:(fd0)0x%lx", offset);
else
sprintf(buf, "block:(fd0)0x%lx,0x%zx", offset, size);
sprintf(buf, "block:(fd0)0x%lx,0x%zx", offset, size);
return strdup(buf);
}
@ -242,7 +222,7 @@ int emile_floppy_create_image(char* first_level, char* second_level,
/* set second level info */
ret = emile_second_set_param(fd, kernel_url, "", ramdisk_url);
ret = emile_second_set_param(fd, kernel_url, "vga default", ramdisk_url);
emile_floppy_close(fd);