EmbeddedPkg/AndroidFastboot: eliminate deprecated string function calls

[mirror_edk2.git] / EmbeddedPkg / Application / AndroidFastboot / AndroidFastbootApp.c

diff --git a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
index f380817040d00842b82d9d78a71f9f8838bd9f12..c5e8a7e34af2048151eeb826dd24c9225043ff54 100644 (file)
--- a/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
@@ -45,9 +45,9 @@ typedef enum {
 STATIC ANDROID_FASTBOOT_STATE mState = ExpectCmdState;\r
 \r
 // When in ExpectDataState, the number of bytes of data to expect:\r
-STATIC UINT32 mNumDataBytes;\r
+STATIC UINT64 mNumDataBytes;\r
 // .. and the number of bytes so far received this data phase\r
-STATIC UINT32 mBytesReceivedSoFar;\r
+STATIC UINT64 mBytesReceivedSoFar;\r
 // .. and the buffer to save data into\r
 STATIC UINT8 *mDataBuffer = NULL;\r
 \r
@@ -99,7 +99,7 @@ HandleDownload (
   IN CHAR8 *NumBytesString\r
   )\r
 {\r
-  CHAR8       Response[12] = "DATA";\r
+  CHAR8       Response[13];\r
   CHAR16      OutputString[FASTBOOT_STRING_MAX_LENGTH];\r
 \r
   // Argument is 8-character ASCII string hex representation of number of bytes\r
@@ -127,8 +127,10 @@ HandleDownload (
   if (mDataBuffer == NULL) {\r
     SEND_LITERAL ("FAILNot enough memory");\r
   } else {\r
-    AsciiStrnCpy (Response + 4, NumBytesString, 8);\r
-    mTransport->Send (sizeof(Response), Response, &mFatalSendErrorEvent);\r
+    ZeroMem (Response, sizeof Response);\r
+    AsciiSPrint (Response, sizeof Response, "DATA%x",\r
+      (UINT32)mNumDataBytes);\r
+    mTransport->Send (sizeof Response - 1, Response, &mFatalSendErrorEvent);\r
 \r
     mState = ExpectDataState;\r
     mBytesReceivedSoFar = 0;\r
@@ -257,8 +259,7 @@ AcceptCmd (
   }\r
 \r
   // Commands aren't null-terminated. Let's get a null-terminated version.\r
-  AsciiStrnCpy (Command, Data, Size);\r
-  Command[Size] = '\0';\r
+  AsciiStrnCpyS (Command, sizeof Command, Data, Size);\r
 \r
   // Parse command\r
   if (MATCH_CMD_LITERAL ("getvar", Command)) {\r