Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-12-31 08:30:51 +00:00
Code Issues Projects Releases Wiki Activity

is_url() becomes emile_is_url(), check if ramdisk is url too

Browse Source
This commit is contained in:
Laurent Vivier 2006-06-05 22:34:50 +00:00
parent e43e6e49fe
commit 4fc3d7c0d4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libemile/emile_floppy_create_image.c
View File

@ -90,6 +90,14 @@ static int pad_image(int fd, int size)
return total;
}
int emile_is_url(char *path)
{
return path && ((strncmp(path, "iso9660:", strlen("iso9660:")) == 0) ||
(strncmp(path, "container:", strlen("container:")) == 0) ||
(strncmp(path, "block:", strlen("block:")) == 0) ||
(strncmp(path, "ext2:", strlen("ext2")) == 0));
}
static int aggregate(int fd, char* first_level, char* second_level, char* kernel_image, char* ramdisk)
{
int ret;
@ -105,7 +113,7 @@ static int aggregate(int fd, char* first_level, char* second_level, char* kernel
return EEMILE_CANNOT_WRITE_SECOND;
total += ret;
if (kernel_image != NULL)
if (kernel_image && !emile_is_url(kernel_image))
{
ret = copy_file(fd, kernel_image);
if (ret < 0)
@ -113,7 +121,7 @@ static int aggregate(int fd, char* first_level, char* second_level, char* kernel
total += ret;
}
if (ramdisk != NULL)
if (ramdisk && !emile_is_url(ramdisk))
{
ret = copy_file(fd, ramdisk);
if (ret < 0)
@ -128,13 +136,6 @@ static int aggregate(int fd, char* first_level, char* second_level, char* kernel
return 0;
}
int emile_is_url(char *path)
{
return path && ((strncmp(path, "iso9660:", strlen("iso9660:")) == 0) ||
(strncmp(path, "container:", strlen("container:")) == 0) ||
(strncmp(path, "block:", strlen("block:")) == 0) ||
(strncmp(path, "ext2:", strlen("ext2")) == 0));
}
int emile_floppy_create_image(char* first_level, char* second_level,
char* kernel_image, char* ramdisk,
char* image)
@ -182,11 +183,11 @@ int emile_floppy_create_image(char* first_level, char* second_level,
kernel_url = tmp_kernel;
}
if ( emile_is_url(ramdisk) )
if ( ramdisk && emile_is_url(ramdisk) )
{
ramdisk_url = ramdisk;
}
else
else if (ramdisk)
{
sprintf(tmp_ramdisk,
"block:(fd0)0x%lx,0x%lx\n", FIRST_LEVEL_SIZE +