bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code update to make use of PKG_FULLNAME_LEN

Browse source
This commit is contained in:
Aurelien Foret 2005-10-08 21:36:47 +00:00
parent 05ab859eab
commit 8ffb82a691
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libalpm/add.c
View file

@ -328,8 +328,8 @@ int add_commit(pmtrans_t *trans, pmdb_t *db)
oldpkg = pkg_new(); oldpkg = pkg_new();
if(oldpkg) { if(oldpkg) {
if(!(local->infolevel & INFRQ_FILES)) { if(!(local->infolevel & INFRQ_FILES)) {
char name[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1]; char name[PKG_FULLNAME_LEN];
snprintf(name, (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1, "%s-%s", local->name, local->version); snprintf(name, PKG_FULLNAME_LEN, "%s-%s", local->name, local->version);
_alpm_log(PM_LOG_DEBUG, "loading FILES info for %s", local->name); _alpm_log(PM_LOG_DEBUG, "loading FILES info for %s", local->name);
db_read(db, name, INFRQ_FILES, local); db_read(db, name, INFRQ_FILES, local);
} }

16
lib/libalpm/alpm.c
View file

@ -378,8 +378,8 @@ void *alpm_pkg_getinfo(pmpkg_t *pkg, unsigned char parm)
case PM_PKG_REASON: case PM_PKG_REASON:
case PM_PKG_MD5SUM: case PM_PKG_MD5SUM:
if(!(pkg->infolevel & INFRQ_DESC)) { if(!(pkg->infolevel & INFRQ_DESC)) {
char target[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1]; char target[PKG_FULLNAME_LEN];
snprintf(target, (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1, "%s-%s", pkg->name, pkg->version); snprintf(target, PKG_FULLNAME_LEN, "%s-%s", pkg->name, pkg->version);
db_read(pkg->data, target, INFRQ_DESC, pkg); db_read(pkg->data, target, INFRQ_DESC, pkg);
} }
break; break;
@ -392,8 +392,8 @@ void *alpm_pkg_getinfo(pmpkg_t *pkg, unsigned char parm)
case PM_PKG_PROVIDES: case PM_PKG_PROVIDES:
case PM_PKG_REPLACES: case PM_PKG_REPLACES:
if(!(pkg->infolevel & INFRQ_DEPENDS)) { if(!(pkg->infolevel & INFRQ_DEPENDS)) {
char target[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1]; char target[PKG_FULLNAME_LEN];
snprintf(target, (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1, "%s-%s", pkg->name, pkg->version); snprintf(target, PKG_FULLNAME_LEN, "%s-%s", pkg->name, pkg->version);
db_read(pkg->data, target, INFRQ_DEPENDS, pkg); db_read(pkg->data, target, INFRQ_DEPENDS, pkg);
} }
break;*/ break;*/
@ -401,16 +401,16 @@ void *alpm_pkg_getinfo(pmpkg_t *pkg, unsigned char parm)
case PM_PKG_FILES: case PM_PKG_FILES:
case PM_PKG_BACKUP: case PM_PKG_BACKUP:
if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) {
char target[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1]; char target[PKG_FULLNAME_LEN];
snprintf(target, (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1, "%s-%s", pkg->name, pkg->version); snprintf(target, PKG_FULLNAME_LEN, "%s-%s", pkg->name, pkg->version);
db_read(pkg->data, target, INFRQ_FILES, pkg); db_read(pkg->data, target, INFRQ_FILES, pkg);
} }
break; break;
/* Scriptlet */ /* Scriptlet */
case PM_PKG_SCRIPLET: case PM_PKG_SCRIPLET:
if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) { if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) {
char target[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1]; char target[PKG_FULLNAME_LEN];
snprintf(target, (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1, "%s-%s", pkg->name, pkg->version); snprintf(target, PKG_FULLNAME_LEN, "%s-%s", pkg->name, pkg->version);
db_read(pkg->data, target, INFRQ_SCRIPLET, pkg); db_read(pkg->data, target, INFRQ_SCRIPLET, pkg);
} }
break; break;

4
lib/libalpm/db.c
View file

@ -181,7 +181,7 @@ pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq)
struct dirent *ent = NULL; struct dirent *ent = NULL;
struct stat sbuf; struct stat sbuf;
char path[PATH_MAX]; char path[PATH_MAX];
char name[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1]; char name[PKG_FULLNAME_LEN];
char *ptr = NULL; char *ptr = NULL;
int found = 0; int found = 0;
pmpkg_t *pkg; pmpkg_t *pkg;
@ -197,7 +197,7 @@ pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq)
if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) {
continue; continue;
} }
STRNCPY(name, ent->d_name, (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1); STRNCPY(name, ent->d_name, PKG_FULLNAME_LEN);
/* stat the entry, make sure it's a directory */ /* stat the entry, make sure it's a directory */
snprintf(path, PATH_MAX, "%s/%s", db->path, name); snprintf(path, PATH_MAX, "%s/%s", db->path, name);
if(stat(path, &sbuf) || !S_ISDIR(sbuf.st_mode)) { if(stat(path, &sbuf) || !S_ISDIR(sbuf.st_mode)) {

4
lib/libalpm/sync.c
View file

@ -247,7 +247,7 @@ error:
int sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, char *name) int sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, char *name)
{ {
char targline[(PKG_NAME_LEN-1)+1+(DB_TREENAME_LEN-1)+1]; char targline[PKG_FULLNAME_LEN];
char *targ; char *targ;
PMList *j; PMList *j;
pmpkg_t *local; pmpkg_t *local;
@ -259,7 +259,7 @@ int sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync, char *n
ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
STRNCPY(targline, name, (PKG_NAME_LEN-1)+1+(DB_TREENAME_LEN-1)+1); STRNCPY(targline, name, PKG_FULLNAME_LEN);
targ = strchr(targline, '/'); targ = strchr(targline, '/');
if(targ) { if(targ) {
*targ = '\0'; *targ = '\0';