moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Move infrequently used path variables off the stack

Browse Source 
These backup-related paths in package extraction are used on relatively
few files during the install process, so bump them off the stack and
into the heap. This removes the artificial PATH_MAX limitation on their
length as well.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-09-30 11:43:11 -05:00
parent 027a8a3260
commit 980b3faea5
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/libalpm/add.c
View File

@ -157,8 +157,6 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
entryname = archive_entry_pathname(entry); entryname = archive_entry_pathname(entry);
entrymode = archive_entry_mode(entry); entrymode = archive_entry_mode(entry);
memset(filename, 0, PATH_MAX); /* just to be sure */
if(strcmp(entryname, ".INSTALL") == 0) { if(strcmp(entryname, ".INSTALL") == 0) {
/* the install script goes inside the db */ /* the install script goes inside the db */
snprintf(filename, PATH_MAX, "%s%s-%s/install", snprintf(filename, PATH_MAX, "%s%s-%s/install",
@ -293,17 +291,18 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
STRDUP(entryname_orig, entryname, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); STRDUP(entryname_orig, entryname, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
if(needbackup) { if(needbackup) {
char checkfile[PATH_MAX]; char *checkfile;
char *hash_local = NULL, *hash_pkg = NULL; char *hash_local = NULL, *hash_pkg = NULL;
int ret; size_t len;
snprintf(checkfile, PATH_MAX, "%s.paccheck", filename); len = strlen(filename) + 10;
MALLOC(checkfile, len,
errors++; handle->pm_errno = ALPM_ERR_MEMORY; goto needbackup_cleanup);
snprintf(checkfile, len, "%s.paccheck", filename);
ret = perform_extraction(handle, archive, entry, checkfile, entryname_orig); if(perform_extraction(handle, archive, entry, checkfile, entryname_orig)) {
if(ret == 1) { errors++;
/* error */ goto needbackup_cleanup;
FREE(entryname_orig);
return 1;
} }
hash_local = alpm_compute_md5sum(filename); hash_local = alpm_compute_md5sum(filename);
@ -331,8 +330,11 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
if(hash_local && hash_pkg && strcmp(hash_local, hash_pkg) != 0) { if(hash_local && hash_pkg && strcmp(hash_local, hash_pkg) != 0) {
/* looks like we have a local file that has a different hash as the /* looks like we have a local file that has a different hash as the
* file in the package, move it to a .pacorig */ * file in the package, move it to a .pacorig */
char newpath[PATH_MAX]; char *newpath;
snprintf(newpath, PATH_MAX, "%s.pacorig", filename); size_t newlen = strlen(filename) + 9;
MALLOC(newpath, newlen,
errors++; handle->pm_errno = ALPM_ERR_MEMORY; goto needbackup_cleanup);
snprintf(newpath, newlen, "%s.pacorig", filename);
/* move the existing file to the "pacorig" */ /* move the existing file to the "pacorig" */
if(try_rename(handle, filename, newpath)) { if(try_rename(handle, filename, newpath)) {
@ -347,6 +349,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
alpm_logaction(handle, "warning: %s saved as %s\n", filename, newpath); alpm_logaction(handle, "warning: %s saved as %s\n", filename, newpath);
} }
} }
free(newpath);
} else { } else {
/* local file is identical to pkg one, so just remove pkg one */ /* local file is identical to pkg one, so just remove pkg one */
unlink(checkfile); unlink(checkfile);
@ -382,10 +385,13 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
_alpm_log(handle, ALPM_LOG_DEBUG, "action: leaving existing file in place\n"); _alpm_log(handle, ALPM_LOG_DEBUG, "action: leaving existing file in place\n");
unlink(checkfile); unlink(checkfile);
} else { } else {
char newpath[PATH_MAX]; char *newpath;
size_t newlen = strlen(filename) + 8;
_alpm_log(handle, ALPM_LOG_DEBUG, "action: keeping current file and installing" _alpm_log(handle, ALPM_LOG_DEBUG, "action: keeping current file and installing"
" new one with .pacnew ending\n"); " new one with .pacnew ending\n");
snprintf(newpath, PATH_MAX, "%s.pacnew", filename); MALLOC(newpath, newlen,
errors++; handle->pm_errno = ALPM_ERR_MEMORY; goto needbackup_cleanup);
snprintf(newpath, newlen, "%s.pacnew", filename);
if(try_rename(handle, checkfile, newpath)) { if(try_rename(handle, checkfile, newpath)) {
errors++; errors++;
} else { } else {
@ -394,14 +400,15 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
alpm_logaction(handle, "warning: %s installed as %s\n", alpm_logaction(handle, "warning: %s installed as %s\n",
filename, newpath); filename, newpath);
} }
free(newpath);
} }
} }
FREE(hash_local); needbackup_cleanup:
FREE(hash_pkg); free(checkfile);
free(hash_local);
free(hash_pkg);
} else { } else {
int ret;
/* we didn't need a backup */ /* we didn't need a backup */
if(notouch) { if(notouch) {
/* change the path to a .pacnew extension */ /* change the path to a .pacnew extension */
@ -420,11 +427,11 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
unlink(filename); unlink(filename);
} }
ret = perform_extraction(handle, archive, entry, filename, entryname_orig); if(perform_extraction(handle, archive, entry, filename, entryname_orig)) {
if(ret == 1) {
/* error */ /* error */
FREE(entryname_orig); free(entryname_orig);
return 1; errors++;
return errors;
} }
/* calculate an hash if this is in newpkg's backup */ /* calculate an hash if this is in newpkg's backup */
@ -441,7 +448,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
backup->hash = newhash; backup->hash = newhash;
} }
} }
FREE(entryname_orig); free(entryname_orig);
return errors; return errors;
} }