diff options
| author | Dan McGee <dan@archlinux.org> | 2008-05-04 19:34:03 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-05-08 20:59:02 -0500 |
| commit | 7fccfc78195f257e907ff4f04294ef743559017a (patch) | |
| tree | b07dd9d71a6bd63e342b4328ee148cc931a84968 | |
| parent | a13bf7497948b27786a1d568264d91b8fa60491b (diff) | |
| download | pacman-7fccfc78195f257e907ff4f04294ef743559017a.tar.xz | |
be_files.c: PATH_MAX cleanup
Most of these are not easy to remove, but I could kill the ones in the two
lastupdate functions.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/be_files.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 7cc01c26..00e631e0 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -248,7 +248,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; struct stat buf; - char path[PATH_MAX+1]; + char path[PATH_MAX]; char line[513]; ALPM_LOG_FUNC; @@ -747,7 +747,7 @@ int _alpm_db_remove(pmdb_t *db, pmpkg_t *info) time_t _alpm_db_getlastupdate(const pmdb_t *db) { FILE *fp; - char file[PATH_MAX]; + char *file; time_t ret = 0; ALPM_LOG_FUNC; @@ -756,10 +756,13 @@ time_t _alpm_db_getlastupdate(const pmdb_t *db) return(ret); } - snprintf(file, PATH_MAX, "%s.lastupdate", db->path); + /* db->path + '.lastupdate' + NULL */ + MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret)); + sprintf(file, "%s.lastupdate", db->path); /* get the last update time, if it's there */ if((fp = fopen(file, "r")) == NULL) { + free(file); return(ret); } else { char line[64]; @@ -768,6 +771,7 @@ time_t _alpm_db_getlastupdate(const pmdb_t *db) } } fclose(fp); + free(file); return(ret); } @@ -777,7 +781,7 @@ time_t _alpm_db_getlastupdate(const pmdb_t *db) int _alpm_db_setlastupdate(const pmdb_t *db, time_t time) { FILE *fp; - char file[PATH_MAX]; + char *file; int ret = 0; ALPM_LOG_FUNC; @@ -786,16 +790,19 @@ int _alpm_db_setlastupdate(const pmdb_t *db, time_t time) return(-1); } - snprintf(file, PATH_MAX, "%s.lastupdate", db->path); + /* db->path + '.lastupdate' + NULL */ + MALLOC(file, strlen(db->path) + 12, RET_ERR(PM_ERR_MEMORY, ret)); + sprintf(file, "%s.lastupdate", db->path); if((fp = fopen(file, "w")) == NULL) { + free(file); return(-1); } if(fprintf(fp, "%ju", (uintmax_t)time) <= 0) { ret = -1; } fclose(fp); - + free(file); return(ret); } |