Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=181ed07df0110342970086109b30d36787dda500
commit 181ed07df0110342970086109b30d36787dda500
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Nov 13 21:49:51 2013 +0100
libpacman: Remove magic size for ftp mdtm strings in the code.
diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index cee5097..370e4c6 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -194,7 +194,7 @@ int _pacman_db_gettimestamp(pmdb_t *db, time_t *timestamp)
if(db->ops->gettimestamp) {
return db->ops->gettimestamp(db, timestamp);
} else {
- char buffer[16];
+ char buffer[PM_FMT_MDTM_MAX];
if(_pacman_db_getlastupdate(db, buffer) == 0 &&
_pacman_ftp_strpmdtm(buffer, timestamp) != NULL) {
@@ -208,7 +208,7 @@ int _pacman_db_gettimestamp(pmdb_t *db, time_t *timestamp)
*/
int _pacman_db_settimestamp(pmdb_t *db, const time_t *timestamp)
{
- char buffer[16];
+ char buffer[PM_FMT_MDTM_MAX];
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
diff --git a/lib/libpacman/io/ftp.h b/lib/libpacman/io/ftp.h
index e2f08c7..9eeae4a 100644
--- a/lib/libpacman/io/ftp.h
+++ b/lib/libpacman/io/ftp.h
@@ -23,6 +23,8 @@
#include <time.h>
+#define PM_FMT_MDTM_MAX 64
+
size_t _pacman_ftp_strfmdtm(char *s, size_t max, const time_t *time);
char *_pacman_ftp_strpmdtm(const char *s, time_t *time);
diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index 3087f2c..7d2e22c 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -385,7 +385,8 @@ int _pacman_downloadfiles_forreal(pmlist_t *servers, const
char *localpath,
}
/* check mtimes */
if(mtime1) {
- char fmtime[64];
+ char fmtime[PM_FMT_MDTM_MAX];
+
if(!FtpModDate(fn, fmtime, sizeof(fmtime)-1, control)) {
_pacman_log(PM_LOG_WARNING, _("failed to get mtime for %s\n"), fn);
} else {
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
