[PATCH v3 0/1] Add paging instructions to normal and help prompts

[PATCH v3 0/1] Add paging instructions to normal and help prompts

[Robbie Harwood]

Rewrite to address review and clarifications with suggestion from Daniel
(thanks).

Be well,
--Robbie

Robbie Harwood (1):
  Add paging instructions to normal and help prompts

 grub-core/commands/help.c | 2 ++
 grub-core/normal/main.c   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

-- 
2.35.1

[PATCH v3 1/1] Add paging instructions to normal and help prompts

[Robbie Harwood]

This is not an ideal solution, as interactive users must always ru na
command in order to get the behavior they want, but it avoids
problematic interactions between prompting and sourcing files.

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
 grub-core/commands/help.c | 2 ++
 grub-core/normal/main.c   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/grub-core/commands/help.c b/grub-core/commands/help.c
index ac3907f9df..2c70c7b417 100644
--- a/grub-core/commands/help.c
+++ b/grub-core/commands/help.c
@@ -135,6 +135,8 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
 	}
     }
 
+  grub_printf ("\n\nTo enable less(1)-like paging, `set pager=1`.\n");
+
   return 0;
 }
 
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index cb0e8e7fd2..2cb48a94f5 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -380,7 +380,8 @@ grub_normal_reader_init (int nested)
 
   msg_formatted = grub_xasprintf (_("Minimal BASH-like line editing is supported. For "
 				    "the first word, TAB lists possible command completions. Anywhere "
-				    "else TAB lists possible device or file completions. %s"),
+				    "else TAB lists possible device or file completions.  To enable "
+                                    "less(1)-like paging, `set pager=1`.  %s"),
 				  nested ? msg_esc : "");
   if (!msg_formatted)
     return grub_errno;
-- 
2.35.1

Re: [PATCH v3 1/1] Add paging instructions to normal and help prompts

[Daniel Kiper]

On Fri, Nov 04, 2022 at 01:05:37PM -0400, Robbie Harwood wrote:
> This is not an ideal solution, as interactive users must always ru na
> command in order to get the behavior they want, but it avoids
> problematic interactions between prompting and sourcing files.
>
> Signed-off-by: Robbie Harwood <rharwood@redhat.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> but...

> ---
>  grub-core/commands/help.c | 2 ++
>  grub-core/normal/main.c   | 3 ++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/grub-core/commands/help.c b/grub-core/commands/help.c
> index ac3907f9df..2c70c7b417 100644
> --- a/grub-core/commands/help.c
> +++ b/grub-core/commands/help.c
> @@ -135,6 +135,8 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
>  	}
>      }
>
> +  grub_printf ("\n\nTo enable less(1)-like paging, `set pager=1`.\n");

Are you OK with s/`/\"/g? If yes I can do it for you before committing
this patch?

> +
>    return 0;
>  }
>
> diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
> index cb0e8e7fd2..2cb48a94f5 100644
> --- a/grub-core/normal/main.c
> +++ b/grub-core/normal/main.c
> @@ -380,7 +380,8 @@ grub_normal_reader_init (int nested)
>
>    msg_formatted = grub_xasprintf (_("Minimal BASH-like line editing is supported. For "
>  				    "the first word, TAB lists possible command completions. Anywhere "
> -				    "else TAB lists possible device or file completions. %s"),
> +				    "else TAB lists possible device or file completions.  To enable "
> +                                    "less(1)-like paging, `set pager=1`.  %s"),

Do we need extra spaces here? I would be consistent with the rest of the
message and use one space everywhere? Again, I can make these changes
for you if you are OK with them.

Daniel

Re: [PATCH v3 1/1] Add paging instructions to normal and help prompts

[Robbie Harwood]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

Daniel Kiper <dkiper@net-space.pl> writes:

> On Fri, Nov 04, 2022 at 01:05:37PM -0400, Robbie Harwood wrote:
>
>> ---
>>  grub-core/commands/help.c | 2 ++
>>  grub-core/normal/main.c   | 3 ++-
>>  2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/grub-core/commands/help.c b/grub-core/commands/help.c
>> index ac3907f9df..2c70c7b417 100644
>> --- a/grub-core/commands/help.c
>> +++ b/grub-core/commands/help.c
>> @@ -135,6 +135,8 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
>>  	}
>>      }
>>
>> +  grub_printf ("\n\nTo enable less(1)-like paging, `set pager=1`.\n");
>
> Are you OK with s/`/\"/g? If yes I can do it for you before committing
> this patch?

That's fine.

>> +
>>    return 0;
>>  }
>>
>> diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
>> index cb0e8e7fd2..2cb48a94f5 100644
>> --- a/grub-core/normal/main.c
>> +++ b/grub-core/normal/main.c
>> @@ -380,7 +380,8 @@ grub_normal_reader_init (int nested)
>>
>>    msg_formatted = grub_xasprintf (_("Minimal BASH-like line editing is supported. For "
>>  				    "the first word, TAB lists possible command completions. Anywhere "
>> -				    "else TAB lists possible device or file completions. %s"),
>> +				    "else TAB lists possible device or file completions.  To enable "
>> +                                    "less(1)-like paging, `set pager=1`.  %s"),
>
> Do we need extra spaces here? I would be consistent with the rest of the
> message and use one space everywhere? Again, I can make these changes
> for you if you are OK with them.

Also fine, thanks.

Be well,
--Robbie

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]