From d7e781a54bc8aad793abd51fdb5f8f1c7cdae7ad Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Wed, 5 Oct 2005 20:49:32 +0000 Subject: Added a PKG_FULLNAME_LEN macro --- lib/libalpm/package.c | 4 ++-- lib/libalpm/package.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index bf64a481..3b0669fc 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -372,7 +372,7 @@ int pkg_isin(pmpkg_t *needle, PMList *haystack) int pkg_splitname(char *target, char *name, char *version) { - char tmp[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+7+1]; + char tmp[PKG_FULLNAME_LEN+7]; char *p, *q; if(target == NULL) { @@ -385,7 +385,7 @@ int pkg_splitname(char *target, char *name, char *version) } else { p++; } - STRNCPY(tmp, p, (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+7+1); + STRNCPY(tmp, p, PKG_FULLNAME_LEN+7); /* trim file extension (if any) */ if((p = strstr(tmp, PM_EXT_PKG))) { *p = 0; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index a5b39b77..a6b8b224 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -30,6 +30,7 @@ enum { #define PKG_NAME_LEN 256 #define PKG_VERSION_LEN 64 +#define PKG_FULLNAME_LEN (PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1 #define PKG_DESC_LEN 512 #define PKG_URL_LEN 256 #define PKG_DATE_LEN 32 -- cgit v1.2.3-24-g4f1b