From bff4f998b4561c959a5e66556db27c0eeeae0f8b Mon Sep 17 00:00:00 2001 From: okuji Date: Tue, 5 Feb 2002 04:15:22 +0000 Subject: [PATCH] 2002-02-05 Yoshinori K. Okuji * stage2/shared.h (BUILTIN_HIDDEN): Renamed to ... (BUILTIN_NO_ECHO): ... this. The old name was too difficult to see _what_ was hidden. --- ChangeLog | 6 ++++++ stage2/builtins.c | 4 ++-- stage2/cmdline.c | 4 ++-- stage2/shared.h | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33e7f4e36..104fbfe5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-02-05 Yoshinori K. Okuji + + * stage2/shared.h (BUILTIN_HIDDEN): Renamed to ... + (BUILTIN_NO_ECHO): ... this. The old name was too difficult to + see _what_ was hidden. + 2002-02-05 Yoshinori K. Okuji * netboot/misc.c (twiddle): Go back to the bar progress, copied diff --git a/stage2/builtins.c b/stage2/builtins.c index d0d248549..0c10990f3 100644 --- a/stage2/builtins.c +++ b/stage2/builtins.c @@ -2820,7 +2820,7 @@ static struct builtin builtin_password = { "password", password_func, - BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_HIDDEN, + BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_NO_ECHO, "password [--md5] PASSWD [FILE]", "If used in the first section of a menu file, disable all" " interactive editing control (menu entry editor and" @@ -2851,7 +2851,7 @@ static struct builtin builtin_pause = { "pause", pause_func, - BUILTIN_CMDLINE | BUILTIN_HIDDEN, + BUILTIN_CMDLINE | BUILTIN_NO_ECHO, "pause [MESSAGE ...]", "Print MESSAGE, then wait until a key is pressed." }; diff --git a/stage2/cmdline.c b/stage2/cmdline.c index 5d89fc7fe..8017935b9 100644 --- a/stage2/cmdline.c +++ b/stage2/cmdline.c @@ -1,7 +1,7 @@ /* cmdline.c - the device-independent GRUB text command line */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1999,2000,2001,2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -221,7 +221,7 @@ run_script (char *script, char *heap) continue; } - if (! (builtin->flags & BUILTIN_HIDDEN)) + if (! (builtin->flags & BUILTIN_NO_ECHO)) grub_printf ("%s\n", old_entry); /* If BUILTIN cannot be run in the command-line, skip it. */ diff --git a/stage2/shared.h b/stage2/shared.h index f5577efe1..dbbbf32f1 100644 --- a/stage2/shared.h +++ b/stage2/shared.h @@ -1,7 +1,7 @@ /* shared.h - definitions used in all GRUB-specific code */ /* * GRUB -- GRand Unified Bootloader - * Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. + * Copyright (C) 1999,2000,2001,2002 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -839,7 +839,7 @@ void stop_floppy (void); #define BUILTIN_MENU 0x2 /* Run in the menu. */ #define BUILTIN_TITLE 0x4 /* Only for the command title. */ #define BUILTIN_SCRIPT 0x8 /* Run in the script. */ -#define BUILTIN_HIDDEN 0x10 /* Don't print command on booting. */ +#define BUILTIN_NO_ECHO 0x10 /* Don't print command on booting. */ /* The table for a builtin. */ struct builtin