diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-31 07:39:59 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-31 07:39:59 +0100 |
| commit | af2fb3324a925af6caa9d53aacac92173fc47885 (patch) | |
| tree | b7abb647d27db75a1d937eea24cd5eccac6e5db8 /lib/libalpm/handle.c | |
| parent | 78c0badc9b3629c5156d4bd0733a3e9a1e4e92c6 (diff) | |
| download | pacman-af2fb3324a925af6caa9d53aacac92173fc47885.tar.gz pacman-af2fb3324a925af6caa9d53aacac92173fc47885.tar.xz | |
Numerous changes:
* Furthered the "lazy caching" to force the pkgcache to read nothing
(INFRQ_NONE) by default. Anything requiring package data should now check
the infolevel of each package and attempt to update it. This could be
ironed out a bit more later (by using the front-end get_info function
* Switched to libfetch. Drastic changes to the download code and the callback
progress bar functions. Also fixed the return value of
_alpm_downloadfiles_forreal. Downloading now supports http, ftp, https, and
files urls, along with 'mtime's and numerous other fancy features from
libfetch.
Diffstat (limited to 'lib/libalpm/handle.c')
| -rw-r--r-- | lib/libalpm/handle.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 6c1b98c5..dd9d50b6 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -31,7 +31,7 @@ #include <syslog.h> #include <libintl.h> #include <time.h> -#include <ftplib.h> +/////#include <ftplib.h> /* pacman */ #include "util.h" #include "log.h" @@ -113,7 +113,7 @@ int _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->ignorepkg); FREELIST(handle->holdpkg); FREELIST(handle->needles); - free(handle); + FREE(handle); return(0); } @@ -224,9 +224,9 @@ int _alpm_handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long pm_logcb = (alpm_cb_log)data; break; case PM_OPT_DLCB: - pm_dlcb = (FtpCallback)data; + pm_dlcb = (download_progress_cb)data; break; - case PM_OPT_DLFNM: +/* case PM_OPT_DLFNM: pm_dlfnm = (char *)data; break; case PM_OPT_DLOFFSET: @@ -253,6 +253,7 @@ int _alpm_handle_set_option(pmhandle_t *handle, unsigned char val, unsigned long case PM_OPT_DLETA_S: pm_dleta_s = (unsigned char *)data; break; +*/ case PM_OPT_UPGRADEDELAY: handle->upgradedelay = data; break; @@ -331,6 +332,7 @@ int _alpm_handle_get_option(pmhandle_t *handle, unsigned char val, long *data) case PM_OPT_DLCB: *data = (long)pm_dlcb; break; case PM_OPT_UPGRADEDELAY: *data = (long)handle->upgradedelay; break; case PM_OPT_LOGMASK: *data = pm_logmask; break; +/* case PM_OPT_DLFNM: *data = (long)pm_dlfnm; break; case PM_OPT_DLOFFSET: *data = (long)pm_dloffset; break; case PM_OPT_DLT0: *data = (long)pm_dlt0; break; @@ -340,6 +342,7 @@ int _alpm_handle_get_option(pmhandle_t *handle, unsigned char val, long *data) case PM_OPT_DLETA_H: *data = (long)pm_dleta_h; break; case PM_OPT_DLETA_M: *data = (long)pm_dleta_m; break; case PM_OPT_DLETA_S: *data = (long)pm_dleta_s; break; +*/ case PM_OPT_PROXYHOST: *data = (long)handle->proxyhost; break; case PM_OPT_PROXYPORT: *data = handle->proxyport; break; case PM_OPT_XFERCOMMAND: *data = (long)handle->xfercommand; break; |