folkslinux
/
tdnf
mirror of https://github.com/vmware/tdnf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use g_file_get_contents to read file contents

This commit is contained in:
Priyesh Padmavilasom 2015-12-17 13:06:08 -05:00
parent 2487dbc613
commit 9467c56cef
3 changed files with 6 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/defines.h
View File

@ -163,6 +163,7 @@ typedef enum
{ERROR_TDNF_RPMRC_FAIL, "ERROR_TDNF_RPMRC_FAIL", "rpm generic failure"}, \
{ERROR_TDNF_RPMRC_NOTTRUSTED, "ERROR_TDNF_RPMRC_NOTTRUSTED", "rpm signature is OK, but key is not trusted"}, \
{ERROR_TDNF_RPMRC_NOKEY, "ERROR_TDNF_RPMRC_NOKEY", "public key is unavailable. install public key using rpm --import or use --nogpgcheck to ignore."}, \
{ERROR_TDNF_INVALID_PUBKEY_FILE, "ERROR_TDNF_INVALID_PUBKEY_FILE", "public key file is invalid or corrupted"}, \
{ERROR_TDNF_KEYURL_UNSUPPORTED, "ERROR_TDNF_KEYURL_UNSUPPORTED", "GpgKey Url schemes other than file are not supported"}, \
{ERROR_TDNF_KEYURL_INVALID, "ERROR_TDNF_KEYURL_INVALID", "GpgKey Url is invalid"}, \
{ERROR_TDNF_RPM_NOT_SIGNED, "ERROR_TDNF_RPM_NOT_SIGNED", "RPM not signed. Use --nogpgcheck to ignore."}, \

69
client/gpgcheck.c
View File

@ -50,68 +50,6 @@ error:
goto cleanup;
}
uint32_t
ReadAllBytes(
const char* pszFile,
char** ppszData
)
{
uint32_t dwError = 0;
size_t fsize = 0;
char* pszData = NULL;
FILE* fp = NULL;
if(IsNullOrEmptyString(pszFile) || !ppszData)
{
dwError = ERROR_TDNF_INVALID_PARAMETER;
BAIL_ON_TDNF_ERROR(dwError);
}
fp = fopen(pszFile, "r");
if(!fp)
{
dwError = errno;
BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
}
if(fseek(fp, 0, SEEK_END))
{
dwError = errno;
BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
}
fsize = ftell(fp);
if(fseek(fp, 0, SEEK_SET))
{
dwError = errno;
BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
}
dwError = TDNFAllocateMemory(fsize+1, (void**)&pszData);
BAIL_ON_TDNF_ERROR(dwError);
if(!fread(pszData, fsize, 1, fp))
{
dwError = errno;
BAIL_ON_TDNF_SYSTEM_ERROR(dwError);
}
*ppszData = pszData;
cleanup:
if(fp)
{
fclose(fp);
}
return dwError;
error:
if(!ppszData)
{
*ppszData = NULL;
}
TDNF_SAFE_FREE_MEMORY(pszData);
goto cleanup;
}
uint32_t
ReadGPGKey(
const char* pszKeyUrl,
@ -165,8 +103,11 @@ ReadGPGKey(
BAIL_ON_TDNF_ERROR(dwError);
}
dwError = ReadAllBytes(pszFile, &pszKeyData);
BAIL_ON_TDNF_ERROR(dwError);
if(g_file_get_contents(pszFile, &pszKeyData, NULL, NULL) != TRUE)
{
dwError = ERROR_TDNF_INVALID_PUBKEY_FILE;
BAIL_ON_TDNF_ERROR(dwError);
}
*ppszKeyData = pszKeyData;

6
client/prototypes.h
View File

@ -48,12 +48,6 @@ TDNFApplyPackageFilter(
);
//gpgcheck.c
uint32_t
ReadAllBytes(
const char* pszFileName,
char** pszFileContents
);
uint32_t
ReadGPGKey(
const char* pszFile,