summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/tools.c
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-08-24 19:11:07 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-08-24 19:11:07 +0000
commit1bf4d043db7302d4b5b5a517044271d85064e30b (patch)
tree3560a71e9e942dc903d7b5347db1221dbab0ba42 /mdk-stage1/tools.c
parenta7e7894247de459f0be84c29c45f39c35a595b4d (diff)
downloaddrakx-backup-do-not-use-1bf4d043db7302d4b5b5a517044271d85064e30b.tar
drakx-backup-do-not-use-1bf4d043db7302d4b5b5a517044271d85064e30b.tar.gz
drakx-backup-do-not-use-1bf4d043db7302d4b5b5a517044271d85064e30b.tar.bz2
drakx-backup-do-not-use-1bf4d043db7302d4b5b5a517044271d85064e30b.tar.xz
drakx-backup-do-not-use-1bf4d043db7302d4b5b5a517044271d85064e30b.zip
enable install from Compaq Smart Array
Diffstat (limited to 'mdk-stage1/tools.c')
-rw-r--r--mdk-stage1/tools.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index ad136b4d4..e5d37f28b 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -174,6 +174,9 @@ void unset_param(int i)
stage1_mode &= ~i;
}
+// warning, many things rely on the fact that:
+// - when failing it returns 0
+// - it stops on first non-digit char
int charstar_to_int(char * s)
{
int number = 0;
@@ -283,6 +286,8 @@ enum return_type load_ramdisk_fd(int ramdisk_fd, int size)
if (!seems_ok) {
log_message("reading compressed ramdisk: %s", BZ2_bzerror(st2, &z_errnum));
+ BZ2_bzclose(st2); /* opened by gzdopen, but also closes the associated fd */
+ close(ram_fd);
remove_wait_message();
stg1_error_message("Could not uncompress second stage ramdisk. "
"This is probably an hardware error while reading the data. "