transaction.c: further decideConfigFate() tweaks
This commit is contained in:
parent
0ee67602ee
commit
ebf4093293
@ -826,37 +826,23 @@ static fileAction decideConfigFate(TFI_t dbfi, const int dbix,
|
||||
else if (dbWhat != LINK && dbWhat != REG)
|
||||
return FA_CREATE;
|
||||
|
||||
const char *dbAttr, *newAttr;
|
||||
char buffer[1024];
|
||||
if (dbWhat == REG) {
|
||||
int rc = mdfile(filespec, buffer);
|
||||
if (rc) {
|
||||
/* assume the file has been removed, don't freak */
|
||||
return FA_CREATE;
|
||||
}
|
||||
dbAttr = dbfi->fmd5s[dbix];
|
||||
newAttr = newfi->fmd5s[newix];
|
||||
} else /* dbWhat == LINK */ {
|
||||
memset(buffer, 0, sizeof(buffer));
|
||||
ssize_t len = readlink(filespec, buffer, sizeof(buffer) - 1);
|
||||
if (len < 0) {
|
||||
/* assume the file has been removed, don't freak */
|
||||
return FA_CREATE;
|
||||
}
|
||||
dbAttr = dbfi->flinks[dbix];
|
||||
newAttr = newfi->flinks[newix];
|
||||
}
|
||||
|
||||
char mdsum[50];
|
||||
if (mdfile(filespec, mdsum) != 0)
|
||||
return FA_CREATE; /* assume file has been removed */
|
||||
/* this order matters - we'd prefer to CREATE the file if at all
|
||||
possible in case something else (like the timestamp) has changed */
|
||||
|
||||
if (!strcmp(dbAttr, buffer)) {
|
||||
/* this config file has never been modified, so just replace it */
|
||||
if (strcmp(dbfi->fmd5s[dbix], mdsum) == 0)
|
||||
return FA_CREATE; /* unmodified config file, replace. */
|
||||
if (strcmp(dbfi->fmd5s[dbix], newfi->fmd5s[newix]) == 0)
|
||||
return FA_SKIP; /* identical file, don't bother. */
|
||||
} else /* dbWhat == LINK */ {
|
||||
char linkto[PATH_MAX+1] = "";
|
||||
if (readlink(filespec, linkto, sizeof(linkto) - 1) < 0)
|
||||
return FA_CREATE;
|
||||
}
|
||||
|
||||
if (!strcmp(dbAttr, newAttr)) {
|
||||
/* this file is the same in all versions of this package */
|
||||
if (strcmp(dbfi->flinks[dbix], linkto) == 0)
|
||||
return FA_CREATE;
|
||||
if (strcmp(dbfi->flinks[dbix], newfi->flinks[newix]) == 0)
|
||||
return FA_SKIP;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user