folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) fixed bug in reading $HOME/.rpmrc 

2) allows rpmrc file to be overridden

CVS patchset: 561
CVS date: 1996/05/07 03:22:31
This commit is contained in:
ewt 1996-05-07 03:22:31 +00:00
parent b64d6eeecb
commit 67b9dec668
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/rpmrc.c
View File

@ -174,7 +174,7 @@ static void setDefaults(void) {
setVar(RPMVAR_PGP_SECRING, "/usr/lib/rpm/secring.pgp");
}
int readConfigFiles(void) {
int readConfigFiles(char * file) {
FILE * f;
char * fn;
char * home;
@ -182,23 +182,30 @@ int readConfigFiles(void) {
setDefaults();
f = fopen("/etc/rpmrc", "r");
if (file)
fn = file;
else
fn = "/etc/rpmrc";
f = fopen(fn, "r");
if (f) {
rc = readRpmrc(f, "/etc/rpmrc");
fclose(f);
if (rc) return rc;
}
home = getenv("HOME");
if (home) {
fn = alloca(strlen(home) + 8);
strcpy(fn, home);
strcat(fn, "/.rpmrc");
f = fopen("/etc/rpmrc", "r");
if (f) {
rc |= readRpmrc(f, fn);
fclose(f);
if (rc) return rc;
if (!file) {
home = getenv("HOME");
if (home) {
fn = alloca(strlen(home) + 8);
strcpy(fn, home);
strcat(fn, "/.rpmrc");
f = fopen(fn, "r");
if (f) {
rc |= readRpmrc(f, fn);
fclose(f);
if (rc) return rc;
}
}
}