Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libalpm/package.c43
-rw-r--r--src/pacman/add.c2
-rw-r--r--src/pacman/log.c6
3 files changed, 31 insertions, 20 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 84db3719..4c78fdaf 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -237,7 +237,7 @@ static int parse_descfile(char *descfile, pmpkg_t *info, int output)
pmpkg_t *_alpm_pkg_load(char *pkgfile)
{
char *expath;
- int i;
+ int ret = ARCHIVE_OK;
int config = 0;
int filelist = 0;
int scriptcheck = 0;
@@ -254,32 +254,36 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
RET_ERR(PM_ERR_WRONG_ARGS, NULL);
}
- if ((archive = archive_read_new ()) == NULL)
+ if((archive = archive_read_new()) == NULL) {
RET_ERR(PM_ERR_LIBARCHIVE_ERROR, NULL);
+ }
- archive_read_support_compression_all (archive);
- archive_read_support_format_all (archive);
+ archive_read_support_compression_all(archive);
+ archive_read_support_format_all(archive);
- if (archive_read_open_file (archive, pkgfile, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK)
+ if (archive_read_open_file(archive, pkgfile, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
RET_ERR(PM_ERR_PKG_OPEN, NULL);
+ }
info = _alpm_pkg_new(NULL, NULL);
if(info == NULL) {
- archive_read_finish (archive);
+ archive_read_finish(archive);
RET_ERR(PM_ERR_MEMORY, NULL);
}
/* TODO there is no reason to make temp files to read
* from a libarchive archive, it can be done by reading
- * directly from the archive */
- for(i = 0; archive_read_next_header (archive, &entry) == ARCHIVE_OK; i++) {
+ * directly from the archive
+ * See: archive_read_data_into_buffer
+ * requires changes 'parse_descfile' as well
+ * */
+
+ /* Read through the entire archive for metadata. We will continue reading
+ * even if all metadata is found, to verify the integrity of the archive in
+ * full */
+ while((ret = archive_read_next_header (archive, &entry)) == ARCHIVE_OK) {
const char *entry_name = archive_entry_pathname(entry);
- if(config && filelist && scriptcheck) {
- /* we have everything we need */
- break;
- }
-
if(strcmp(entry_name, ".PKGINFO") == 0) {
/* extract this file into /tmp. it has info for us */
descfile = strdup("/tmp/alpm_XXXXXX");
@@ -343,18 +347,25 @@ pmpkg_t *_alpm_pkg_load(char *pkgfile)
}
if(archive_read_data_skip(archive)) {
- _alpm_log(PM_LOG_ERROR, _("bad package file in %s"), pkgfile);
+ _alpm_log(PM_LOG_ERROR, _("error while reading package: %s"), archive_error_string(archive));
+ pm_errno = PM_ERR_LIBARCHIVE_ERROR;
goto error;
}
expath = NULL;
}
- archive_read_finish(archive);
+ if(ret != ARCHIVE_EOF) { /* An error occured */
+ _alpm_log(PM_LOG_ERROR, _("error while reading package: %s"), archive_error_string(archive));
+ pm_errno = PM_ERR_LIBARCHIVE_ERROR;
+ goto error;
+ }
if(!config) {
- _alpm_log(PM_LOG_ERROR, _("missing package info file in %s"), pkgfile);
+ _alpm_log(PM_LOG_ERROR, _("missing package metadata"), pkgfile);
goto error;
}
+ archive_read_finish(archive);
+
if(!filelist) {
_alpm_log(PM_LOG_ERROR, _("missing package filelist in %s, generating one"), pkgfile);
info->files = all_files;
diff --git a/src/pacman/add.c b/src/pacman/add.c
index 5137a8b9..6bed818b 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -77,7 +77,7 @@ int pacman_add(alpm_list_t *targets)
for(i = targets; i; i = i->next) {
if(alpm_trans_addtarget(i->data) == -1) {
MSG(NL, "\n");
- ERR(NL, _("failed to add target '%s' (%s)\n"), (char *)i->data, alpm_strerror(pm_errno));
+ ERR(NL, _("failed to add target '%s' (%s)"), (char *)i->data, alpm_strerror(pm_errno));
retval = 1;
goto cleanup;
}
diff --git a/src/pacman/log.c b/src/pacman/log.c
index ccdd9a66..4bed22ae 100644
--- a/src/pacman/log.c
+++ b/src/pacman/log.c
@@ -126,19 +126,19 @@ void pm_fprintf(FILE *file, unsigned short line, char *fmt, ...)
}
fprintf(file, str);
+
if(needpad == 1) {
unsigned int i, cols = getcols();
for(i=len; i < cols; ++i) {
fprintf(file, " ");
}
- if(neednl == 1) {
+ if(neednl == 1 && line == NL) {
fprintf(file, "\n");
neednl = 0;
- } else {
- neednl = 1;
}
}
fflush(file);
+ neednl = (str[strlen(str)-1] == '\n') ? 0 : 1;
}
/* Check verbosity option and, if set, print the