Index: SetVar.c
===================================================================
--- SetVar.c	(revision 16189)
+++ SetVar.c	(working copy)
@@ -1,7 +1,7 @@
 /** @file
   Main file for SetVar shell Debug1 function.
 
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2014, 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
@@ -44,7 +44,6 @@
   EFI_GUID            Guid;
   CONST CHAR16        *StringGuid;
   UINT32              Attributes;
-  UINT32              Attributes2;
   VOID                *Buffer;
   UINTN               Size;
   UINTN               LoopVar;
@@ -98,7 +97,7 @@
           ShellStatus = SHELL_INVALID_PARAMETER;
         }
       }
-      if (Data == NULL) {
+      if (Data == NULL || Data[0] !=  L'=') {
         //
         // Display what's there
         //
@@ -129,22 +128,43 @@
           ASSERT(ShellStatus == SHELL_SUCCESS);
         }
       } else {
-        if (Data[0] == L'=') {
-          Data++;
-        }
         //
-        // Change what's there
+        // Change what's there or create a new one.
         //
-        if (ShellCommandLineGetFlag(Package, L"-bs")) {
-          Attributes |= EFI_VARIABLE_BOOTSERVICE_ACCESS;
+
+        ASSERT(Data[0] == L'=');
+        Data++;
+
+        //
+        // Determine if the variable exists and get the attributes
+        //
+        Status = gRT->GetVariable((CHAR16*)VariableName, &Guid, &Attributes, &Size, Buffer);
+        if (Status == EFI_BUFFER_TOO_SMALL) {
+          Buffer = AllocateZeroPool(Size);
+          Status = gRT->GetVariable((CHAR16*)VariableName, &Guid, &Attributes, &Size, Buffer);
         }
-        if (ShellCommandLineGetFlag(Package, L"-rt")) {
-          Attributes |= EFI_VARIABLE_RUNTIME_ACCESS |
-                        EFI_VARIABLE_BOOTSERVICE_ACCESS;
+
+        if (EFI_ERROR(Status) || Buffer == NULL) {
+          //
+          // Creating a new variable.  determine attributes from command line.
+          //
+          Attributes = 0;
+          if (ShellCommandLineGetFlag(Package, L"-bs")) {
+            Attributes |= EFI_VARIABLE_BOOTSERVICE_ACCESS;
+          }
+          if (ShellCommandLineGetFlag(Package, L"-rt")) {
+            Attributes |= EFI_VARIABLE_RUNTIME_ACCESS |
+                          EFI_VARIABLE_BOOTSERVICE_ACCESS;
+          }
+          if (ShellCommandLineGetFlag(Package, L"-nv")) {
+            Attributes |= EFI_VARIABLE_NON_VOLATILE;
+          }
         }
-        if (ShellCommandLineGetFlag(Package, L"-nv")) {
-          Attributes |= EFI_VARIABLE_NON_VOLATILE;
-        }
+        SHELL_FREE_NON_NULL(Buffer);
+
+        //
+        // What type is the new data.
+        //
         if (ShellIsHexOrDecimalNumber(Data, TRUE, FALSE)) {
           if (StrLen(Data) % 2 != 0) {
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellDebug1HiiHandle, Data);
@@ -171,17 +191,6 @@
             }
           }
         } else if (StrnCmp(Data, L"\"", 1) == 0) {
-          Size = 0;
-          Attributes2 = 0;
-          Status = gRT->GetVariable((CHAR16*)VariableName, &Guid, &Attributes2, &Size, Buffer);
-          if (Status == EFI_BUFFER_TOO_SMALL) {
-            Buffer = AllocateZeroPool(Size);
-            Status = gRT->GetVariable((CHAR16*)VariableName, &Guid, &Attributes2, &Size, Buffer);
-            if (Buffer != NULL) {
-              FreePool(Buffer);
-            }
-            Attributes = Attributes2;
-          }          
           //
           // ascii text
           //