From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7C9632095C3C7 for ; Wed, 19 Apr 2017 03:18:32 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2017 03:18:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,220,1488873600"; d="scan'208";a="1121302015" Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga001.jf.intel.com with ESMTP; 19 Apr 2017 03:18:29 -0700 From: Yonghong Zhu To: edk2-devel@lists.01.org Cc: Liming Gao Date: Wed, 19 Apr 2017 18:18:15 +0800 Message-Id: <1492597098-35836-2-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> References: <1492597098-35836-1-git-send-email-yonghong.zhu@intel.com> Subject: [Patch 1/4] BaseTools/VolInfo: Update OPENSSL_PATH to support space characters X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2017 10:18:32 -0000 Update OPENSSL_PATH handling to support space characters in the Path. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu --- BaseTools/Source/C/VolInfo/VolInfo.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c index eff5f9e..a695529 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -329,11 +329,14 @@ Returns: OpenSslCommand = "openssl"; OpenSslEnv = getenv("OPENSSL_PATH"); if (OpenSslEnv == NULL) { OpenSslPath = OpenSslCommand; } else { - OpenSslPath = malloc(strlen(OpenSslEnv)+strlen(OpenSslCommand)+1); + // + // We add quotes to the Openssl Path in case it has space characters + // + OpenSslPath = malloc(2+strlen(OpenSslEnv)+strlen(OpenSslCommand)+1); if (OpenSslPath == NULL) { Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!"); return GetUtilityStatus (); } CombinePath(OpenSslEnv, OpenSslCommand, OpenSslPath); @@ -1589,15 +1592,16 @@ CombinePath ( OUT CHAR8* NewPath ) { UINT32 DefaultPathLen; UINT64 Index; - + CHAR8 QuotesStr[] = "\""; + strcpy(NewPath, QuotesStr); DefaultPathLen = strlen(DefaultPath); - strcpy(NewPath, DefaultPath); + strcat(NewPath, DefaultPath); Index = 0; - for (; Index < DefaultPathLen; Index ++) { + for (; Index < DefaultPathLen + 1; Index ++) { if (NewPath[Index] == '\\' || NewPath[Index] == '/') { if (NewPath[Index + 1] != '\0') { NewPath[Index] = '/'; } } @@ -1605,10 +1609,11 @@ CombinePath ( if (NewPath[Index -1] != '/') { NewPath[Index] = '/'; NewPath[Index + 1] = '\0'; } strcat(NewPath, AppendPath); + strcat(NewPath, QuotesStr); return EFI_SUCCESS; } EFI_STATUS ParseSection ( -- 2.6.1.windows.1