- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: use basename instead of a sed command
by Cedric Staniewski 20 Oct '09

20 Oct '09

The basename command is easier to understand than a sed command and it is even slightly faster than sed. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- or if you prefer bashisms, see next patch scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 24fddf6..62d0923 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -190,7 +190,7 @@ get_filename() { # if a filename is specified, use it local filename=$(echo $1 | sed 's|::.*||') # if it is just an URL, we only keep the last component - echo "$filename" | sed 's|^.*://.*/||g' + basename "$filename" } # extract the URL from a source entry @@ -321,7 +321,7 @@ download_file() { # destination file local file=$3 # temporary download file, default to last component of the URL - local dlfile=$(echo "$url" | sed 's|^.*://.*/||g') + local dlfile=$(basename "$url") # replace %o by the temporary dlfile if it exists if echo "$dlcmd" | grep -q "%o" ; then -- 1.6.5

4 12

[pacman-dev] Is -Suu supposed to also update packages?
by Cedric Staniewski 20 Oct '09

20 Oct '09

Hi, while implementing pacman's downgrade operation in bash, I noticed that pacman also includes upgradeable package in the list of downgradeable ones. I did not complete the downgrade, but I would assume that it would have actually updated some of the packages. In my bash function I filter the upgradeable packages out of the installed ones and this is what I expected pacman would do, too. Apparently, this is not the case and I wonder, if this is the intended behavior or if it should be considered as a bug. According to the documentation, I would say this is intended, so the term "downgrade" is a little bit misleading in my opinion. > Pass this option twice to enable package downgrade; in this case pacman will select sync packages whose version does not match with > the local version. This can be useful when the user switches from a testing repo to a stable one. Thanks for clarification, Cedric

2 2

[pacman-dev] [PATCH] makepkg: fix --allsource when remote source files do not reside in SRCDEST
by Cedric Staniewski 20 Oct '09

20 Oct '09

When using the --allsource option, it was assumed that remote source files reside in SRCDEST which is not necessarily always the case. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 24fddf6..806a325 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1074,9 +1074,10 @@ create_srcpackage() { if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}" - elif [ "$SOURCEONLY" -eq 2 -a -f "$SRCDEST/$file" ]; then + elif [ "$SOURCEONLY" -eq 2 ] && [ -f "$file" -o -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/" + [ ! -f "$file" ] && file="$SRCDEST/$file" + ln -s "$file" "${srclinks}/${pkgbase}/" fi done -- 1.6.5

4 5

[pacman-dev] Build issues with the maint branch of pacman
by Ciprian Dorin, Craciun 20 Oct '09

20 Oct '09

Hello all! While trying to build (a patched version) of the latest maint branch in the Git repository I get the following error: ~~~~ $ autoconf configure.ac:60: error: possibly undefined macro: AM_INIT_AUTOMAKE If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:128: error: possibly undefined macro: AC_PROG_LIBTOOL configure.ac:132: error: possibly undefined macro: AM_GNU_GETTEXT configure.ac:133: error: possibly undefined macro: AM_GNU_GETTEXT_VERSION configure.ac:155: error: possibly undefined macro: AM_CONDITIONAL ~~~~ (My patch is only adding a git-dlagent script, and is not touching otherwise the configure.ac file.) Any ideas? (I'm using the latest up-to-date version of ArchLinux.) Thanks, Ciprian.

3 13

[pacman-dev] makepkg test suite
by Allan McRae 20 Oct '09

20 Oct '09

Hi all, I am starting to write a test suite for makepkg. Hopefully this will make it more difficult to break things in the future... I have written a brief outline of how I have started implementing this here: http://wiki.archlinux.org/index.php/User:Allan/Makepkg_Test_Suite I realize that most issues with the implementation will be discovered as it goes on but any comments at this stage would be useful. Allan

2 3

[pacman-dev] [PATCH] Size handling was changed in fgets() functions
by Laszlo Papp 19 Oct '09

19 Oct '09

./src/pacman/util.c: - response size handling was changed in fgets() function, because it's easier to handle the source modification after a size modification ./lib/libalp/be_files.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification ./lib/libalpm/trans.c: - line size handling was changed in fgets() function, because it's easier to handle the source code after a size modification Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- lib/libalpm/be_files.c | 48 ++++++++++++++++++++++++------------------------ lib/libalpm/trans.c | 2 +- src/pacman/util.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 03a1463..01be4a2 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -409,7 +409,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->name, inforeq); /* clear out 'line', to be certain - and to make valgrind happy */ - memset(line, 0, 513); + memset(line, 0, sizeof(line)); pkgpath = get_pkgpath(db, info); @@ -433,7 +433,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } _alpm_strtrim(line); if(strcmp(line, "%NAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->name) != 0) { @@ -441,7 +441,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%VERSION%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } if(strcmp(_alpm_strtrim(line), info->version) != 0) { @@ -449,39 +449,39 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) "mismatch on package %s\n"), db->treename, info->name); } } else if(strcmp(line, "%FILENAME%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->filename, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%DESC%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->desc, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%GROUPS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->groups = alpm_list_add(info->groups, linedup); } } else if(strcmp(line, "%URL%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->url, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%LICENSE%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->licenses = alpm_list_add(info->licenses, linedup); } } else if(strcmp(line, "%ARCH%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->arch, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%BUILDDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -497,7 +497,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->builddate = atol(line); } } else if(strcmp(line, "%INSTALLDATE%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } _alpm_strtrim(line); @@ -513,12 +513,12 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) info->installdate = atol(line); } } else if(strcmp(line, "%PACKAGER%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->packager, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%REASON%") == 0) { - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line)); @@ -528,7 +528,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) * is currently only used in sync databases, and SIZE is * only used in local databases. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->size = atol(_alpm_strtrim(line)); @@ -539,19 +539,19 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } else if(strcmp(line, "%ISIZE%") == 0) { /* ISIZE (installed size) tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } info->isize = atol(_alpm_strtrim(line)); } else if(strcmp(line, "%MD5SUM%") == 0) { /* MD5SUM tag only appears in sync repositories, * not the local one. */ - if(fgets(line, 512, fp) == NULL) { + if(fgets(line, sizeof(line)-1, fp) == NULL) { goto error; } STRDUP(info->md5sum, _alpm_strtrim(line), goto error); } else if(strcmp(line, "%REPLACES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->replaces = alpm_list_add(info->replaces, linedup); @@ -574,13 +574,13 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) while(fgets(line, 256, fp)) { _alpm_strtrim(line); if(strcmp(line, "%FILES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->files = alpm_list_add(info->files, linedup); } } else if(strcmp(line, "%BACKUP%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->backup = alpm_list_add(info->backup, linedup); @@ -602,24 +602,24 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); info->depends = alpm_list_add(info->depends, dep); } } else if(strcmp(line, "%OPTDEPENDS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->optdepends = alpm_list_add(info->optdepends, linedup); } } else if(strcmp(line, "%CONFLICTS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->conflicts = alpm_list_add(info->conflicts, linedup); } } else if(strcmp(line, "%PROVIDES%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1, fp) && strlen(_alpm_strtrim(line))) { char *linedup; STRDUP(linedup, _alpm_strtrim(line), goto error); info->provides = alpm_list_add(info->provides, linedup); @@ -638,7 +638,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fgets(line, 255, fp); _alpm_strtrim(line); if(strcmp(line, "%DELTAS%") == 0) { - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { + while(fgets(line, sizeof(line)-1 fp) && strlen(_alpm_strtrim(line))) { pmdelta_t *delta = _alpm_delta_parse(line); if(delta) { info->deltas = alpm_list_add(info->deltas, delta); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index c99f596..c182510 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -320,7 +320,7 @@ static int grep(const char *fn, const char *needle) } while(!feof(fp)) { char line[1024]; - fgets(line, 1024, fp); + fgets(line, sizeof(line), fp); if(feof(fp)) { continue; } diff --git a/src/pacman/util.c b/src/pacman/util.c index 353aae3..c931bb2 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -638,7 +638,7 @@ static int question(short preset, char *fmt, va_list args) return(preset); } - if(fgets(response, 32, stdin)) { + if(fgets(response, sizeof(response), stdin)) { strtrim(response); if(strlen(response) == 0) { return(preset); -- 1.6.4.4

6 10

[pacman-dev] about vercmp tools
by mcu GPS 19 Oct '09

19 Oct '09

usage: vercmp <ver1> <ver2> return values: < 0 : if ver1 < ver2 0 : if ver1 == ver2 > 0 : if ver1 > ver2 [arch@myarchtp mkarchlive] $ vercmp 0.1 0.1_rc1 -1 [arch@myarchtp mkarchlive] $ vercmp 0.1_rc1 0.1 1 [arch@myarchtp mkarchlive] $ vercmp 0.1_rc1 0.1_r1 1 [arch@myarchtp mkarchlive] $ vercmp 0.1_r1 0.1_rc1 -1 0.1_rc1 > 0.1 ? 0.1_rc1 > 0.1_r1 ? this is a bug?

2 2

[pacman-dev] [PATCH 4/4] Change strcat function using for strncat
by Laszlo Papp 18 Oct '09

18 Oct '09

* Size examined str* function usage is a common coding practice, because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 553591d..41a5783 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -105,7 +105,7 @@ int _alpm_makepath_mode(const char *path, mode_t mode) /* we have another path component- append the newest component to * existing string and create one more level of dir structure */ strcat(incr, "/"); - strcat(incr, ptr); + strncat(incr, ptr, strlen(ptr)); if(access(incr, F_OK)) { if(mkdir(incr, mode)) { ret = 1; -- 1.6.4.4

3 3

[pacman-dev] [PATCH 2/4] Change sprintf function using for snprintf
by Laszlo Papp 18 Oct '09

18 Oct '09

* Size examined str* function usage is a common coding practice, because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- lib/libalpm/add.c | 4 ++-- lib/libalpm/be_files.c | 10 +++++----- lib/libalpm/conflict.c | 2 +- lib/libalpm/db.c | 4 ++-- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 16 +++++++++------- src/pacman/sync.c | 2 +- src/pacman/util.c | 2 +- 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ebcd6a5..209c38e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -311,7 +311,7 @@ static int extract_single_file(struct archive *archive, size_t backup_len = strlen(oldbackup) + 34; MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(backup, "%s\t%s", oldbackup, hash_pkg); + snprintf(backup, backup_len, "%s\t%s", oldbackup, hash_pkg); backup[backup_len-1] = '\0'; FREE(oldbackup); backups->data = backup; @@ -462,7 +462,7 @@ static int extract_single_file(struct archive *archive, hash = alpm_compute_md5sum(filename); MALLOC(backup, backup_len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(backup, "%s\t%s", oldbackup, hash); + snprintf(backup, backup_len, "%s\t%s", oldbackup, hash); backup[backup_len-1] = '\0'; FREE(hash); FREE(oldbackup); diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index ffbaa8d..36a9cfc 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -67,7 +67,7 @@ static time_t getlastupdate(pmdb_t *db) dbpath = _alpm_db_path(db); /* dbpath + '.lastupdate' + NULL */ MALLOC(file, strlen(dbpath) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", dbpath); + snprintf(file, strlen(dbpath), "%s.lastupdate", dbpath); /* get the last update time, if it's there */ if((fp = fopen(file, "r")) == NULL) { @@ -103,7 +103,7 @@ static int setlastupdate(pmdb_t *db, time_t time) dbpath = _alpm_db_path(db); /* dbpath + '.lastupdate' + NULL */ MALLOC(file, strlen(dbpath) + 12, RET_ERR(PM_ERR_MEMORY, ret)); - sprintf(file, "%s.lastupdate", dbpath); + snprintf(file, strlen(dbpath), "%s.lastupdate", dbpath); if((fp = fopen(file, "w")) == NULL) { free(file); @@ -211,7 +211,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) len = strlen(db->treename) + strlen(DBEXT) + 1; MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfile, "%s" DBEXT, db->treename); + snprintf(dbfile, len, "%s" DBEXT, db->treename); dbpath = alpm_option_get_dbpath(); @@ -241,7 +241,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) /* form the path to the db location */ len = strlen(dbpath) + strlen(db->treename) + strlen(DBEXT) + 1; MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1)); - sprintf(dbfilepath, "%s%s" DBEXT, dbpath, db->treename); + snprintf(dbfilepath, len, "%s%s" DBEXT, dbpath, db->treename); /* uncompress the sync database */ checkdbdir(db); @@ -378,7 +378,7 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info) dbpath = _alpm_db_path(db); len = strlen(dbpath) + strlen(info->name) + strlen(info->version) + 3; MALLOC(pkgpath, len, RET_ERR(PM_ERR_MEMORY, NULL)); - sprintf(pkgpath, "%s%s-%s/", dbpath, info->name, info->version); + snprintf(pkgpath, len, "%s%s-%s/", dbpath, info->name, info->version); return(pkgpath); } diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index e934c01..e27649c 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -525,7 +525,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, /* check if all files of the dir belong to the installed pkg */ if(!resolved_conflict && S_ISDIR(lsbuf.st_mode) && dbpkg) { char *dir = malloc(strlen(filestr) + 2); - sprintf(dir, "%s/", filestr); + snprintf(dir, strlen(filestr)+2, "%s/", filestr); if(alpm_list_find_str(alpm_pkg_get_files(dbpkg),dir)) { _alpm_log(PM_LOG_DEBUG, "check if all files in %s belongs to %s\n", dir, dbpkg->name); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index dca5452..a7e6d18 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -369,12 +369,12 @@ const char *_alpm_db_path(pmdb_t *db) if(db->is_local) { pathsize = strlen(dbpath) + strlen(db->treename) + 2; CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL)); - sprintf(db->_path, "%s%s/", dbpath, db->treename); + snprintf(db->_path, pathsize, "%s%s/", dbpath, db->treename); } else { pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 2; CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL)); /* all sync DBs now reside in the sync/ subdir of the dbpath */ - sprintf(db->_path, "%ssync/%s/", dbpath, db->treename); + snprintf(db->_path, pathsize, "%ssync/%s/", dbpath, db->treename); } _alpm_log(PM_LOG_DEBUG, "database path for tree %s set to %s\n", db->treename, db->_path); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index aea71db..f4a6879 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -113,7 +113,7 @@ static alpm_list_t *check_arch(alpm_list_t *pkgs) const char *pkgver = alpm_pkg_get_version(pkg); size_t len = strlen(pkgname) + strlen(pkgver) + strlen(pkgarch) + 3; MALLOC(string, len, RET_ERR(PM_ERR_MEMORY, invalid)); - sprintf(string, "%s-%s-%s", pkgname, pkgver, pkgarch); + snprintf(string, len, "%s-%s-%s", pkgname, pkgver, pkgarch); invalid = alpm_list_add(invalid, string); } } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d910809..553591d 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -315,7 +315,7 @@ int _alpm_unpack(const char *archive, const char *prefix, alpm_list_t *list, int st = archive_entry_stat(entry); entryname = archive_entry_pathname(entry); - + if(S_ISREG(st->st_mode)) { archive_entry_set_perm(entry, 0644); } else if(S_ISDIR(st->st_mode)) { @@ -394,7 +394,7 @@ int _alpm_rmrf(const char *path) } for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { - sprintf(name, "%s/%s", path, dp->d_name); + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { errflag += _alpm_rmrf(name); } @@ -651,7 +651,9 @@ int _alpm_lstat(const char *path, struct stat *buf) char SYMEXPORT *alpm_compute_md5sum(const char *filename) { unsigned char output[16]; + int soutput = sizeof(output); char *md5sum; + int smd5sum = 33; int ret, i; ALPM_LOG_FUNC; @@ -659,7 +661,7 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) ASSERT(filename != NULL, return(NULL)); /* allocate 32 chars plus 1 for null */ - md5sum = calloc(33, sizeof(char)); + md5sum = calloc(smd5sum, sizeof(char)); ret = md5_file(filename, output); if (ret > 0) { @@ -667,11 +669,11 @@ char SYMEXPORT *alpm_compute_md5sum(const char *filename) } /* Convert the result to something readable */ - for (i = 0; i < 16; i++) { - /* sprintf is acceptable here because we know our output */ - sprintf(md5sum +(i * 2), "%02x", output[i]); + for (i = 0; i < soutput; i++) { + /* snprintf is acceptable here because we know our output */ + snprintf(md5sum +(i * 2), smd5sum-i*2, "%02x", output[i]); } - md5sum[32] = '\0'; + md5sum[smd5sum-1] = '\0'; _alpm_log(PM_LOG_DEBUG, "md5(%s) = %s\n", filename, md5sum); return(md5sum); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a2ef616..1507dd5 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -117,7 +117,7 @@ static int sync_cleandb_all(void) { * and only the unused sync dbs in dbpath/sync/ */ ret += sync_cleandb(dbpath, 0); - sprintf(newdbpath, "%s%s", dbpath, "sync/"); + snprintf(newdbpath, PATH_MAX, "%s%s", dbpath, "sync/"); ret += sync_cleandb(newdbpath, 1); printf(_("Database directory cleaned up\n")); diff --git a/src/pacman/util.c b/src/pacman/util.c index 1143bef..f4e1756 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -128,7 +128,7 @@ int rmrf(const char *path) for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { if(dp->d_ino) { char name[PATH_MAX]; - sprintf(name, "%s/%s", path, dp->d_name); + snprintf(name, PATH_MAX, "%s/%s", path, dp->d_name); if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { errflag += rmrf(name); } -- 1.6.4.4

3 2

[pacman-dev] [PATCH 3/4] Change strcpy function using for strncpy
by Laszlo Papp 18 Oct '09

18 Oct '09

* Size examined str* function usage is a common coding practice, because it's more safer to avoid breakage while using str* functions. Signed-off-by: Laszlo Papp <djszapi(a)archlinux.us> --- src/pacman/pacman.c | 4 ++-- src/pacman/query.c | 4 ++-- src/pacman/util.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 5e824f4..0aaf6f0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -960,11 +960,11 @@ static void cl_to_log(int argc, char* argv[]) return; char *p = cl_text; for(i = 0; i<argc-1; i++) { - strcpy(p, argv[i]); + strncpy(p, argv[i], strlen(argv[i])); p += strlen(argv[i]); *p++ = ' '; } - strcpy(p, argv[i]); + strncpy(p, argv[i], strlen(argv[i])); alpm_logaction("Running '%s'\n", cl_text); free(cl_text); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 6b6a25d..cb15852 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -326,7 +326,7 @@ static int check(pmpkg_t *pkg) pm_fprintf(stderr, PM_LOG_ERROR, _("root path too long\n")); return(1); } - strcpy(f, root); + strncpy(f, root, rootlen); const char *pkgname = alpm_pkg_get_name(pkg); for(i = alpm_pkg_get_files(pkg); i; i = alpm_list_next(i)) { @@ -337,7 +337,7 @@ static int check(pmpkg_t *pkg) pm_fprintf(stderr, PM_LOG_WARNING, _("file path too long\n")); continue; } - strcpy(f + rootlen, path); + strncpy(f + rootlen, path, strlen(path)); allfiles++; /* use lstat to prevent errors from symlinks */ if(lstat(f, &st) != 0) { diff --git a/src/pacman/util.c b/src/pacman/util.c index f4e1756..4afed1c 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -352,7 +352,7 @@ char *strreplace(const char *str, const char *needle, const char *replace) if(*p) { /* add the rest of 'p' */ - strcpy(newp, p); + strncpy(newp, p, strlen(p)); newp += strlen(p); } *newp = '\0'; -- 1.6.4.4

3 2