|
cvsdist |
91c9f39 |
Index: stage2/cmdline.c
|
|
cvsdist |
91c9f39 |
===================================================================
|
|
cvsdist |
91c9f39 |
RCS file: /cvsroot/grub/grub/stage2/cmdline.c,v
|
|
cvsdist |
91c9f39 |
retrieving revision 1.27
|
|
cvsdist |
91c9f39 |
diff -u -r1.27 cmdline.c
|
|
cvsdist |
91c9f39 |
--- stage2/cmdline.c 3 Dec 2002 00:02:53 -0000 1.27
|
|
cvsdist |
91c9f39 |
+++ stage2/cmdline.c 6 Jan 2003 05:33:33 -0000
|
|
cvsdist |
91c9f39 |
@@ -48,12 +48,17 @@
|
|
cvsdist |
91c9f39 |
|
|
cvsdist |
91c9f39 |
/* Print a helpful message for the command-line interface. */
|
|
cvsdist |
91c9f39 |
void
|
|
cvsdist |
91c9f39 |
-print_cmdline_message (int forever)
|
|
cvsdist |
91c9f39 |
+print_cmdline_message (int type)
|
|
cvsdist |
91c9f39 |
{
|
|
cvsdist |
91c9f39 |
printf (" [ Minimal BASH-like line editing is supported. For the first word, TAB\n"
|
|
cvsdist |
91c9f39 |
" lists possible command completions. Anywhere else TAB lists the possible\n"
|
|
cvsdist |
91c9f39 |
- " completions of a device/filename.%s ]\n",
|
|
cvsdist |
91c9f39 |
- (forever ? "" : " ESC at any time exits."));
|
|
cvsdist |
91c9f39 |
+ " completions of a device/filename.");
|
|
cvsdist |
91c9f39 |
+ if (type == CMDLINE_NORMAL_MODE)
|
|
cvsdist |
91c9f39 |
+ printf(" ESC at any time exits.");
|
|
cvsdist |
91c9f39 |
+ if (type == CMDLINE_EDIT_MODE)
|
|
cvsdist |
91c9f39 |
+ printf(" ESC at any time cancels. ENTER \n"
|
|
cvsdist |
91c9f39 |
+ " at any time accepts your changes.");
|
|
cvsdist |
91c9f39 |
+ printf("]\n");
|
|
cvsdist |
91c9f39 |
}
|
|
cvsdist |
91c9f39 |
|
|
cvsdist |
91c9f39 |
/* Find the builtin whose command name is COMMAND and return the
|
|
cvsdist |
91c9f39 |
@@ -128,7 +133,7 @@
|
|
cvsdist |
91c9f39 |
print_network_configuration ();
|
|
cvsdist |
91c9f39 |
grub_putchar ('\n');
|
|
cvsdist |
91c9f39 |
#endif
|
|
cvsdist |
91c9f39 |
- print_cmdline_message (forever);
|
|
cvsdist |
91c9f39 |
+ print_cmdline_message (forever ? CMDLINE_FOREVER_MODE : CMDLINE_NORMAL_MODE);
|
|
cvsdist |
91c9f39 |
|
|
cvsdist |
91c9f39 |
while (1)
|
|
cvsdist |
91c9f39 |
{
|
|
cvsdist |
91c9f39 |
Index: stage2/shared.h
|
|
cvsdist |
91c9f39 |
===================================================================
|
|
cvsdist |
91c9f39 |
RCS file: /cvsroot/grub/grub/stage2/shared.h,v
|
|
cvsdist |
91c9f39 |
retrieving revision 1.90
|
|
cvsdist |
91c9f39 |
diff -u -r1.90 shared.h
|
|
cvsdist |
91c9f39 |
--- stage2/shared.h 3 Dec 2002 00:02:53 -0000 1.90
|
|
cvsdist |
91c9f39 |
+++ stage2/shared.h 6 Jan 2003 05:33:33 -0000
|
|
cvsdist |
91c9f39 |
@@ -843,9 +843,15 @@
|
|
cvsdist |
91c9f39 |
void init_config (void);
|
|
cvsdist |
91c9f39 |
char *skip_to (int after_equal, char *cmdline);
|
|
cvsdist |
91c9f39 |
struct builtin *find_command (char *command);
|
|
cvsdist |
91c9f39 |
-void print_cmdline_message (int forever);
|
|
cvsdist |
91c9f39 |
void enter_cmdline (char *heap, int forever);
|
|
cvsdist |
91c9f39 |
int run_script (char *script, char *heap);
|
|
cvsdist |
91c9f39 |
+
|
|
cvsdist |
91c9f39 |
+/* the flags for the cmdline message */
|
|
cvsdist |
91c9f39 |
+#define CMDLINE_FOREVER_MODE 0x0
|
|
cvsdist |
91c9f39 |
+#define CMDLINE_NORMAL_MODE 0x1
|
|
cvsdist |
91c9f39 |
+#define CMDLINE_EDIT_MODE 0x2
|
|
cvsdist |
91c9f39 |
+
|
|
cvsdist |
91c9f39 |
+void print_cmdline_message (int type);
|
|
cvsdist |
91c9f39 |
#endif
|
|
cvsdist |
91c9f39 |
|
|
cvsdist |
91c9f39 |
/* C library replacement functions with identical semantics. */
|
|
cvsdist |
91c9f39 |
Index: stage2/stage2.c
|
|
cvsdist |
91c9f39 |
===================================================================
|
|
cvsdist |
91c9f39 |
RCS file: /cvsroot/grub/grub/stage2/stage2.c,v
|
|
cvsdist |
91c9f39 |
retrieving revision 1.42
|
|
cvsdist |
91c9f39 |
diff -u -r1.42 stage2.c
|
|
cvsdist |
91c9f39 |
--- stage2/stage2.c 4 Dec 2002 00:55:45 -0000 1.42
|
|
cvsdist |
91c9f39 |
+++ stage2/stage2.c 6 Jan 2003 05:33:33 -0000
|
|
cvsdist |
91c9f39 |
@@ -655,7 +655,7 @@
|
|
cvsdist |
91c9f39 |
else
|
|
cvsdist |
91c9f39 |
{
|
|
cvsdist |
91c9f39 |
cls ();
|
|
cvsdist |
91c9f39 |
- print_cmdline_message (0);
|
|
cvsdist |
91c9f39 |
+ print_cmdline_message (CMDLINE_EDIT_MODE);
|
|
cvsdist |
91c9f39 |
|
|
cvsdist |
91c9f39 |
new_heap = heap + NEW_HEAPSIZE + 1;
|
|
cvsdist |
91c9f39 |
|