public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Carsey, Jaben" <jaben.carsey@intel.com>
To: "Ni, Ruiyu" <ruiyu.ni@intel.com>,
	"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH] ShellPkg: Fix the bug that handling Ctrl-C improperly
Date: Tue, 28 Nov 2017 14:58:20 +0000	[thread overview]
Message-ID: <CB6E33457884FA40993F35157061515CA3BE1872@FMSMSX103.amr.corp.intel.com> (raw)
In-Reply-To: <20171128090702.63424-1-ruiyu.ni@intel.com>

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Tuesday, November 28, 2017 1:07 AM
> To: edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: [PATCH] ShellPkg: Fix the bug that handling Ctrl-C improperly
> Importance: High
> 
> Current implementation resets the CTRL-C event early when printing
> the shell prompt, when user types "<CTRL-C>ls<ENTER>", "ls" command
> is terminated immediately when starts.
> It's not an expected behavior from users' perspective.
> Correct way is to reset the CTRL-C event just before running the
> command, which is a bit later than current point.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> ---
>  ShellPkg/Application/Shell/Shell.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/ShellPkg/Application/Shell/Shell.c
> b/ShellPkg/Application/Shell/Shell.c
> index 2adc99240c..577e17311b 100644
> --- a/ShellPkg/Application/Shell/Shell.c
> +++ b/ShellPkg/Application/Shell/Shell.c
> @@ -620,11 +620,6 @@ UefiMain (
>            ShellInfoObject.ConsoleInfo->Enabled    = TRUE;
>            ShellInfoObject.ConsoleInfo->RowCounter = 0;
> 
> -          //
> -          // Reset the CTRL-C event (yes we ignore the return values)
> -          //
> -          Status = gBS->CheckEvent (ShellInfoObject.NewEfiShellProtocol-
> >ExecutionBreak);
> -
>            //
>            // Display Prompt
>            //
> @@ -1346,9 +1341,14 @@ DoShellPrompt (
>    // Null terminate the string and parse it
>    //
>    if (!EFI_ERROR (Status)) {
> +    //
> +    // Reset the CTRL-C event just before running the command (yes we
> ignore the return values)
> +    //
> +    Status = gBS->CheckEvent (ShellInfoObject.NewEfiShellProtocol-
> >ExecutionBreak);
> +
>      CmdLine[BufferSize / sizeof (CHAR16)] = CHAR_NULL;
>      Status = RunCommand(CmdLine);
> -    }
> +  }
> 
>    //
>    // Done with this command
> --
> 2.15.0.gvfs.1.preview.4



      reply	other threads:[~2017-11-28 14:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-28  9:07 [PATCH] ShellPkg: Fix the bug that handling Ctrl-C improperly Ruiyu Ni
2017-11-28 14:58 ` Carsey, Jaben [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CB6E33457884FA40993F35157061515CA3BE1872@FMSMSX103.amr.corp.intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox