ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
EFI_RUNTIME_SERVICES.GetTime() might return an unspecified Timezone,
such as when SetTime() has not been called after the PC-AT CMOS RTC
was cut off power. Consider this case by not attempting Timezone
translations for when it is invalid.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
---
ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
index 7d2e15f5206b..73804b4516ba 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c
@@ -2,7 +2,7 @@
Main file for ls shell level 2 function.
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -506,7 +506,7 @@ PrintLsOutput(
// Change the file time to local time.
//
Status = gRT->GetTime(&LocalTime, NULL);
- if (!EFI_ERROR (Status)) {
+ if (!EFI_ERROR (Status) && (LocalTime.TimeZone != EFI_UNSPECIFIED_TIMEZONE)) {
if ((Node->Info->CreateTime.TimeZone != EFI_UNSPECIFIED_TIMEZONE) &&
(Node->Info->CreateTime.Month >= 1 && Node->Info->CreateTime.Month <= 12)) {
//
--
2.17.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Marvin Häuser > Sent: Saturday, May 05, 2018 1:23 PM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com> > Subject: [edk2] [PATCH] ShellPkg/UefiShellLevel2CommandsLib: Support > unspecified local Timezone. > Importance: High > > EFI_RUNTIME_SERVICES.GetTime() might return an unspecified Timezone, > such as when SetTime() has not been called after the PC-AT CMOS RTC > was cut off power. Consider this case by not attempting Timezone > translations for when it is invalid. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com> > --- > ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > index 7d2e15f5206b..73804b4516ba 100644 > --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > @@ -2,7 +2,7 @@ > Main file for ls shell level 2 function. > > (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR> > - Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR> > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > which accompanies this distribution. The full text of the license may be > found at > @@ -506,7 +506,7 @@ PrintLsOutput( > // Change the file time to local time. > // > Status = gRT->GetTime(&LocalTime, NULL); > - if (!EFI_ERROR (Status)) { > + if (!EFI_ERROR (Status) && (LocalTime.TimeZone != > EFI_UNSPECIFIED_TIMEZONE)) { > if ((Node->Info->CreateTime.TimeZone != > EFI_UNSPECIFIED_TIMEZONE) && > (Node->Info->CreateTime.Month >= 1 && Node->Info- > >CreateTime.Month <= 12)) { > // > -- > 2.17.0.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com> Thanks/Ray > -----Original Message----- > From: edk2-devel <edk2-devel-bounces@lists.01.org> On Behalf Of Marvin > Häuser > Sent: Sunday, May 6, 2018 4:23 AM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com> > Subject: [edk2] [PATCH] ShellPkg/UefiShellLevel2CommandsLib: Support > unspecified local Timezone. > > EFI_RUNTIME_SERVICES.GetTime() might return an unspecified Timezone, > such as when SetTime() has not been called after the PC-AT CMOS RTC > was cut off power. Consider this case by not attempting Timezone > translations for when it is invalid. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com> > --- > ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > index 7d2e15f5206b..73804b4516ba 100644 > --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Ls.c > @@ -2,7 +2,7 @@ > Main file for ls shell level 2 function. > > (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR> > - Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR> > + Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR> > This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD > License > which accompanies this distribution. The full text of the license may be > found at > @@ -506,7 +506,7 @@ PrintLsOutput( > // Change the file time to local time. > // > Status = gRT->GetTime(&LocalTime, NULL); > - if (!EFI_ERROR (Status)) { > + if (!EFI_ERROR (Status) && (LocalTime.TimeZone != > EFI_UNSPECIFIED_TIMEZONE)) { > if ((Node->Info->CreateTime.TimeZone != EFI_UNSPECIFIED_TIMEZONE) > && > (Node->Info->CreateTime.Month >= 1 && Node->Info- > >CreateTime.Month <= 12)) { > // > -- > 2.17.0.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.