On 12/15/13 13:00, Allan McRae wrote:

On 03/12/13 06:45, Olivier Brunel wrote:

...

Because this event is triggered when an optdepend for another package is being removed.

Signed-off-by: Olivier Brunel jjk@jjacky.com

I am not convinced by this. The event happens when the dependencies are being checked before removing a package. pacman current just prints a warning, but another frontend might want to query the user before removing the package. So at that stage, the optdep is required and not removed.

Well, I think it's wrong to say the optdep is required. Not just because there's no real sense of "requirement" (as in, it's optional), but more importantly because the only thing is that a package that will be removed happens to be listed as optdep of another (installed) package.

It doesn't mean that this was the reason the package was installed, or that the user ever made any use of the package as such optdep. Indicating that there's a notion of requirement here feels just wrong to me. And the name ALPM_EVENT_OPTDEP_REQUIRED implies (to me) that this is what the event is about, the requirement part. When going over this I got confused about what it meant, and this is why I suggested a renaming.

To go back to your example, I don't see an problem with the following: - ALPM emits an event OPTDEP_REMOVED to indicate an optdep is (going to be) removed. - the frontend then queries the user, to confirm this removal (as this is a removal we're talking about here).

To be pedantic, we might want to say ALPM_EVENT_OPTDEP_REMOVAL_PENDING or something, which would be more precise/correct, but also quite long. For the sake or being short, I just went with REMOVED, which I think remains valid. REQUIRED OTOH does not.

I'm not opposed to using something other than REMOVED, but IMHO it should be renamed, as REQUIRED is wrong/confusing (it doesn't even convey anything regarding the removal, which again is really what this (event) is about, the (pending) *removal* of an optdep).

-j

...

---

lib/libalpm/alpm.h | 2 +- lib/libalpm/remove.c | 2 +- src/pacman/callback.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e9b0feb..c6d9064 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -377,7 +377,7 @@ typedef enum _alpm_event_t { ALPM_EVENT_DISKSPACE_DONE, /** An optdepend for another package is being removed * The requiring package and its dependency are passed to the callback */

• ALPM_EVENT_OPTDEP_REQUIRED,

• ALPM_EVENT_OPTDEP_REMOVED, /** A configured repository database is missing */ ALPM_EVENT_DATABASE_MISSING, /** Checking keys used to create signatures are in keyring. */

diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9417a61..8884495 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -179,7 +179,7 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; if(alpm_pkg_find(lp, optdep->name)) {

• 			EVENT(handle, ALPM_EVENT_OPTDEP_REQUIRED, pkg, optdep);
  

• 			EVENT(handle, ALPM_EVENT_OPTDEP_REMOVED, pkg, optdep);
  	}
  }
  

  }

diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c412f6f..e80a071 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -247,7 +247,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("checking available disk space...\n")); } break;

• case ALPM_EVENT_OPTDEP_REQUIRED:
  

• case ALPM_EVENT_OPTDEP_REMOVED:
  colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1),
  	alpm_dep_compute_string(data2));
  break;
  
  

On 03/12/13 06:45, Olivier Brunel wrote:

Signed-off-by: Olivier Brunel jjk@jjacky.com

Ack. I extended the commit message to note it is for _future_ clarity that this rename is being done for.

---

lib/libalpm/add.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 214e78e..c7e5b5d 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -459,7 +459,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, alpm_pkg_t *oldpkg = NULL; alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans;

• alpm_progress_t event = ALPM_PROGRESS_ADD_START;

• alpm_progress_t progress = ALPM_PROGRESS_ADD_START; alpm_event_t done = ALPM_EVENT_ADD_DONE, start = ALPM_EVENT_ADD_START; const char *log_msg = "adding"; const char *pkgfile;

@@ -472,17 +472,17 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, int cmp = _alpm_pkg_compare_versions(newpkg, local); if(cmp < 0) { log_msg = "downgrading";

• 	event = ALPM_PROGRESS_DOWNGRADE_START;
  

• 	progress = ALPM_PROGRESS_DOWNGRADE_START;
  start = ALPM_EVENT_DOWNGRADE_START;
  done = ALPM_EVENT_DOWNGRADE_DONE;
  

  } else if(cmp == 0) { log_msg = "reinstalling";

• 	event = ALPM_PROGRESS_REINSTALL_START;
  

• 	progress = ALPM_PROGRESS_REINSTALL_START;
  start = ALPM_EVENT_REINSTALL_START;
  done = ALPM_EVENT_REINSTALL_DONE;
  

  } else { log_msg = "upgrading";

• 	event = ALPM_PROGRESS_UPGRADE_START;
  

• 	progress = ALPM_PROGRESS_UPGRADE_START;
  start = ALPM_EVENT_UPGRADE_START;
  done = ALPM_EVENT_UPGRADE_DONE;
  

  }

@@ -572,7 +572,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, }

/* call PROGRESS once with 0 percent, as we sort-of skip that here */

• PROGRESS(handle, event, newpkg->name, 0, pkg_count, pkg_current);
  

• PROGRESS(handle, progress, newpkg->name, 0, pkg_count, pkg_current);
  
  

  for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) { int percent;

@@ -590,7 +590,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, percent = 0; }

• 	PROGRESS(handle, event, newpkg->name, percent, pkg_count, pkg_current);
  

• 	PROGRESS(handle, progress, newpkg->name, percent, pkg_count, pkg_current);
  
  /* extract the next file from the archive */
  errors += extract_single_file(handle, archive, entry, newpkg, oldpkg);
  

@@ -647,7 +647,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, newpkg->name); }

• PROGRESS(handle, event, newpkg->name, 100, pkg_count, pkg_current);

• PROGRESS(handle, progress, newpkg->name, 100, pkg_count, pkg_current);

  switch(done) { case ALPM_EVENT_ADD_DONE:

On 03/12/13 06:45, Olivier Brunel wrote:

Instead of using two void* arguments for all events, we now send one pointer to an alpm_event_t struct. This contains the type of event that was triggered.

With this information, the pointer can then be typecasted to the event-specific struct in order to get additional arguments.

Signed-off-by: Olivier Brunel jjk@jjacky.com

I have given couple of suggestions below for naming that I think makes things clearer. Also a query regarding the delta event struct.

Otherwise, this looks good.

---

lib/libalpm/add.c | 31 ++++++----- lib/libalpm/alpm.h | 150 +++++++++++++++++++++++++++++--------------------- lib/libalpm/be_sync.c | 6 +- lib/libalpm/handle.h | 4 +- lib/libalpm/remove.c | 25 +++++++-- lib/libalpm/sync.c | 82 +++++++++++++++++++-------- lib/libalpm/util.c | 6 +- src/pacman/callback.c | 87 ++++++++++++++++------------- src/pacman/callback.h | 2 +- 9 files changed, 244 insertions(+), 149 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index c7e5b5d..3067df5 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -460,7 +460,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; alpm_progress_t progress = ALPM_PROGRESS_ADD_START;

• alpm_event_t done = ALPM_EVENT_ADD_DONE, start = ALPM_EVENT_ADD_START;

• alpm_event_update_t event; const char *log_msg = "adding"; const char *pkgfile;

@@ -473,18 +473,15 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(cmp < 0) { log_msg = "downgrading"; progress = ALPM_PROGRESS_DOWNGRADE_START;

• 	start = ALPM_EVENT_DOWNGRADE_START;
  

• 	done = ALPM_EVENT_DOWNGRADE_DONE;
  

• 	event.operation = ALPM_OPERATION_DOWNGRADE;
  

  } else if(cmp == 0) { log_msg = "reinstalling"; progress = ALPM_PROGRESS_REINSTALL_START;

• 	start = ALPM_EVENT_REINSTALL_START;
  

• 	done = ALPM_EVENT_REINSTALL_DONE;
  

• 	event.operation = ALPM_OPERATION_REINSTALL;
  

  } else { log_msg = "upgrading"; progress = ALPM_PROGRESS_UPGRADE_START;

• 	start = ALPM_EVENT_UPGRADE_START;
  

• 	done = ALPM_EVENT_UPGRADE_DONE;
  

• 	event.operation = ALPM_OPERATION_UPGRADE;
  

  } is_upgrade = 1;

@@ -496,9 +493,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,

/* copy over the install reason */
newpkg->reason = alpm_pkg_get_reason(local);

• } else {

• event.operation = ALPM_OPERATION_INSTALL;
  

  }

• EVENT(handle, start, newpkg, local);

• event.type = ALPM_EVENT_UPDATE_START;

• event.oldpkg = oldpkg;

• event.newpkg = newpkg;

• EVENT(handle, &event);

  pkgfile = newpkg->origin_data.file;

@@ -649,20 +651,20 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,

PROGRESS(handle, progress, newpkg->name, 100, pkg_count, pkg_current);

• switch(done) {

• case ALPM_EVENT_ADD_DONE:
  

• switch(event.operation) {

• case ALPM_OPERATION_INSTALL:
  alpm_logaction(handle, ALPM_CALLER_PREFIX, "installed %s (%s)\n",
  		newpkg->name, newpkg->version);
  break;
  

• case ALPM_EVENT_DOWNGRADE_DONE:
  

• case ALPM_OPERATION_DOWNGRADE:
  alpm_logaction(handle, ALPM_CALLER_PREFIX, "downgraded %s (%s -> %s)\n",
  		newpkg->name, oldpkg->version, newpkg->version);
  break;
  

• case ALPM_EVENT_REINSTALL_DONE:
  

• case ALPM_OPERATION_REINSTALL:
  alpm_logaction(handle, ALPM_CALLER_PREFIX, "reinstalled %s (%s)\n",
  		newpkg->name, newpkg->version);
  break;
  

• case ALPM_EVENT_UPGRADE_DONE:
  

• case ALPM_OPERATION_UPGRADE:
  alpm_logaction(handle, ALPM_CALLER_PREFIX, "upgraded %s (%s -> %s)\n",
  		newpkg->name, oldpkg->version, newpkg->version);
  break;
  

@@ -682,7 +684,8 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, free(scriptlet); }

• EVENT(handle, done, newpkg, oldpkg);

• event.type = ALPM_EVENT_UPDATE_DONE;
• EVENT(handle, &event);

cleanup: _alpm_pkg_free(oldpkg); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index c6d9064..eba9375 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -275,10 +275,9 @@ int alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, ...) __attribute__((format(printf, 3, 4)));

/**

• • Events.
• • NULL parameters are passed to in all events unless specified otherwise.

• • Type of events.
  */

-typedef enum _alpm_event_t { +typedef enum _alpm_event_type_t { /** Dependencies will be computed for a package. */ ALPM_EVENT_CHECKDEPS_START = 1, /** Dependencies were computed for a package. */ @@ -295,49 +294,12 @@ typedef enum _alpm_event_t { ALPM_EVENT_INTERCONFLICTS_START, /** Inter-conflicts were checked for target package. */ ALPM_EVENT_INTERCONFLICTS_DONE,

• /** Package will be installed.

• * A pointer to the target package is passed to the callback.
  

• */
  

• ALPM_EVENT_ADD_START,
• /** Package was installed.

• * A pointer to the new package is passed to the callback.
  

• */
  

• ALPM_EVENT_ADD_DONE,
• /** Package will be removed.

• * A pointer to the target package is passed to the callback.
  

• */
  

• ALPM_EVENT_REMOVE_START,
• /** Package was removed.

• * A pointer to the removed package is passed to the callback.
  

• */
  

• ALPM_EVENT_REMOVE_DONE,
• /** Package will be upgraded.

• * A pointer to the upgraded package is passed to the callback.
  

• */
  

• ALPM_EVENT_UPGRADE_START,
• /** Package was upgraded.

• * A pointer to the new package, and a pointer to the old package is passed
  

• * to the callback, respectively.
  

• */
  

• ALPM_EVENT_UPGRADE_DONE,
• /** Package will be downgraded.

• * A pointer to the downgraded package is passed to the callback.
  

• */
  

• ALPM_EVENT_DOWNGRADE_START,
• /** Package was downgraded.

• * A pointer to the new package, and a pointer to the old package is passed
  

• * to the callback, respectively.
  

• */
  

• ALPM_EVENT_DOWNGRADE_DONE,
• /** Package will be reinstalled.

• * A pointer to the reinstalled package is passed to the callback.
  

• */
  

• ALPM_EVENT_REINSTALL_START,
• /** Package was reinstalled.

• * A pointer to the new package, and a pointer to the old package is passed
  

• * to the callback, respectively.
  

• */
  

• ALPM_EVENT_REINSTALL_DONE,

• /** Package will be installed/upgraded/downgraded/re-installed/removed; See

• * alpm_event_update_t for arguments. */
  

• ALPM_EVENT_UPDATE_START,

UPDATE does not sound right to me here. How about ALPM_EVENT_PACKAGE_OPERATION_START?

• /** Package was installed/upgraded/downgraded/re-installed/removed; See

• * alpm_event_update_t for arguments. */
  

• ALPM_EVENT_UPDATE_DONE, /** Target package's integrity will be checked. */ ALPM_EVENT_INTEGRITY_START, /** Target package's integrity was checked. */

@@ -354,31 +316,27 @@ typedef enum _alpm_event_t { ALPM_EVENT_DELTA_PATCHES_START, /** Deltas were applied to packages. */ ALPM_EVENT_DELTA_PATCHES_DONE,

• /** Delta patch will be applied to target package.

• * The filename of the package and the filename of the patch is passed to the
  

• * callback.
  

• */
  

• /** Delta patch will be applied to target package; See

• * alpm_event_delta_patch_t for arguments.. */
  

  ALPM_EVENT_DELTA_PATCH_START, /** Delta patch was applied to target package. */ ALPM_EVENT_DELTA_PATCH_DONE, /** Delta patch failed to apply to target package. */ ALPM_EVENT_DELTA_PATCH_FAILED,

• /** Scriptlet has printed information.

• * A line of text is passed to the callback.
  

• */
  

• /** Scriptlet has printed information; See alpm_event_scriptlet_info_t for

• * arguments. */
  

  ALPM_EVENT_SCRIPTLET_INFO,

• /** Files will be downloaded from a repository.

• * The repository's tree name is passed to the callback.
  

• */
  

• /** Files will be downloaded from a repository. */ ALPM_EVENT_RETRIEVE_START,

• /** Disk space usage will be computed for a package */

• /** Disk space usage will be computed for a package. */ ALPM_EVENT_DISKSPACE_START,

• /** Disk space usage was computed for a package */

• /** Disk space usage was computed for a package. */ ALPM_EVENT_DISKSPACE_DONE,

• /** An optdepend for another package is being removed

• * The requiring package and its dependency are passed to the callback */
  

• /** An optdepend for another package is being removed; See

• * alpm_event_optdep_removed_t for arguments. */
  

  ALPM_EVENT_OPTDEP_REMOVED,

• /** A configured repository database is missing */

• /** A configured repository database is missing; See

• * alpm_event_database_missing_t for arguments. */
  

  ALPM_EVENT_DATABASE_MISSING, /** Checking keys used to create signatures are in keyring. */ ALPM_EVENT_KEYRING_START,

@@ -388,10 +346,76 @@ typedef enum _alpm_event_t { ALPM_EVENT_KEY_DOWNLOAD_START, /** Key downloading is finished. */ ALPM_EVENT_KEY_DOWNLOAD_DONE +} alpm_event_type_t;

+/** Events.

• • This is a generic struct this is passed to the callback, that allows the
• • frontend to know which type of event was triggered. It is then possible to
• • typecast the pointer to the right structure, in order to access
• • event-specific data. */

+typedef struct _alpm_event_t {

• /** Type of event. */
• alpm_event_type_t type;

} alpm_event_t;

-/** Event callback */ -typedef void (*alpm_cb_event)(alpm_event_t, void *, void *); +typedef enum _alpm_pkg_operation_t {

_alpm_package_operation_t

• /** Package (to be) installed. (No oldpkg) */
• ALPM_OPERATION_INSTALL = 1,

ALPM_PACKAGE_INSTALL

• /** Package (to be) upgraded */
• ALPM_OPERATION_UPGRADE,
• /** Package (to be) re-installed. */
• ALPM_OPERATION_REINSTALL,
• /** Package (to be) downgraded. */
• ALPM_OPERATION_DOWNGRADE,
• /** Package (to be) removed. (No newpkg) */
• ALPM_OPERATION_REMOVE

+} alpm_operation_t;

alpm_package_operation_t

+typedef struct _alpm_event_update_t {

_alpm_event_package_operation_t

• /** Type of event. */
• alpm_event_type_t type;
• /** Type of operation. */
• alpm_operation_t operation;
• /** Old package. */
• alpm_pkg_t *oldpkg;
• /** New package. */
• alpm_pkg_t *newpkg;

+} alpm_event_update_t;

+typedef struct _alpm_event_optdep_removed_t {

• /** Type of event. */
• alpm_event_type_t type;
• /** Package with the optdep. */
• alpm_pkg_t *pkg;
• /** Optdep being removed. */
• alpm_depend_t *optdep;

+} alpm_event_optdep_removed_t;

+typedef struct _alpm_event_delta_patch_t {

• /** Type of event. */
• alpm_event_type_t type;
• /** Name of the file. */
• const char *pkg_filename;
• /** Name of the patch. */
• const char *patch_filename;

Any reason to not just pass the alpm_delta_t* here?

+} alpm_event_delta_patch_t;

+typedef struct _alpm_event_scriptlet_info_t {

• /** Type of event. */
• alpm_event_type_t type;
• /** Line of scriptlet output. */
• const char *line;

+} alpm_event_scriptlet_info_t;

+typedef struct _alpm_event_database_missing_t {

• /** Type of event. */
• alpm_event_type_t type;
• /** Name of the database. */
• const char *dbname;

+} alpm_event_database_missing_t;

+/** Event callback. */ +typedef void (*alpm_cb_event)(alpm_event_t *);

/**

• Questions.

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 123d953..3f3d54f 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -89,9 +89,13 @@ static int sync_db_validate(alpm_db_t *db)

/* we can skip any validation if the database doesn't exist */ if(_alpm_access(db->handle, NULL, dbpath, R_OK) != 0 && errno == ENOENT) {

• alpm_event_database_missing_t event = {
  

• 	.type = ALPM_EVENT_DATABASE_MISSING,
  

• 	.dbname = db->treename
  

• };
  

  db->status &= ~DB_STATUS_EXISTS; db->status |= DB_STATUS_MISSING;

• EVENT(db->handle, ALPM_EVENT_DATABASE_MISSING, db->treename, NULL);
  

• EVENT(db->handle, &event);
  

  goto valid; } db->status |= DB_STATUS_EXISTS;

diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 4126e1a..4275d13 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -31,10 +31,10 @@ #include <curl/curl.h> #endif

-#define EVENT(h, e, d1, d2) \ +#define EVENT(h, e) \ do { \ if((h)->eventcb) { \

• (h)->eventcb(e, d1, d2); \
  

• (h)->eventcb((alpm_event_t *) (e)); \
  

  } \

} while(0) #define QUESTION(h, q, d1, d2, d3, r) \ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 8884495..32d71ab 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -179,7 +179,12 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; if(alpm_pkg_find(lp, optdep->name)) {

• 			EVENT(handle, ALPM_EVENT_OPTDEP_REMOVED, pkg, optdep);
  

• 			alpm_event_optdep_removed_t event = {
  

• 				.type = ALPM_EVENT_OPTDEP_REMOVED,
  

• 				.pkg = pkg,
  

• 				.optdep = optdep
  

• 			};
  

• 			EVENT(handle, &event);
  	}
  }
  

  }

@@ -203,6 +208,7 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_t *lp; alpm_trans_t *trans = handle->trans; alpm_db_t *db = handle->db_local;

• alpm_event_t event;

  if((trans->flags & ALPM_TRANS_FLAG_RECURSE) && !(trans->flags & ALPM_TRANS_FLAG_CASCADE)) {

@@ -214,7 +220,8 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) }

if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {

• EVENT(handle, ALPM_EVENT_CHECKDEPS_START, NULL, NULL);
  

• event.type = ALPM_EVENT_CHECKDEPS_START;
  

• EVENT(handle, &event);
  
  

  _alpm_log(handle, ALPM_LOG_DEBUG, "looking for unsatisfied dependencies\n"); lp = alpm_checkdeps(handle, _alpm_db_get_pkgcache(db), trans->remove, NULL, 1);

@@ -261,7 +268,8 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) remove_notify_needed_optdepends(handle, trans->remove);

if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) {

• EVENT(handle, ALPM_EVENT_CHECKDEPS_DONE, NULL, NULL);
  

• event.type = ALPM_EVENT_CHECKDEPS_DONE;
  

• EVENT(handle, &event);
  

  }

  return 0;

@@ -663,12 +671,18 @@ int _alpm_remove_single_package(alpm_handle_t *handle, { const char *pkgname = oldpkg->name; const char *pkgver = oldpkg->version;

• alpm_event_update_t event = {

• .type = ALPM_EVENT_UPDATE_START,
  

• .operation = ALPM_OPERATION_REMOVE,
  

• .oldpkg = oldpkg,
  

• .newpkg = NULL
  

• };

  if(newpkg) { _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", pkgname, pkgver); } else {

• EVENT(handle, ALPM_EVENT_REMOVE_START, oldpkg, NULL);
  

• EVENT(handle, &event);
  

  _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", pkgname, pkgver);

@@ -702,7 +716,8 @@ int _alpm_remove_single_package(alpm_handle_t *handle, }

if(!newpkg) {

• EVENT(handle, ALPM_EVENT_REMOVE_DONE, oldpkg, NULL);
  

• event.type = ALPM_EVENT_UPDATE_DONE;
  

• EVENT(handle, &event);
  

  }

  /* remove the package from the database */

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 551f926..c79000c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -369,6 +369,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) size_t from_sync = 0; int ret = 0; alpm_trans_t *trans = handle->trans;

• alpm_event_t event;

  if(data) { *data = NULL;

@@ -398,7 +399,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)

/* Build up list by repeatedly resolving each transaction package */
/* Resolve targets dependencies */

• EVENT(handle, ALPM_EVENT_RESOLVEDEPS_START, NULL, NULL);
  

• event.type = ALPM_EVENT_RESOLVEDEPS_START;
  

• EVENT(handle, &event);
  

  _alpm_log(handle, ALPM_LOG_DEBUG, "resolving target's dependencies\n");

  /* build remove list for resolvedeps */

@@ -474,12 +476,14 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_free(trans->add); trans->add = resolved;

• EVENT(handle, ALPM_EVENT_RESOLVEDEPS_DONE, NULL, NULL);
  

• event.type = ALPM_EVENT_RESOLVEDEPS_DONE;
  

• EVENT(handle, &event);
  

  }

  if(!(trans->flags & ALPM_TRANS_FLAG_NOCONFLICTS)) { /* check for inter-conflicts and whatnot */

• EVENT(handle, ALPM_EVENT_INTERCONFLICTS_START, NULL, NULL);
  

• event.type = ALPM_EVENT_INTERCONFLICTS_START;
  

• EVENT(handle, &event);
  
  

  _alpm_log(handle, ALPM_LOG_DEBUG, "looking for conflicts\n");

@@ -590,7 +594,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) goto cleanup; } }

• EVENT(handle, ALPM_EVENT_INTERCONFLICTS_DONE, NULL, NULL);
  

• event.type = ALPM_EVENT_INTERCONFLICTS_DONE;
  

• EVENT(handle, &event);
  

  alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_conflict_free); alpm_list_free(deps); }

@@ -679,6 +684,7 @@ static int apply_deltas(alpm_handle_t *handle) int deltas_found = 0, ret = 0; const char *cachedir = _alpm_filecache_setup(handle); alpm_trans_t *trans = handle->trans;

• alpm_event_delta_patch_t event;

  for(i = trans->add; i; i = i->next) { alpm_pkg_t *spkg = i->data;

@@ -692,7 +698,8 @@ static int apply_deltas(alpm_handle_t *handle) if(!deltas_found) { /* only show this if we actually have deltas to apply, and it is before * the very first one */

• 	EVENT(handle, ALPM_EVENT_DELTA_PATCHES_START, NULL, NULL);
  

• 	event.type = ALPM_EVENT_DELTA_PATCHES_START;
  

• 	EVENT(handle, &event);
  deltas_found = 1;
  

  }

@@ -726,11 +733,15 @@ static int apply_deltas(alpm_handle_t *handle)

	_alpm_log(handle, ALPM_LOG_DEBUG, "command: %s\n", command);

• 	EVENT(handle, ALPM_EVENT_DELTA_PATCH_START, d->to, d->delta);
  

• 	event.type = ALPM_EVENT_DELTA_PATCH_START;
  

• 	event.pkg_filename = d->to;
  

• 	event.patch_filename = d->delta;
  

• 	EVENT(handle, &event);
  
  int retval = system(command);
  if(retval == 0) {
  

• 		EVENT(handle, ALPM_EVENT_DELTA_PATCH_DONE, NULL, NULL);
  

• 		event.type = ALPM_EVENT_DELTA_PATCH_DONE;
  

• 		EVENT(handle, &event);
  
  	/* delete the delta file */
  	unlink(delta);
  

@@ -748,7 +759,8 @@ static int apply_deltas(alpm_handle_t *handle)

	if(retval != 0) {
		/* one delta failed for this package, cancel the remaining ones */

• 		EVENT(handle, ALPM_EVENT_DELTA_PATCH_FAILED, NULL, NULL);
  

• 		event.type = ALPM_EVENT_DELTA_PATCH_FAILED;
  

• 		EVENT(handle, &event);
  	handle->pm_errno = ALPM_ERR_DLT_PATCHFAILED;
  	ret = 1;
  	break;
  

@@ -756,7 +768,8 @@ static int apply_deltas(alpm_handle_t *handle) } } if(deltas_found) {

• EVENT(handle, ALPM_EVENT_DELTA_PATCHES_DONE, NULL, NULL);
  

• event.type = ALPM_EVENT_DELTA_PATCHES_DONE;
  

• EVENT(handle, &event);
  

  }

  return ret;

@@ -785,13 +798,15 @@ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) { alpm_list_t *i, *errors = NULL;

• alpm_event_t event;

  if(!deltas) { return 0; }

  /* Check integrity of deltas */

• EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_START, NULL, NULL);

• event.type = ALPM_EVENT_DELTA_INTEGRITY_START;
• EVENT(handle, &event); for(i = deltas; i; i = i->next) { alpm_delta_t *d = i->data; char *filepath = _alpm_filecache_find(handle, d->delta);

@@ -802,7 +817,8 @@ static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) FREE(filepath); } }

• EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_DONE, NULL, NULL);

• event.type = ALPM_EVENT_DELTA_INTEGRITY_DONE;

• EVENT(handle, &event);

  if(errors) { for(i = errors; i; i = i->next) {

@@ -908,6 +924,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) const char *cachedir; alpm_list_t *i, *files = NULL; int errors = 0;

• alpm_event_t event;

  cachedir = _alpm_filecache_setup(handle); handle->trans->state = STATE_DOWNLOADING;

@@ -955,7 +972,8 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) } }

• EVENT(handle, ALPM_EVENT_RETRIEVE_START, NULL, NULL);
  

• event.type = ALPM_EVENT_RETRIEVE_START;
  

• EVENT(handle, &event);
  

  for(i = files; i; i = i->next) { if(download_single_file(handle, i->data, cachedir) == -1) { errors++;

@@ -989,8 +1007,10 @@ static int check_keyring(alpm_handle_t *handle) { size_t current = 0, numtargs; alpm_list_t *i, *errors = NULL;

• alpm_event_t event;

• EVENT(handle, ALPM_EVENT_KEYRING_START, NULL, NULL);

• event.type = ALPM_EVENT_KEYRING_START;

• EVENT(handle, &event);

  numtargs = alpm_list_count(handle->trans->add);

@@ -1033,10 +1053,12 @@ static int check_keyring(alpm_handle_t *handle)

PROGRESS(handle, ALPM_PROGRESS_KEYRING_START, "", 100, numtargs, current);

• EVENT(handle, ALPM_EVENT_KEYRING_DONE, NULL, NULL);

• event.type = ALPM_EVENT_KEYRING_DONE;

• EVENT(handle, &event);

  if(errors) {

• EVENT(handle, ALPM_EVENT_KEY_DOWNLOAD_START, NULL, NULL);
  

• event.type = ALPM_EVENT_KEY_DOWNLOAD_START;
  

• EVENT(handle, &event);
  

  int fail = 0; alpm_list_t *k; for(k = errors; k; k = k->next) {

@@ -1045,7 +1067,8 @@ static int check_keyring(alpm_handle_t *handle) fail = 1; } }

• EVENT(handle, ALPM_EVENT_KEY_DOWNLOAD_DONE, NULL, NULL);
  

• event.type = ALPM_EVENT_KEY_DOWNLOAD_DONE;
  

• EVENT(handle, &event);
  

  if(fail) { _alpm_log(handle, ALPM_LOG_ERROR, _("required key missing from keyring\n")); return -1;

@@ -1070,9 +1093,11 @@ static int check_validity(alpm_handle_t *handle, size_t current = 0; uint64_t current_bytes = 0; alpm_list_t *i, *errors = NULL;

• alpm_event_t event;

  /* Check integrity of packages */

• EVENT(handle, ALPM_EVENT_INTEGRITY_START, NULL, NULL);

• event.type = ALPM_EVENT_INTEGRITY_START;

• EVENT(handle, &event);

  for(i = handle->trans->add; i; i = i->next, current++) { struct validity v = { i->data, NULL, NULL, 0, 0, 0 };

@@ -1104,7 +1129,8 @@ static int check_validity(alpm_handle_t *handle,

PROGRESS(handle, ALPM_PROGRESS_INTEGRITY_START, "", 100, total, current);

• EVENT(handle, ALPM_EVENT_INTEGRITY_DONE, NULL, NULL);

• event.type = ALPM_EVENT_INTEGRITY_DONE;

• EVENT(handle, &event);

  if(errors) { for(i = errors; i; i = i->next) {

@@ -1143,9 +1169,11 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, size_t current = 0, current_bytes = 0; int errors = 0; alpm_list_t *i;

• alpm_event_t event;

  /* load packages from disk now that they are known-valid */

• EVENT(handle, ALPM_EVENT_LOAD_START, NULL, NULL);

• event.type = ALPM_EVENT_LOAD_START;

• EVENT(handle, &event);

  for(i = handle->trans->add; i; i = i->next, current++) { alpm_pkg_t *spkg = i->data;

@@ -1186,7 +1214,8 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data,

PROGRESS(handle, ALPM_PROGRESS_LOAD_START, "", 100, total, current);

• EVENT(handle, ALPM_EVENT_LOAD_DONE, NULL, NULL);

• event.type = ALPM_EVENT_LOAD_DONE;

• EVENT(handle, &event);

  if(errors) { if(!handle->pm_errno) {

@@ -1204,6 +1233,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) size_t total = 0; uint64_t total_bytes = 0; alpm_trans_t *trans = handle->trans;

• alpm_event_t event;

  if(download_files(handle, &deltas)) { alpm_list_free(deltas);

@@ -1262,7 +1292,8 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)

/* fileconflict check */ if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) {

• EVENT(handle, ALPM_EVENT_FILECONFLICTS_START, NULL, NULL);
  

• event.type = ALPM_EVENT_FILECONFLICTS_START;
  

• EVENT(handle, &event);
  
  

  _alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n"); alpm_list_t *conflict = _alpm_db_find_fileconflicts(handle,

@@ -1277,12 +1308,14 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) RET_ERR(handle, ALPM_ERR_FILE_CONFLICTS, -1); }

• EVENT(handle, ALPM_EVENT_FILECONFLICTS_DONE, NULL, NULL);
  

• event.type = ALPM_EVENT_FILECONFLICTS_DONE;
  

• EVENT(handle, &event);
  

  }

  /* check available disk space */ if(handle->checkspace && !(trans->flags & ALPM_TRANS_FLAG_DBONLY)) {

• EVENT(handle, ALPM_EVENT_DISKSPACE_START, NULL, NULL);
  

• event.type = ALPM_EVENT_DISKSPACE_START;
  

• EVENT(handle, &event);
  
  

  _alpm_log(handle, ALPM_LOG_DEBUG, "checking available disk space\n"); if(_alpm_check_diskspace(handle) == -1) {

@@ -1290,7 +1323,8 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return -1; }

• EVENT(handle, ALPM_EVENT_DISKSPACE_DONE, NULL, NULL);
  

• event.type = ALPM_EVENT_DISKSPACE_DONE;
  

• EVENT(handle, &event);
  

  }

  /* remove conflicting and to-be-replaced packages */

diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f9fdb01..4a9ea75 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -571,10 +571,14 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) } else { while(!feof(pipe_file)) { char line[PATH_MAX];

• 		alpm_event_scriptlet_info_t event = {
  

• 			.type = ALPM_EVENT_SCRIPTLET_INFO,
  

• 			.line = line
  

• 		};
  	if(fgets(line, PATH_MAX, pipe_file) == NULL)
  		break;
  	alpm_logaction(handle, "ALPM-SCRIPTLET", "%s", line);
  

• 		EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL);
  

• 		EVENT(handle, &event);
  }
  fclose(pipe_file);
  

  }

diff --git a/src/pacman/callback.c b/src/pacman/callback.c index e80a071..040c2bd 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -149,12 +149,12 @@ static void fill_progress(const int bar_percent, const int disp_percent, }

/* callback to handle messages/notifications from libalpm transactions */ -void cb_event(alpm_event_t event, void *data1, void *data2) +void cb_event(alpm_event_t *event) { if(config->print) { return; }

• switch(event) {

• switch(event->type) { case ALPM_EVENT_CHECKDEPS_START: printf(_("checking dependencies...\n")); break;

@@ -169,38 +169,43 @@ void cb_event(alpm_event_t event, void *data1, void *data2) case ALPM_EVENT_INTERCONFLICTS_START: printf(_("looking for conflicting packages...\n")); break;

• case ALPM_EVENT_ADD_START:
  

• 	if(config->noprogressbar) {
  

• 		printf(_("installing %s...\n"), alpm_pkg_get_name(data1));
  

• 	}
  

• 	break;
  

• case ALPM_EVENT_ADD_DONE:
  

• 	display_optdepends(data1);
  

• 	break;
  

• case ALPM_EVENT_REMOVE_START:
  

• case ALPM_EVENT_UPDATE_START:
  if(config->noprogressbar) {
  

• 	printf(_("removing %s...\n"), alpm_pkg_get_name(data1));
  

• 	}
  

• 	break;
  

• case ALPM_EVENT_UPGRADE_START:
  

• 	if(config->noprogressbar) {
  

• 		printf(_("upgrading %s...\n"), alpm_pkg_get_name(data1));
  

• 	}
  

• 	break;
  

• case ALPM_EVENT_UPGRADE_DONE:
  

• 	display_new_optdepends(data2, data1);
  

• 	break;
  

• case ALPM_EVENT_DOWNGRADE_START:
  

• 	if(config->noprogressbar) {
  

• 		printf(_("downgrading %s...\n"), alpm_pkg_get_name(data1));
  

• 		alpm_event_update_t *e = (alpm_event_update_t *) event;
  

• 		switch(e->operation) {
  

• 			case ALPM_OPERATION_INSTALL:
  

• 				printf(_("installing %s...\n"), alpm_pkg_get_name(e->newpkg));
  

• 				break;
  

• 			case ALPM_OPERATION_UPGRADE:
  

• 				printf(_("upgrading %s...\n"), alpm_pkg_get_name(e->newpkg));
  

• 				break;
  

• 			case ALPM_OPERATION_REINSTALL:
  

• 				printf(_("reinstalling %s...\n"), alpm_pkg_get_name(e->newpkg));
  

• 				break;
  

• 			case ALPM_OPERATION_DOWNGRADE:
  

• 				printf(_("downgrading %s...\n"), alpm_pkg_get_name(e->newpkg));
  

• 				break;
  

• 			case ALPM_OPERATION_REMOVE:
  

• 				printf(_("removing %s...\n"), alpm_pkg_get_name(e->oldpkg));
  

• 				break;
  

• 		}
  }
  break;
  

• case ALPM_EVENT_DOWNGRADE_DONE:
  

• 	display_new_optdepends(data2, data1);
  

• 	break;
  

• case ALPM_EVENT_REINSTALL_START:
  

• 	if(config->noprogressbar) {
  

• 		printf(_("reinstalling %s...\n"), alpm_pkg_get_name(data1));
  

• case ALPM_EVENT_UPDATE_DONE:
  

• 	{
  

• 		alpm_event_update_t *e = (alpm_event_update_t *) event;
  

• 		switch(e->operation) {
  

• 			case ALPM_OPERATION_INSTALL:
  

• 				display_optdepends(e->newpkg);
  

• 				break;
  

• 			case ALPM_OPERATION_UPGRADE:
  

• 			case ALPM_OPERATION_DOWNGRADE:
  

• 				display_new_optdepends(e->oldpkg, e->newpkg);
  

• 				break;
  

• 			case ALPM_OPERATION_REINSTALL:
  

• 			case ALPM_OPERATION_REMOVE:
  

• 				break;
  

• 		}
  }
  break;
  

  case ALPM_EVENT_INTEGRITY_START:

@@ -228,7 +233,10 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("applying deltas...\n")); break; case ALPM_EVENT_DELTA_PATCH_START:

• 	printf(_("generating %s with %s... "), (char *)data1, (char *)data2);
  

• 	{
  

• 		alpm_event_delta_patch_t *e = (alpm_event_delta_patch_t *) event;
  

• 	  printf(_("generating %s with %s... "), e->pkg_filename, e->patch_filename);
  

• 	}
  break;
  

  case ALPM_EVENT_DELTA_PATCH_DONE: printf(_("success!\n"));

@@ -237,7 +245,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("failed.\n")); break; case ALPM_EVENT_SCRIPTLET_INFO:

• 	fputs((const char *)data1, stdout);
  

• 	fputs(((alpm_event_scriptlet_info_t *) event)->line, stdout);
  break;
  

  case ALPM_EVENT_RETRIEVE_START: colon_printf(_("Retrieving packages ...\n"));

@@ -248,18 +256,21 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_OPTDEP_REMOVED:

• 	colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1),
  

• 		alpm_dep_compute_string(data2));
  

• 	{
  

• 		alpm_event_optdep_removed_t *e = (alpm_event_optdep_removed_t *) event;
  

• 		colon_printf(_("%s optionally requires %s\n"),
  

• 				alpm_pkg_get_name(e->pkg),
  

• 				alpm_dep_compute_string(e->optdep));
  

• 	}
  break;
  

  case ALPM_EVENT_DATABASE_MISSING: if(!config->op_s_sync) { pm_printf(ALPM_LOG_WARNING,

• 			"database file for '%s' does not exist\n", (char *)data1);
  

• 			"database file for '%s' does not exist\n",
  

• 			((alpm_event_database_missing_t *) event)->dbname);
  }
  break;
  

  /* all the simple done events, with fallthrough for each */

• case ALPM_EVENT_REINSTALL_DONE:
  

• case ALPM_EVENT_REMOVE_DONE:
  

  case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: case ALPM_EVENT_RESOLVEDEPS_DONE:

diff --git a/src/pacman/callback.h b/src/pacman/callback.h index a291fc7..b19b952 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -25,7 +25,7 @@ #include <alpm.h>

/* callback to handle messages/notifications from libalpm */ -void cb_event(alpm_event_t event, void *data1, void *data2); +void cb_event(alpm_event_t *event);

/* callback to handle questions from libalpm (yes/no) */ void cb_question(alpm_question_t event, void *data1, void *data2,

Instead of using two void* arguments for all events, we now send one pointer to an alpm_event_t struct. This contains the type of event that was triggered.

With this information, the pointer can then be typecasted to the event-specific struct in order to get additional arguments.

Signed-off-by: Olivier Brunel jjk@jjacky.com --- lib/libalpm/add.c | 31 ++++++----- lib/libalpm/alpm.h | 148 +++++++++++++++++++++++++++++--------------------- lib/libalpm/be_sync.c | 6 +- lib/libalpm/handle.h | 4 +- lib/libalpm/remove.c | 25 +++++++-- lib/libalpm/sync.c | 81 +++++++++++++++++++-------- lib/libalpm/util.c | 6 +- src/pacman/callback.c | 87 ++++++++++++++++------------- src/pacman/callback.h | 2 +- 9 files changed, 241 insertions(+), 149 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 91b40a1..1eaea36 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -460,7 +460,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; alpm_progress_t progress = ALPM_PROGRESS_ADD_START; - alpm_event_t done = ALPM_EVENT_ADD_DONE, start = ALPM_EVENT_ADD_START; + alpm_event_package_operation_t event; const char *log_msg = "adding"; const char *pkgfile;

@@ -473,18 +473,15 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, if(cmp < 0) { log_msg = "downgrading"; progress = ALPM_PROGRESS_DOWNGRADE_START; - start = ALPM_EVENT_DOWNGRADE_START; - done = ALPM_EVENT_DOWNGRADE_DONE; + event.operation = ALPM_PACKAGE_DOWNGRADE; } else if(cmp == 0) { log_msg = "reinstalling"; progress = ALPM_PROGRESS_REINSTALL_START; - start = ALPM_EVENT_REINSTALL_START; - done = ALPM_EVENT_REINSTALL_DONE; + event.operation = ALPM_PACKAGE_REINSTALL; } else { log_msg = "upgrading"; progress = ALPM_PROGRESS_UPGRADE_START; - start = ALPM_EVENT_UPGRADE_START; - done = ALPM_EVENT_UPGRADE_DONE; + event.operation = ALPM_PACKAGE_UPGRADE; } is_upgrade = 1;

@@ -496,9 +493,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,

/* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); + } else { + event.operation = ALPM_PACKAGE_INSTALL; }

- EVENT(handle, start, newpkg, local); + event.type = ALPM_EVENT_PACKAGE_OPERATION_START; + event.oldpkg = oldpkg; + event.newpkg = newpkg; + EVENT(handle, &event);

pkgfile = newpkg->origin_data.file;

@@ -649,20 +651,20 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,

PROGRESS(handle, progress, newpkg->name, 100, pkg_count, pkg_current);

- switch(done) { - case ALPM_EVENT_ADD_DONE: + switch(event.operation) { + case ALPM_PACKAGE_INSTALL: alpm_logaction(handle, ALPM_CALLER_PREFIX, "installed %s (%s)\n", newpkg->name, newpkg->version); break; - case ALPM_EVENT_DOWNGRADE_DONE: + case ALPM_PACKAGE_DOWNGRADE: alpm_logaction(handle, ALPM_CALLER_PREFIX, "downgraded %s (%s -> %s)\n", newpkg->name, oldpkg->version, newpkg->version); break; - case ALPM_EVENT_REINSTALL_DONE: + case ALPM_PACKAGE_REINSTALL: alpm_logaction(handle, ALPM_CALLER_PREFIX, "reinstalled %s (%s)\n", newpkg->name, newpkg->version); break; - case ALPM_EVENT_UPGRADE_DONE: + case ALPM_PACKAGE_UPGRADE: alpm_logaction(handle, ALPM_CALLER_PREFIX, "upgraded %s (%s -> %s)\n", newpkg->name, oldpkg->version, newpkg->version); break; @@ -682,7 +684,8 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, free(scriptlet); }

- EVENT(handle, done, newpkg, oldpkg); + event.type = ALPM_EVENT_PACKAGE_OPERATION_DONE; + EVENT(handle, &event);

cleanup: _alpm_pkg_free(oldpkg); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 126f50a5..9379372 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -275,10 +275,9 @@ int alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, ...) __attribute__((format(printf, 3, 4)));

/** - * Events. - * NULL parameters are passed to in all events unless specified otherwise. + * Type of events. */ -typedef enum _alpm_event_t { +typedef enum _alpm_event_type_t { /** Dependencies will be computed for a package. */ ALPM_EVENT_CHECKDEPS_START = 1, /** Dependencies were computed for a package. */ @@ -295,49 +294,12 @@ typedef enum _alpm_event_t { ALPM_EVENT_INTERCONFLICTS_START, /** Inter-conflicts were checked for target package. */ ALPM_EVENT_INTERCONFLICTS_DONE, - /** Package will be installed. - * A pointer to the target package is passed to the callback. - */ - ALPM_EVENT_ADD_START, - /** Package was installed. - * A pointer to the new package is passed to the callback. - */ - ALPM_EVENT_ADD_DONE, - /** Package will be removed. - * A pointer to the target package is passed to the callback. - */ - ALPM_EVENT_REMOVE_START, - /** Package was removed. - * A pointer to the removed package is passed to the callback. - */ - ALPM_EVENT_REMOVE_DONE, - /** Package will be upgraded. - * A pointer to the upgraded package is passed to the callback. - */ - ALPM_EVENT_UPGRADE_START, - /** Package was upgraded. - * A pointer to the new package, and a pointer to the old package is passed - * to the callback, respectively. - */ - ALPM_EVENT_UPGRADE_DONE, - /** Package will be downgraded. - * A pointer to the downgraded package is passed to the callback. - */ - ALPM_EVENT_DOWNGRADE_START, - /** Package was downgraded. - * A pointer to the new package, and a pointer to the old package is passed - * to the callback, respectively. - */ - ALPM_EVENT_DOWNGRADE_DONE, - /** Package will be reinstalled. - * A pointer to the reinstalled package is passed to the callback. - */ - ALPM_EVENT_REINSTALL_START, - /** Package was reinstalled. - * A pointer to the new package, and a pointer to the old package is passed - * to the callback, respectively. - */ - ALPM_EVENT_REINSTALL_DONE, + /** Package will be installed/upgraded/downgraded/re-installed/removed; See + * alpm_event_package_operation_t for arguments. */ + ALPM_EVENT_PACKAGE_OPERATION_START, + /** Package was installed/upgraded/downgraded/re-installed/removed; See + * alpm_event_package_operation_t for arguments. */ + ALPM_EVENT_PACKAGE_OPERATION_DONE, /** Target package's integrity will be checked. */ ALPM_EVENT_INTEGRITY_START, /** Target package's integrity was checked. */ @@ -354,31 +316,27 @@ typedef enum _alpm_event_t { ALPM_EVENT_DELTA_PATCHES_START, /** Deltas were applied to packages. */ ALPM_EVENT_DELTA_PATCHES_DONE, - /** Delta patch will be applied to target package. - * The filename of the package and the filename of the patch is passed to the - * callback. - */ + /** Delta patch will be applied to target package; See + * alpm_event_delta_patch_t for arguments.. */ ALPM_EVENT_DELTA_PATCH_START, /** Delta patch was applied to target package. */ ALPM_EVENT_DELTA_PATCH_DONE, /** Delta patch failed to apply to target package. */ ALPM_EVENT_DELTA_PATCH_FAILED, - /** Scriptlet has printed information. - * A line of text is passed to the callback. - */ + /** Scriptlet has printed information; See alpm_event_scriptlet_info_t for + * arguments. */ ALPM_EVENT_SCRIPTLET_INFO, - /** Files will be downloaded from a repository. - * The repository's tree name is passed to the callback. - */ + /** Files will be downloaded from a repository. */ ALPM_EVENT_RETRIEVE_START, - /** Disk space usage will be computed for a package */ + /** Disk space usage will be computed for a package. */ ALPM_EVENT_DISKSPACE_START, - /** Disk space usage was computed for a package */ + /** Disk space usage was computed for a package. */ ALPM_EVENT_DISKSPACE_DONE, - /** An optdepend for another package is being removed - * The requiring package and its dependency are passed to the callback */ + /** An optdepend for another package is being removed; See + * alpm_event_optdep_removal_t for arguments. */ ALPM_EVENT_OPTDEP_REMOVAL, - /** A configured repository database is missing */ + /** A configured repository database is missing; See + * alpm_event_database_missing_t for arguments. */ ALPM_EVENT_DATABASE_MISSING, /** Checking keys used to create signatures are in keyring. */ ALPM_EVENT_KEYRING_START, @@ -388,10 +346,74 @@ typedef enum _alpm_event_t { ALPM_EVENT_KEY_DOWNLOAD_START, /** Key downloading is finished. */ ALPM_EVENT_KEY_DOWNLOAD_DONE +} alpm_event_type_t; + +/** Events. + * This is a generic struct this is passed to the callback, that allows the + * frontend to know which type of event was triggered. It is then possible to + * typecast the pointer to the right structure, in order to access + * event-specific data. */ +typedef struct _alpm_event_t { + /** Type of event. */ + alpm_event_type_t type; } alpm_event_t;

-/** Event callback */ -typedef void (*alpm_cb_event)(alpm_event_t, void *, void *); +typedef enum _alpm_package_operation_t { + /** Package (to be) installed. (No oldpkg) */ + ALPM_PACKAGE_INSTALL = 1, + /** Package (to be) upgraded */ + ALPM_PACKAGE_UPGRADE, + /** Package (to be) re-installed. */ + ALPM_PACKAGE_REINSTALL, + /** Package (to be) downgraded. */ + ALPM_PACKAGE_DOWNGRADE, + /** Package (to be) removed. (No newpkg) */ + ALPM_PACKAGE_REMOVE +} alpm_package_operation_t; + +typedef struct _alpm_event_package_operation_t { + /** Type of event. */ + alpm_event_type_t type; + /** Type of operation. */ + alpm_package_operation_t operation; + /** Old package. */ + alpm_pkg_t *oldpkg; + /** New package. */ + alpm_pkg_t *newpkg; +} alpm_event_package_operation_t; + +typedef struct _alpm_event_optdep_removal_t { + /** Type of event. */ + alpm_event_type_t type; + /** Package with the optdep. */ + alpm_pkg_t *pkg; + /** Optdep being removed. */ + alpm_depend_t *optdep; +} alpm_event_optdep_removal_t; + +typedef struct _alpm_event_delta_patch_t { + /** Type of event. */ + alpm_event_type_t type; + /** Delta info */ + alpm_delta_t *delta; +} alpm_event_delta_patch_t; + +typedef struct _alpm_event_scriptlet_info_t { + /** Type of event. */ + alpm_event_type_t type; + /** Line of scriptlet output. */ + const char *line; +} alpm_event_scriptlet_info_t; + +typedef struct _alpm_event_database_missing_t { + /** Type of event. */ + alpm_event_type_t type; + /** Name of the database. */ + const char *dbname; +} alpm_event_database_missing_t; + +/** Event callback. */ +typedef void (*alpm_cb_event)(alpm_event_t *);

/** * Questions. diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 67b7368..922b3a2 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -89,9 +89,13 @@ static int sync_db_validate(alpm_db_t *db)

/* we can skip any validation if the database doesn't exist */ if(_alpm_access(db->handle, NULL, dbpath, R_OK) != 0 && errno == ENOENT) { + alpm_event_database_missing_t event = { + .type = ALPM_EVENT_DATABASE_MISSING, + .dbname = db->treename + }; db->status &= ~DB_STATUS_EXISTS; db->status |= DB_STATUS_MISSING; - EVENT(db->handle, ALPM_EVENT_DATABASE_MISSING, db->treename, NULL); + EVENT(db->handle, &event); goto valid; } db->status |= DB_STATUS_EXISTS; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index fcfd4fa..d767fb6 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -31,10 +31,10 @@ #include <curl/curl.h> #endif

-#define EVENT(h, e, d1, d2) \ +#define EVENT(h, e) \ do { \ if((h)->eventcb) { \ - (h)->eventcb(e, d1, d2); \ + (h)->eventcb((alpm_event_t *) (e)); \ } \ } while(0) #define QUESTION(h, q, d1, d2, d3, r) \ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index d78c5f1..c2831e4 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -179,7 +179,12 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t * for(j = optdeps; j; j = alpm_list_next(j)) { alpm_depend_t *optdep = j->data; if(alpm_pkg_find(lp, optdep->name)) { - EVENT(handle, ALPM_EVENT_OPTDEP_REMOVAL, pkg, optdep); + alpm_event_optdep_removal_t event = { + .type = ALPM_EVENT_OPTDEP_REMOVAL, + .pkg = pkg, + .optdep = optdep + }; + EVENT(handle, &event); } } } @@ -203,6 +208,7 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_t *lp; alpm_trans_t *trans = handle->trans; alpm_db_t *db = handle->db_local; + alpm_event_t event;

if((trans->flags & ALPM_TRANS_FLAG_RECURSE) && !(trans->flags & ALPM_TRANS_FLAG_CASCADE)) { @@ -214,7 +220,8 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) }

if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { - EVENT(handle, ALPM_EVENT_CHECKDEPS_START, NULL, NULL); + event.type = ALPM_EVENT_CHECKDEPS_START; + EVENT(handle, &event);

_alpm_log(handle, ALPM_LOG_DEBUG, "looking for unsatisfied dependencies\n"); lp = alpm_checkdeps(handle, _alpm_db_get_pkgcache(db), trans->remove, NULL, 1); @@ -254,7 +261,8 @@ int _alpm_remove_prepare(alpm_handle_t *handle, alpm_list_t **data) remove_notify_needed_optdepends(handle, trans->remove);

if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { - EVENT(handle, ALPM_EVENT_CHECKDEPS_DONE, NULL, NULL); + event.type = ALPM_EVENT_CHECKDEPS_DONE; + EVENT(handle, &event); }

return 0; @@ -656,12 +664,18 @@ int _alpm_remove_single_package(alpm_handle_t *handle, { const char *pkgname = oldpkg->name; const char *pkgver = oldpkg->version; + alpm_event_package_operation_t event = { + .type = ALPM_EVENT_PACKAGE_OPERATION_START, + .operation = ALPM_PACKAGE_REMOVE, + .oldpkg = oldpkg, + .newpkg = NULL + };

if(newpkg) { _alpm_log(handle, ALPM_LOG_DEBUG, "removing old package first (%s-%s)\n", pkgname, pkgver); } else { - EVENT(handle, ALPM_EVENT_REMOVE_START, oldpkg, NULL); + EVENT(handle, &event); _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", pkgname, pkgver);

@@ -695,7 +709,8 @@ int _alpm_remove_single_package(alpm_handle_t *handle, }

if(!newpkg) { - EVENT(handle, ALPM_EVENT_REMOVE_DONE, oldpkg, NULL); + event.type = ALPM_EVENT_PACKAGE_OPERATION_DONE; + EVENT(handle, &event); }

/* remove the package from the database */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 4ae01ac..63adba4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -374,6 +374,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) size_t from_sync = 0; int ret = 0; alpm_trans_t *trans = handle->trans; + alpm_event_t event;

if(data) { *data = NULL; @@ -403,7 +404,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)

/* Build up list by repeatedly resolving each transaction package */ /* Resolve targets dependencies */ - EVENT(handle, ALPM_EVENT_RESOLVEDEPS_START, NULL, NULL); + event.type = ALPM_EVENT_RESOLVEDEPS_START; + EVENT(handle, &event); _alpm_log(handle, ALPM_LOG_DEBUG, "resolving target's dependencies\n");

/* build remove list for resolvedeps */ @@ -479,12 +481,14 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_free(trans->add); trans->add = resolved;

- EVENT(handle, ALPM_EVENT_RESOLVEDEPS_DONE, NULL, NULL); + event.type = ALPM_EVENT_RESOLVEDEPS_DONE; + EVENT(handle, &event); }

if(!(trans->flags & ALPM_TRANS_FLAG_NOCONFLICTS)) { /* check for inter-conflicts and whatnot */ - EVENT(handle, ALPM_EVENT_INTERCONFLICTS_START, NULL, NULL); + event.type = ALPM_EVENT_INTERCONFLICTS_START; + EVENT(handle, &event);

_alpm_log(handle, ALPM_LOG_DEBUG, "looking for conflicts\n");

@@ -594,7 +598,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) goto cleanup; } } - EVENT(handle, ALPM_EVENT_INTERCONFLICTS_DONE, NULL, NULL); + event.type = ALPM_EVENT_INTERCONFLICTS_DONE; + EVENT(handle, &event); alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_conflict_free); alpm_list_free(deps); } @@ -678,6 +683,7 @@ static int apply_deltas(alpm_handle_t *handle) int deltas_found = 0, ret = 0; const char *cachedir = _alpm_filecache_setup(handle); alpm_trans_t *trans = handle->trans; + alpm_event_delta_patch_t event;

for(i = trans->add; i; i = i->next) { alpm_pkg_t *spkg = i->data; @@ -691,7 +697,8 @@ static int apply_deltas(alpm_handle_t *handle) if(!deltas_found) { /* only show this if we actually have deltas to apply, and it is before * the very first one */ - EVENT(handle, ALPM_EVENT_DELTA_PATCHES_START, NULL, NULL); + event.type = ALPM_EVENT_DELTA_PATCHES_START; + EVENT(handle, &event); deltas_found = 1; }

@@ -725,11 +732,14 @@ static int apply_deltas(alpm_handle_t *handle)

_alpm_log(handle, ALPM_LOG_DEBUG, "command: %s\n", command);

- EVENT(handle, ALPM_EVENT_DELTA_PATCH_START, d->to, d->delta); + event.type = ALPM_EVENT_DELTA_PATCH_START; + event.delta = d; + EVENT(handle, &event);

int retval = system(command); if(retval == 0) { - EVENT(handle, ALPM_EVENT_DELTA_PATCH_DONE, NULL, NULL); + event.type = ALPM_EVENT_DELTA_PATCH_DONE; + EVENT(handle, &event);

/* delete the delta file */ unlink(delta); @@ -747,7 +757,8 @@ static int apply_deltas(alpm_handle_t *handle)

if(retval != 0) { /* one delta failed for this package, cancel the remaining ones */ - EVENT(handle, ALPM_EVENT_DELTA_PATCH_FAILED, NULL, NULL); + event.type = ALPM_EVENT_DELTA_PATCH_FAILED; + EVENT(handle, &event); handle->pm_errno = ALPM_ERR_DLT_PATCHFAILED; ret = 1; break; @@ -755,7 +766,8 @@ static int apply_deltas(alpm_handle_t *handle) } } if(deltas_found) { - EVENT(handle, ALPM_EVENT_DELTA_PATCHES_DONE, NULL, NULL); + event.type = ALPM_EVENT_DELTA_PATCHES_DONE; + EVENT(handle, &event); }

return ret; @@ -784,13 +796,15 @@ static int prompt_to_delete(alpm_handle_t *handle, const char *filepath, static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) { alpm_list_t *i, *errors = NULL; + alpm_event_t event;

if(!deltas) { return 0; }

/* Check integrity of deltas */ - EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_START, NULL, NULL); + event.type = ALPM_EVENT_DELTA_INTEGRITY_START; + EVENT(handle, &event); for(i = deltas; i; i = i->next) { alpm_delta_t *d = i->data; char *filepath = _alpm_filecache_find(handle, d->delta); @@ -801,7 +815,8 @@ static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) FREE(filepath); } } - EVENT(handle, ALPM_EVENT_DELTA_INTEGRITY_DONE, NULL, NULL); + event.type = ALPM_EVENT_DELTA_INTEGRITY_DONE; + EVENT(handle, &event);

if(errors) { for(i = errors; i; i = i->next) { @@ -907,6 +922,7 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) const char *cachedir; alpm_list_t *i, *files = NULL; int errors = 0; + alpm_event_t event;

cachedir = _alpm_filecache_setup(handle); handle->trans->state = STATE_DOWNLOADING; @@ -954,7 +970,8 @@ static int download_files(alpm_handle_t *handle, alpm_list_t **deltas) } }

- EVENT(handle, ALPM_EVENT_RETRIEVE_START, NULL, NULL); + event.type = ALPM_EVENT_RETRIEVE_START; + EVENT(handle, &event); for(i = files; i; i = i->next) { if(download_single_file(handle, i->data, cachedir) == -1) { errors++; @@ -988,8 +1005,10 @@ static int check_keyring(alpm_handle_t *handle) { size_t current = 0, numtargs; alpm_list_t *i, *errors = NULL; + alpm_event_t event;

- EVENT(handle, ALPM_EVENT_KEYRING_START, NULL, NULL); + event.type = ALPM_EVENT_KEYRING_START; + EVENT(handle, &event);

numtargs = alpm_list_count(handle->trans->add);

@@ -1033,10 +1052,12 @@ static int check_keyring(alpm_handle_t *handle)

PROGRESS(handle, ALPM_PROGRESS_KEYRING_START, "", 100, numtargs, current); - EVENT(handle, ALPM_EVENT_KEYRING_DONE, NULL, NULL); + event.type = ALPM_EVENT_KEYRING_DONE; + EVENT(handle, &event);

if(errors) { - EVENT(handle, ALPM_EVENT_KEY_DOWNLOAD_START, NULL, NULL); + event.type = ALPM_EVENT_KEY_DOWNLOAD_START; + EVENT(handle, &event); int fail = 0; alpm_list_t *k; for(k = errors; k; k = k->next) { @@ -1045,7 +1066,8 @@ static int check_keyring(alpm_handle_t *handle) fail = 1; } } - EVENT(handle, ALPM_EVENT_KEY_DOWNLOAD_DONE, NULL, NULL); + event.type = ALPM_EVENT_KEY_DOWNLOAD_DONE; + EVENT(handle, &event); if(fail) { _alpm_log(handle, ALPM_LOG_ERROR, _("required key missing from keyring\n")); return -1; @@ -1070,9 +1092,11 @@ static int check_validity(alpm_handle_t *handle, size_t current = 0; uint64_t current_bytes = 0; alpm_list_t *i, *errors = NULL; + alpm_event_t event;

/* Check integrity of packages */ - EVENT(handle, ALPM_EVENT_INTEGRITY_START, NULL, NULL); + event.type = ALPM_EVENT_INTEGRITY_START; + EVENT(handle, &event);

for(i = handle->trans->add; i; i = i->next, current++) { struct validity v = { i->data, NULL, NULL, 0, 0, 0 }; @@ -1104,7 +1128,8 @@ static int check_validity(alpm_handle_t *handle,

PROGRESS(handle, ALPM_PROGRESS_INTEGRITY_START, "", 100, total, current); - EVENT(handle, ALPM_EVENT_INTEGRITY_DONE, NULL, NULL); + event.type = ALPM_EVENT_INTEGRITY_DONE; + EVENT(handle, &event);

if(errors) { for(i = errors; i; i = i->next) { @@ -1143,9 +1168,11 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data, size_t current = 0, current_bytes = 0; int errors = 0; alpm_list_t *i; + alpm_event_t event;

/* load packages from disk now that they are known-valid */ - EVENT(handle, ALPM_EVENT_LOAD_START, NULL, NULL); + event.type = ALPM_EVENT_LOAD_START; + EVENT(handle, &event);

for(i = handle->trans->add; i; i = i->next, current++) { alpm_pkg_t *spkg = i->data; @@ -1186,7 +1213,8 @@ static int load_packages(alpm_handle_t *handle, alpm_list_t **data,

PROGRESS(handle, ALPM_PROGRESS_LOAD_START, "", 100, total, current); - EVENT(handle, ALPM_EVENT_LOAD_DONE, NULL, NULL); + event.type = ALPM_EVENT_LOAD_DONE; + EVENT(handle, &event);

if(errors) { if(!handle->pm_errno) { @@ -1204,6 +1232,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) size_t total = 0; uint64_t total_bytes = 0; alpm_trans_t *trans = handle->trans; + alpm_event_t event;

if(download_files(handle, &deltas)) { alpm_list_free(deltas); @@ -1262,7 +1291,8 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)

/* fileconflict check */ if(!(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { - EVENT(handle, ALPM_EVENT_FILECONFLICTS_START, NULL, NULL); + event.type = ALPM_EVENT_FILECONFLICTS_START; + EVENT(handle, &event);

_alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n"); alpm_list_t *conflict = _alpm_db_find_fileconflicts(handle, @@ -1277,12 +1307,14 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) RET_ERR(handle, ALPM_ERR_FILE_CONFLICTS, -1); }

- EVENT(handle, ALPM_EVENT_FILECONFLICTS_DONE, NULL, NULL); + event.type = ALPM_EVENT_FILECONFLICTS_DONE; + EVENT(handle, &event); }

/* check available disk space */ if(handle->checkspace && !(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { - EVENT(handle, ALPM_EVENT_DISKSPACE_START, NULL, NULL); + event.type = ALPM_EVENT_DISKSPACE_START; + EVENT(handle, &event);

_alpm_log(handle, ALPM_LOG_DEBUG, "checking available disk space\n"); if(_alpm_check_diskspace(handle) == -1) { @@ -1290,7 +1322,8 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return -1; }

- EVENT(handle, ALPM_EVENT_DISKSPACE_DONE, NULL, NULL); + event.type = ALPM_EVENT_DISKSPACE_DONE; + EVENT(handle, &event); }

/* remove conflicting and to-be-replaced packages */ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f28404d..7704ea5 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -572,10 +572,14 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) } else { while(!feof(pipe_file)) { char line[PATH_MAX]; + alpm_event_scriptlet_info_t event = { + .type = ALPM_EVENT_SCRIPTLET_INFO, + .line = line + }; if(fgets(line, PATH_MAX, pipe_file) == NULL) break; alpm_logaction(handle, "ALPM-SCRIPTLET", "%s", line); - EVENT(handle, ALPM_EVENT_SCRIPTLET_INFO, line, NULL); + EVENT(handle, &event); } fclose(pipe_file); } diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 4b0f881..8b67ffc 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -149,12 +149,12 @@ static void fill_progress(const int bar_percent, const int disp_percent, }

/* callback to handle messages/notifications from libalpm transactions */ -void cb_event(alpm_event_t event, void *data1, void *data2) +void cb_event(alpm_event_t *event) { if(config->print) { return; } - switch(event) { + switch(event->type) { case ALPM_EVENT_CHECKDEPS_START: printf(_("checking dependencies...\n")); break; @@ -169,38 +169,43 @@ void cb_event(alpm_event_t event, void *data1, void *data2) case ALPM_EVENT_INTERCONFLICTS_START: printf(_("looking for conflicting packages...\n")); break; - case ALPM_EVENT_ADD_START: - if(config->noprogressbar) { - printf(_("installing %s...\n"), alpm_pkg_get_name(data1)); - } - break; - case ALPM_EVENT_ADD_DONE: - display_optdepends(data1); - break; - case ALPM_EVENT_REMOVE_START: + case ALPM_EVENT_PACKAGE_OPERATION_START: if(config->noprogressbar) { - printf(_("removing %s...\n"), alpm_pkg_get_name(data1)); - } - break; - case ALPM_EVENT_UPGRADE_START: - if(config->noprogressbar) { - printf(_("upgrading %s...\n"), alpm_pkg_get_name(data1)); - } - break; - case ALPM_EVENT_UPGRADE_DONE: - display_new_optdepends(data2, data1); - break; - case ALPM_EVENT_DOWNGRADE_START: - if(config->noprogressbar) { - printf(_("downgrading %s...\n"), alpm_pkg_get_name(data1)); + alpm_event_package_operation_t *e = (alpm_event_package_operation_t *) event; + switch(e->operation) { + case ALPM_PACKAGE_INSTALL: + printf(_("installing %s...\n"), alpm_pkg_get_name(e->newpkg)); + break; + case ALPM_PACKAGE_UPGRADE: + printf(_("upgrading %s...\n"), alpm_pkg_get_name(e->newpkg)); + break; + case ALPM_PACKAGE_REINSTALL: + printf(_("reinstalling %s...\n"), alpm_pkg_get_name(e->newpkg)); + break; + case ALPM_PACKAGE_DOWNGRADE: + printf(_("downgrading %s...\n"), alpm_pkg_get_name(e->newpkg)); + break; + case ALPM_PACKAGE_REMOVE: + printf(_("removing %s...\n"), alpm_pkg_get_name(e->oldpkg)); + break; + } } break; - case ALPM_EVENT_DOWNGRADE_DONE: - display_new_optdepends(data2, data1); - break; - case ALPM_EVENT_REINSTALL_START: - if(config->noprogressbar) { - printf(_("reinstalling %s...\n"), alpm_pkg_get_name(data1)); + case ALPM_EVENT_PACKAGE_OPERATION_DONE: + { + alpm_event_package_operation_t *e = (alpm_event_package_operation_t *) event; + switch(e->operation) { + case ALPM_PACKAGE_INSTALL: + display_optdepends(e->newpkg); + break; + case ALPM_PACKAGE_UPGRADE: + case ALPM_PACKAGE_DOWNGRADE: + display_new_optdepends(e->oldpkg, e->newpkg); + break; + case ALPM_PACKAGE_REINSTALL: + case ALPM_PACKAGE_REMOVE: + break; + } } break; case ALPM_EVENT_INTEGRITY_START: @@ -228,7 +233,10 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("applying deltas...\n")); break; case ALPM_EVENT_DELTA_PATCH_START: - printf(_("generating %s with %s... "), (char *)data1, (char *)data2); + { + alpm_event_delta_patch_t *e = (alpm_event_delta_patch_t *) event; + printf(_("generating %s with %s... "), e->delta->to, e->delta->delta); + } break; case ALPM_EVENT_DELTA_PATCH_DONE: printf(_("success!\n")); @@ -237,7 +245,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("failed.\n")); break; case ALPM_EVENT_SCRIPTLET_INFO: - fputs((const char *)data1, stdout); + fputs(((alpm_event_scriptlet_info_t *) event)->line, stdout); break; case ALPM_EVENT_RETRIEVE_START: colon_printf(_("Retrieving packages ...\n")); @@ -248,18 +256,21 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } break; case ALPM_EVENT_OPTDEP_REMOVAL: - colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1), - alpm_dep_compute_string(data2)); + { + alpm_event_optdep_removal_t *e = (alpm_event_optdep_removal_t *) event; + colon_printf(_("%s optionally requires %s\n"), + alpm_pkg_get_name(e->pkg), + alpm_dep_compute_string(e->optdep)); + } break; case ALPM_EVENT_DATABASE_MISSING: if(!config->op_s_sync) { pm_printf(ALPM_LOG_WARNING, - "database file for '%s' does not exist\n", (char *)data1); + "database file for '%s' does not exist\n", + ((alpm_event_database_missing_t *) event)->dbname); } break; /* all the simple done events, with fallthrough for each */ - case ALPM_EVENT_REINSTALL_DONE: - case ALPM_EVENT_REMOVE_DONE: case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: case ALPM_EVENT_RESOLVEDEPS_DONE: diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 61a7e4c..cdc8ee7 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -25,7 +25,7 @@ #include <alpm.h>

/* callback to handle messages/notifications from libalpm */ -void cb_event(alpm_event_t event, void *data1, void *data2); +void cb_event(alpm_event_t *event);

/* callback to handle questions from libalpm (yes/no) */ void cb_question(alpm_question_t event, void *data1, void *data2,

When ALPM emits a log message, it still goes through _alpm_log() but instead of calling a specific log callback, it goes as an event.

Signed-off-by: Olivier Brunel jjk@jjacky.com --- lib/libalpm/alpm.h | 37 +++++++++++++++++++++---------------- lib/libalpm/handle.c | 13 ------------- lib/libalpm/handle.h | 1 - lib/libalpm/log.c | 14 +++++++++----- src/pacman/callback.c | 36 ++++++++++++++++++------------------ src/pacman/callback.h | 4 ---- src/pacman/conf.c | 1 - src/util/cleanupdelta.c | 14 ++++++++------ src/util/testdb.c | 14 ++++++++------ src/util/testpkg.c | 14 ++++++++------ 10 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 9379372..2234a77 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -261,16 +261,6 @@ typedef struct _alpm_siglist_t { * Logging facilities */

-/** Logging Levels */ -typedef enum _alpm_loglevel_t { - ALPM_LOG_ERROR = 1, - ALPM_LOG_WARNING = (1 << 1), - ALPM_LOG_DEBUG = (1 << 2), - ALPM_LOG_FUNCTION = (1 << 3) -} alpm_loglevel_t; - -typedef void (*alpm_cb_log)(alpm_loglevel_t, const char *, va_list); - int alpm_logaction(alpm_handle_t *handle, const char *prefix, const char *fmt, ...) __attribute__((format(printf, 3, 4)));

@@ -345,7 +335,9 @@ typedef enum _alpm_event_type_t { /** Downloading missing keys into keyring. */ ALPM_EVENT_KEY_DOWNLOAD_START, /** Key downloading is finished. */ - ALPM_EVENT_KEY_DOWNLOAD_DONE + ALPM_EVENT_KEY_DOWNLOAD_DONE, + /** A log message was emitted; See alpm_event_log_t for arguments. */ + ALPM_EVENT_LOG } alpm_event_type_t;

/** Events. @@ -412,6 +404,24 @@ typedef struct _alpm_event_database_missing_t { const char *dbname; } alpm_event_database_missing_t;

+/** Log levels. */ +typedef enum _alpm_loglevel_t { + ALPM_LOG_ERROR = 1, + ALPM_LOG_WARNING = (1 << 1), + ALPM_LOG_DEBUG = (1 << 2), + ALPM_LOG_FUNCTION = (1 << 3) +} alpm_loglevel_t; + +typedef struct _alpm_event_log_t { + /** Type of event. */ + alpm_event_type_t type; + /** Log level. */ + alpm_loglevel_t level; + /** Message. */ + const char *fmt; + va_list args; +} alpm_event_log_t; + /** Event callback. */ typedef void (*alpm_cb_event)(alpm_event_t *);

@@ -487,11 +497,6 @@ char *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url); * @{ */

-/** Returns the callback used for logging. */ -alpm_cb_log alpm_option_get_logcb(alpm_handle_t *handle); -/** Sets the callback used for logging. */ -int alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb); - /** Returns the callback used to report download progress. */ alpm_cb_download alpm_option_get_dlcb(alpm_handle_t *handle); /** Sets the callback used to report download progress. */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 44457e6..1f35a79 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -132,12 +132,6 @@ int _alpm_handle_unlock(alpm_handle_t *handle) }

-alpm_cb_log SYMEXPORT alpm_option_get_logcb(alpm_handle_t *handle) -{ - CHECK_HANDLE(handle, return NULL); - return handle->logcb; -} - alpm_cb_download SYMEXPORT alpm_option_get_dlcb(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -258,13 +252,6 @@ int SYMEXPORT alpm_option_get_checkspace(alpm_handle_t *handle) return handle->checkspace; }

-int SYMEXPORT alpm_option_set_logcb(alpm_handle_t *handle, alpm_cb_log cb) -{ - CHECK_HANDLE(handle, return -1); - handle->logcb = cb; - return 0; -} - int SYMEXPORT alpm_option_set_dlcb(alpm_handle_t *handle, alpm_cb_download cb) { CHECK_HANDLE(handle, return -1); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index d767fb6..2acbfc8 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -63,7 +63,6 @@ struct __alpm_handle_t { #endif

/* callback functions */ - alpm_cb_log logcb; /* Log callback function */ alpm_cb_download dlcb; /* Download callback function */ alpm_cb_totaldl totaldlcb; /* Total download callback function */ alpm_cb_fetch fetchcb; /* Download file callback function */ diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index c4a9d84..b8fdea8 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -81,15 +81,19 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix,

void _alpm_log(alpm_handle_t *handle, alpm_loglevel_t flag, const char *fmt, ...) { - va_list args; + alpm_event_log_t event = { + .type = ALPM_EVENT_LOG, + .level = flag, + .fmt = fmt + };

- if(handle == NULL || handle->logcb == NULL) { + if(handle == NULL || handle->eventcb == NULL) { return; }

- va_start(args, fmt); - handle->logcb(flag, fmt, args); - va_end(args); + va_start(event.args, fmt); + EVENT(handle, &event); + va_end(event.args); }

/* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 8b67ffc..5a6961d 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -270,6 +270,24 @@ void cb_event(alpm_event_t *event) ((alpm_event_database_missing_t *) event)->dbname); } break; + case ALPM_EVENT_LOG: + { + alpm_event_log_t *e = (alpm_event_log_t *) event; + if(!e->fmt || strlen(e->fmt) == 0) { + break; + } + + if(on_progress) { + char *string = NULL; + pm_vasprintf(&string, e->level, e->fmt, e->args); + if(string != NULL) { + output = alpm_list_add(output, string); + } + } else { + pm_vfprintf(stderr, e->level, e->fmt, e->args); + } + } + break; /* all the simple done events, with fallthrough for each */ case ALPM_EVENT_FILECONFLICTS_DONE: case ALPM_EVENT_CHECKDEPS_DONE: @@ -777,22 +795,4 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) return; }

-/* Callback to handle notifications from the library */ -void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) -{ - if(!fmt || strlen(fmt) == 0) { - return; - } - - if(on_progress) { - char *string = NULL; - pm_vasprintf(&string, level, fmt, args); - if(string != NULL) { - output = alpm_list_add(output, string); - } - } else { - pm_vfprintf(stderr, level, fmt, args); - } -} - /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/callback.h b/src/pacman/callback.h index cdc8ee7..31abb4e 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -40,10 +40,6 @@ void cb_dl_total(off_t total); /* callback to handle display of download progress */ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total);

-/* callback to handle messages/notifications from pacman library */ -__attribute__((format(printf, 2, 0))) -void cb_log(alpm_loglevel_t level, const char *fmt, va_list args); - #endif /* _PM_CALLBACK_H */

/* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 5450f3b..051481a 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -675,7 +675,6 @@ static int setup_libalpm(void) } config->handle = handle;

- alpm_option_set_logcb(handle, cb_log); alpm_option_set_dlcb(handle, cb_dl_progress); alpm_option_set_eventcb(handle, cb_event); alpm_option_set_questioncb(handle, cb_question); diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index b57b203..558e03d 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -35,17 +35,19 @@ static void cleanup(int signum) exit(signum); }

-__attribute__((format(printf, 2, 0))) -static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) +static void output_cb(alpm_event_log_t *event) { - if(strlen(fmt)) { - switch(level) { + if(event->type != ALPM_EVENT_LOG) { + return; + } + if(strlen(event->fmt)) { + switch(event->level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; /* case ALPM_LOG_DEBUG: printf("debug: "); break; */ default: return; } - vprintf(fmt, args); + vprintf(event->fmt, event->args); } }

@@ -126,7 +128,7 @@ int main(int argc, char *argv[]) }

/* let us get log messages from libalpm */ - alpm_option_set_logcb(handle, output_cb); + alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb);

checkdbs(dbnames); alpm_list_free(dbnames); diff --git a/src/util/testdb.c b/src/util/testdb.c index 53cdb3c..8940e3b 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -39,16 +39,18 @@ static void cleanup(int signum) exit(signum); }

-__attribute__((format(printf, 2, 0))) -static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) +static void output_cb(alpm_event_log_t *event) { - if(strlen(fmt)) { - switch(level) { + if(event->type != ALPM_EVENT_LOG) { + return; + } + if(strlen(event->fmt)) { + switch(event->level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; default: return; } - vprintf(fmt, args); + vprintf(event->fmt, event->args); } }

@@ -282,7 +284,7 @@ int main(int argc, char *argv[]) }

/* let us get log messages from libalpm */ - alpm_option_set_logcb(handle, output_cb); + alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb);

if(!dbnames) { errors = check_localdb(); diff --git a/src/util/testpkg.c b/src/util/testpkg.c index cc7d9c2..39807fe 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -23,18 +23,20 @@

#include <alpm.h>

-__attribute__((format(printf, 2, 0))) -static void output_cb(alpm_loglevel_t level, const char *fmt, va_list args) +static void output_cb(alpm_event_log_t *event) { - if(fmt[0] == '\0') { + if(event->type != ALPM_EVENT_LOG) { return; } - switch(level) { + if(event->fmt[0] == '\0') { + return; + } + switch(event->level) { case ALPM_LOG_ERROR: printf("error: "); break; case ALPM_LOG_WARNING: printf("warning: "); break; default: return; /* skip other messages */ } - vprintf(fmt, args); + vprintf(event->fmt, event->args); }

int main(int argc, char *argv[]) @@ -59,7 +61,7 @@ int main(int argc, char *argv[]) }

/* let us get log messages from libalpm */ - alpm_option_set_logcb(handle, output_cb); + alpm_option_set_eventcb(handle, (alpm_cb_event) output_cb);

/* set gpgdir to default */ alpm_option_set_gpgdir(handle, GPGDIR);

These will be emmitted when download a package file from a repository, indicating that the download starts, and whether it was successfull or not.

Note that when multiple servers are available, no event is emmitted when switching to another server.

(This doesn't apply to alpm_fetch_pkgurl(), but since it is called by the frontend, it shouldn't have problems knowing when the download starts and when it ends.)

Signed-off-by: Olivier Brunel jjk@jjacky.com --- lib/libalpm/alpm.h | 16 ++++++++++++++++ lib/libalpm/sync.c | 9 +++++++++ src/pacman/callback.c | 4 ++++ 3 files changed, 29 insertions(+)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2073c57..40d8e7b 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -322,6 +322,15 @@ typedef enum _alpm_event_type_t { ALPM_EVENT_RETRIEVE_DONE, /** Not all files were successfully downloaded from a repository. */ ALPM_EVENT_RETRIEVE_FAILED, + /** A file will be downloaded from a repository; See alpm_event_pkgdownload_t + * for arguments */ + ALPM_EVENT_PKGDOWNLOAD_START, + /** A file was downloaded from a repository; See alpm_event_pkgdownload_t + * for arguments */ + ALPM_EVENT_PKGDOWNLOAD_DONE, + /** A file failed to be downloaded from a repository; See + * alpm_event_pkgdownload_t for arguments */ + ALPM_EVENT_PKGDOWNLOAD_FAILED, /** Disk space usage will be computed for a package. */ ALPM_EVENT_DISKSPACE_START, /** Disk space usage was computed for a package. */ @@ -426,6 +435,13 @@ typedef struct _alpm_event_log_t { va_list args; } alpm_event_log_t;

+typedef struct _alpm_event_pkgdownload_t { + /** Type of event. */ + alpm_event_type_t type; + /** Name of the file */ + const char *file; +} alpm_event_pkgdownload_t; + /** Event callback. */ typedef void (*alpm_cb_event)(alpm_event_t *);

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7fd1312..06d8d15 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -892,11 +892,16 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t static int download_single_file(alpm_handle_t *handle, struct dload_payload *payload, const char *cachedir) { + alpm_event_pkgdownload_t event = { + .type = ALPM_EVENT_PKGDOWNLOAD_START, + .file = payload->remote_name + }; const alpm_list_t *server;

payload->handle = handle; payload->allow_resume = 1;

+ EVENT(handle, &event); for(server = payload->servers; server; server = server->next) { const char *server_url = server->data; size_t len; @@ -907,6 +912,8 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay snprintf(payload->fileurl, len, "%s/%s", server_url, payload->remote_name);

if(_alpm_download(payload, cachedir, NULL, NULL) != -1) { + event.type = ALPM_EVENT_PKGDOWNLOAD_DONE; + EVENT(handle, &event); return 0; }

@@ -914,6 +921,8 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay payload->unlink_on_fail = 0; }

+ event.type = ALPM_EVENT_PKGDOWNLOAD_FAILED; + EVENT(handle, &event); return -1; }

diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 357ded7..b38b77b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -302,6 +302,10 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_DISKSPACE_DONE: case ALPM_EVENT_RETRIEVE_DONE: case ALPM_EVENT_RETRIEVE_FAILED: + /* we can safely ignore those as well */ + case ALPM_EVENT_PKGDOWNLOAD_START: + case ALPM_EVENT_PKGDOWNLOAD_DONE: + case ALPM_EVENT_PKGDOWNLOAD_FAILED: /* nothing */ break; }

On 11/01/14 01:25, Olivier Brunel wrote:

ALPM still adds a warning to the log, but doesn't emit an event about said warning, instead using a specific event to let the frontend what happened/how to inform the user.

Signed-off-by: Olivier Brunel jjk@jjacky.com

lib/libalpm/add.c | 41 +++++++++++++++++++++++++++++++++++------ lib/libalpm/alpm.h | 41 ++++++++++++++++++++++++++++++++++++++++- lib/libalpm/remove.c | 7 ++++++- src/pacman/callback.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.c | 13 +++++++++++++ src/pacman/util.h | 1 + 6 files changed, 143 insertions(+), 8 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 1eaea36..649d6a9 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -363,8 +363,14 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(try_rename(handle, checkfile, newpath)) { errors++; } else {

• 			_alpm_log(handle, ALPM_LOG_WARNING, _("%s installed as %s\n"),
  

• 					filename, newpath);
  

• 			alpm_event_pacnew_created_t event = {
  

• 				.type = ALPM_EVENT_PACNEW_CREATED,
  

• 				.from_noupgrade = 0,
  

• 				.oldpkg = oldpkg,
  

• 				.newpkg = newpkg,
  

• 				.oldfile = filename
  

• 			};
  

• 			EVENT(handle, &event);
  		alpm_logaction(handle, ALPM_CALLER_PREFIX,
  				"warning: %s installed as %s\n", filename, newpath);
  	}
  

@@ -391,8 +397,12 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(try_rename(handle, checkfile, filename)) { errors++; } else {

• 				_alpm_log(handle, ALPM_LOG_WARNING,
  

• 						_("%s saved as %s\n"), filename, newpath);
  

• 				alpm_event_pacorig_created_t event = {
  

• 					.type = ALPM_EVENT_PACORIG_CREATED,
  

• 					.newpkg = newpkg,
  

• 					.oldfile = filename
  

• 				};
  

• 				EVENT(handle, &event);
  			alpm_logaction(handle, ALPM_CALLER_PREFIX,
  					"warning: %s saved as %s\n", filename, newpath);
  		}
  

@@ -407,14 +417,16 @@ needbackup_cleanup: free(hash_local); free(hash_pkg); } else {

• size_t len;
  

  /* we didn't need a backup */ if(notouch) { /* change the path to a .pacnew extension */ _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoUpgrade -- skipping\n", filename);

• 	_alpm_log(handle, ALPM_LOG_WARNING, _("extracting %s as %s.pacnew\n"), filename, filename);
  alpm_logaction(handle, ALPM_CALLER_PREFIX,
  		"warning: extracting %s as %s.pacnew\n", filename, filename);
  

For all other actions, the alpm_logaction() call is done right after the event and has the the exact same warning printed by pacman. Move this down to the next if(notouch) block and adjust the message to past tense.

• 	strncat(filename, ".pacnew", PATH_MAX - strlen(filename));
  

• 	/* remember len so we can get the old filename back for the event */
  

• 	len = strlen(filename);
  

• 	strncat(filename, ".pacnew", PATH_MAX - len);
  

  } else { _alpm_log(handle, ALPM_LOG_DEBUG, "extracting %s\n", filename); }

@@ -433,6 +445,23 @@ needbackup_cleanup: return errors; }

• if(notouch) {
  

• 	alpm_event_pacnew_created_t event = {
  

• 		.type = ALPM_EVENT_PACNEW_CREATED,
  

• 		.from_noupgrade = 1,
  

• 		.oldpkg = oldpkg,
  

• 		.newpkg = newpkg,
  

• 		.oldfile = filename
  

• 	};
  

• 	/* "remove" the .pacnew suffix */
  

• 	if(len < PATH_MAX)
  

I don't think these checks are necessary. If the filename exceeded PATH_MAX in length, we would need to detect this much earlier in the process. So no need to check here.

• 		filename[len] = '\0';
  

• 	EVENT(handle, &event);
  

• 	/* restore */
  

• 	if(len < PATH_MAX)
  

• 		filename[len] = '.';
  

• }
  

• /* calculate an hash if this is in newpkg's backup */ alpm_list_t *i; for(i = alpm_pkg_get_backup(newpkg); i; i = i->next) {

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 40d8e7b..626d875 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -350,7 +350,15 @@ typedef enum _alpm_event_type_t { /** Key downloading is finished. */ ALPM_EVENT_KEY_DOWNLOAD_DONE, /** A log message was emitted; See alpm_event_log_t for arguments. */

• ALPM_EVENT_LOG

• ALPM_EVENT_LOG,
• /** A .pacnew file was created; See alpm_event_pacnew_created_t for arguments. */
• ALPM_EVENT_PACNEW_CREATED,
• /** A .pacsave file was created; See alpm_event_pacsave_created_t for

• * arguments */
  

• ALPM_EVENT_PACSAVE_CREATED,
• /** A .pacorig file was created; See alpm_event_pacorig_created_t for

• * arguments */
  

• ALPM_EVENT_PACORIG_CREATED

} alpm_event_type_t;

/** Events. @@ -442,6 +450,37 @@ typedef struct _alpm_event_pkgdownload_t { const char *file; } alpm_event_pkgdownload_t;

+typedef struct _alpm_event_pacnew_created_t {

• /** Type of event. */
• alpm_event_type_t type;
• /** Whether the creation was result of a NoUpgrade or not */
• int from_noupgrade;
• /** Old package. */
• alpm_pkg_t *oldpkg;
• /** New Package. */
• alpm_pkg_t *newpkg;
• /** Filename of the old file. */
• const char *oldfile;

Bit if a bikeshed here... but I'd like this just referred to as "file" being the file name of the altered file without suffix. Having it called oldfile makes me think it is associated with oldpkg, when it is really being installed from newpkg. Do the same in the other two for consistency. Mention the lack of suffix in the comment.

+} alpm_event_pacnew_created_t;

+typedef struct _alpm_event_pacsave_created_t {

• /** Type of event. */
• alpm_event_type_t type;
• /** Old package. */
• alpm_pkg_t *oldpkg;
• /** Filename of the old file. */
• const char *oldfile;

+} alpm_event_pacsave_created_t;

+typedef struct _alpm_event_pacorig_created_t {

• /** Type of event. */
• alpm_event_type_t type;
• /** New package. */
• alpm_pkg_t *newpkg;
• /** Filename of the old file. */
• const char *oldfile;

+} alpm_event_pacorig_created_t;