From 261bf12dcfebe7afd3dfc68d3de4d05354397746 Mon Sep 17 00:00:00 2001 From: okuji Date: Sat, 7 Oct 2000 18:09:42 +0000 Subject: [PATCH] fix a bug in find_func, and fix an inconsistency between NEWS and INSTALL. --- ChangeLog | 6 ++++++ NEWS | 4 ++-- stage2/builtins.c | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7af6f5bdd..c5a048485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-08 OKUJI Yoshinori + + * stage2/builtins.c (find_func): Clear ERRNUM after the last + call of next_partition, because it always sets ERRNUM. Reported + by Thierry Laronde . + 2000-10-07 OKUJI Yoshinori * lib/device.c [__linux__] (write_to_partition): Open DEV with diff --git a/NEWS b/NEWS index 108c4f6b2..4de46a8cb 100644 --- a/NEWS +++ b/NEWS @@ -21,8 +21,8 @@ New in 0.5.96 - 2000-10-04: fixed. So now the image `nbgrub' can work fine even with a card such as rtl8139. * Serial terminal support is added. The configure script accepts - a new option `--enable-serial'. If it is specified, you can use two - new commands, "serial" and "terminal" in the command-line and the + a new option `--disable-serial'. Unless it is specified, you can use + two new commands, "serial" and "terminal" in the command-line and the menu. See the manual, for more details. * Preserve the possible magic number used by Windows NT in a MBR. * The command-line interface is switched to single-line editing mode. diff --git a/stage2/builtins.c b/stage2/builtins.c index fb58bb0d6..60289b467 100644 --- a/stage2/builtins.c +++ b/stage2/builtins.c @@ -1092,8 +1092,13 @@ find_func (char *arg, int flags) } } + /* We want to ignore any error here. */ errnum = ERR_NONE; } + + /* next_partition always sets ERRNUM in the last call, so clear + it. */ + errnum = ERR_NONE; } saved_drive = tmp_drive;