bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoided usage of global variables pmo_root and pmo_dbpath.

Browse source 
Better make use of alpm_get_option to ge their values.
This commit is contained in:
Aurelien Foret 2005-03-16 21:32:46 +00:00
parent ab7ca5dc72
commit 47cd8c2323
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pacman/download.c
View file

@ -44,8 +44,6 @@ static int xfered1;
static unsigned char eta_h, eta_m, eta_s; static unsigned char eta_h, eta_m, eta_s;
/* pacman options */ /* pacman options */
extern char *pmo_root;
extern char *pmo_dbpath;
extern char *pmo_proxyhost; extern char *pmo_proxyhost;
extern char *pmo_xfercommand; extern char *pmo_xfercommand;

24
src/pacman/sync.c
View file

@ -37,9 +37,6 @@
#include "sync.h" #include "sync.h"
#include "pacman.h" #include "pacman.h"
extern char *pmo_root;
extern char *pmo_dbpath;
extern unsigned short pmo_noconfirm; extern unsigned short pmo_noconfirm;
extern unsigned short pmo_d_resolve; extern unsigned short pmo_d_resolve;
extern unsigned short pmo_q_info; extern unsigned short pmo_q_info;
@ -60,6 +57,10 @@ extern int maxcols;
static int sync_cleancache(int level) static int sync_cleancache(int level)
{ {
char *root;
alpm_get_option(PM_OPT_ROOT, (long *)&root);
if(level == 1) { if(level == 1) {
/* incomplete cleanup: we keep latest packages and partial downloads */ /* incomplete cleanup: we keep latest packages and partial downloads */
DIR *dir; DIR *dir;
@ -125,7 +126,7 @@ static int sync_cleancache(int level)
for(i = clean; i; i = i->next) { for(i = clean; i; i = i->next) {
char path[PATH_MAX]; char path[PATH_MAX];
snprintf(path, PATH_MAX, "%s%s/%s", pmo_root, CACHEDIR, (char *)i->data); snprintf(path, PATH_MAX, "%s%s/%s", root, CACHEDIR, (char *)i->data);
unlink(path); unlink(path);
} }
FREELIST(clean); FREELIST(clean);
@ -135,7 +136,7 @@ static int sync_cleancache(int level)
mode_t oldmask; mode_t oldmask;
char path[PATH_MAX]; char path[PATH_MAX];
snprintf(path, PATH_MAX, "%s%s", pmo_root, CACHEDIR); snprintf(path, PATH_MAX, "%s%s", root, CACHEDIR);
printf("removing all packages from cache... "); printf("removing all packages from cache... ");
if(rmrf(path)) { if(rmrf(path)) {
@ -355,7 +356,7 @@ int pacman_sync(list_t *targets)
list_t *final = NULL; list_t *final = NULL;
list_t *i, *j; list_t *i, *j;
PM_LIST *lp, *data; PM_LIST *lp, *data;
char *root;
char ldir[PATH_MAX]; char ldir[PATH_MAX];
int varcache = 1; int varcache = 1;
int done = 0; int done = 0;
@ -677,7 +678,8 @@ int pacman_sync(list_t *targets)
/* ORE /* ORE
group sync records by repository and download */ group sync records by repository and download */
snprintf(ldir, PATH_MAX, "%svar/cache/pacman/pkg", pmo_root); alpm_get_option(PM_OPT_ROOT, (long *)&root);
snprintf(ldir, PATH_MAX, "%svar/cache/pacman/pkg", root);
while(!done) { while(!done) {
if(current) { if(current) {
@ -713,15 +715,15 @@ int pacman_sync(list_t *targets)
mode_t oldmask; mode_t oldmask;
/* no cache directory.... try creating it */ /* no cache directory.... try creating it */
/* ORE MSG(NL, "warning: no %s cache exists. creating...", ldir);
* alpm_logaction(stderr, "warning: no %s cache exists. creating...", ldir);*/ alpm_logaction("warning: no %s cache exists. creating...", ldir);
oldmask = umask(0000); oldmask = umask(0000);
if(makepath(ldir)) { if(makepath(ldir)) {
/* couldn't mkdir the cache directory, so fall back to /tmp and unlink /* couldn't mkdir the cache directory, so fall back to /tmp and unlink
* the package afterwards. * the package afterwards.
*/ */
/* ORE MSG(NL, "warning: couldn't create package cache, using /tmp instead");
* logaction(stderr, "warning: couldn't create package cache, using /tmp instead");*/ alpm_logaction("warning: couldn't create package cache, using /tmp instead");
snprintf(ldir, PATH_MAX, "/tmp"); snprintf(ldir, PATH_MAX, "/tmp");
varcache = 0; varcache = 0;
} }