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

- added a WARN macro to display warnings

Browse source 
- used ERR macro for error messages
This commit is contained in:
Aurelien Foret 2006-02-14 18:43:51 +00:00
parent 7ab3bb136d
commit e4c9ab4895
3 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/pacman/download.c
View file

@ -206,23 +206,22 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
FtpInit(); FtpInit();
vprint("connecting to %s:21\n", server->server); vprint("connecting to %s:21\n", server->server);
if(!FtpConnect(server->server, &control)) { if(!FtpConnect(server->server, &control)) {
fprintf(stderr, "error: cannot connect to %s\n", server->server); ERR(NL, "cannot connect to %s\n", server->server);
continue; continue;
} }
if(!FtpLogin("anonymous", "arch@guest", control)) { if(!FtpLogin("anonymous", "arch@guest", control)) {
fprintf(stderr, "error: anonymous login failed\n"); ERR(NL, "anonymous login failed\n");
FtpQuit(control); FtpQuit(control);
continue; continue;
} }
if(!FtpChdir(server->path, control)) { if(!FtpChdir(server->path, control)) {
fprintf(stderr, "error: could not cwd to %s: %s\n", server->path, ERR(NL, "could not cwd to %s: %s\n", server->path, FtpLastResponse(control));
FtpLastResponse(control));
FtpQuit(control); FtpQuit(control);
continue; continue;
} }
if(!config->nopassiveftp) { if(!config->nopassiveftp) {
if(!FtpOptions(FTPLIB_CONNMODE, FTPLIB_PASSIVE, control)) { if(!FtpOptions(FTPLIB_CONNMODE, FTPLIB_PASSIVE, control)) {
fprintf(stderr, "warning: failed to set passive mode\n"); WARN(NL, "failed to set passive mode\n");
} }
} else { } else {
vprint("FTP passive mode not set\n"); vprint("FTP passive mode not set\n");
@ -238,7 +237,7 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
vprint("connecting to %s:%u\n", host, port); vprint("connecting to %s:%u\n", host, port);
} }
if(!HttpConnect(host, port, &control)) { if(!HttpConnect(host, port, &control)) {
fprintf(stderr, "error: cannot connect to %s\n", host); ERR(NL, "cannot connect to %s\n", host);
continue; continue;
} }
} }
@ -297,14 +296,14 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
/* cwd to the download directory */ /* cwd to the download directory */
getcwd(cwd, PATH_MAX); getcwd(cwd, PATH_MAX);
if(chdir(localpath)) { if(chdir(localpath)) {
fprintf(stderr, "error: could not chdir to %s\n", localpath); ERR(NL, "could not chdir to %s\n", localpath);
return(1); return(1);
} }
/* execute the parsed command via /bin/sh -c */ /* execute the parsed command via /bin/sh -c */
vprint("running command: %s\n", parsedCmd); vprint("running command: %s\n", parsedCmd);
ret = system(parsedCmd); ret = system(parsedCmd);
if(ret == -1) { if(ret == -1) {
fprintf(stderr, "error running XferCommand: fork failed!\n"); ERR(NL, "running XferCommand: fork failed!\n");
return(1); return(1);
} else if(ret != 0) { } else if(ret != 0) {
/* download failed */ /* download failed */
@ -353,13 +352,13 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
if(!strcmp(server->protocol, "ftp") && !config->proxyhost) { if(!strcmp(server->protocol, "ftp") && !config->proxyhost) {
if(!FtpSize(fn, &fsz, FTPLIB_IMAGE, control)) { if(!FtpSize(fn, &fsz, FTPLIB_IMAGE, control)) {
fprintf(stderr, "warning: failed to get filesize for %s\n", fn); WARN(NL, "failed to get filesize for %s\n", fn);
} }
/* check mtimes */ /* check mtimes */
if(mtime1) { if(mtime1) {
char fmtime[64]; char fmtime[64];
if(!FtpModDate(fn, fmtime, sizeof(fmtime)-1, control)) { if(!FtpModDate(fn, fmtime, sizeof(fmtime)-1, control)) {
fprintf(stderr, "warning: failed to get mtime for %s\n", fn); WARN(NL, "failed to get mtime for %s\n", fn);
} else { } else {
strtrim(fmtime); strtrim(fmtime);
if(mtime1 && !strcmp(mtime1, fmtime)) { if(mtime1 && !strcmp(mtime1, fmtime)) {
@ -379,15 +378,14 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
if(!stat(output, &st)) { if(!stat(output, &st)) {
offset = (int)st.st_size; offset = (int)st.st_size;
if(!FtpRestart(offset, control)) { if(!FtpRestart(offset, control)) {
fprintf(stderr, "warning: failed to resume download -- restarting\n"); WARN(NL, "failed to resume download -- restarting\n");
/* can't resume: */ /* can't resume: */
/* unlink the file in order to restart download from scratch */ /* unlink the file in order to restart download from scratch */
unlink(output); unlink(output);
} }
} }
if(!FtpGet(output, fn, FTPLIB_IMAGE, control)) { if(!FtpGet(output, fn, FTPLIB_IMAGE, control)) {
fprintf(stderr, "\nfailed downloading %s from %s: %s\n", ERR(NL, "\nfailed downloading %s from %s: %s\n", fn, server->server, FtpLastResponse(control));
fn, server->server, FtpLastResponse(control));
/* we leave the partially downloaded file in place so it can be resumed later */ /* we leave the partially downloaded file in place so it can be resumed later */
} else { } else {
filedone = 1; filedone = 1;
@ -413,7 +411,7 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
vprint("connecting to %s:%u\n", host, port); vprint("connecting to %s:%u\n", host, port);
} }
if(!HttpConnect(host, port, &control)) { if(!HttpConnect(host, port, &control)) {
fprintf(stderr, "error: cannot connect to %s\n", host); ERR(NL, "cannot connect to %s\n", host);
continue; continue;
} }
/* set up our progress bar's callback (and idle timeout) */ /* set up our progress bar's callback (and idle timeout) */
@ -462,7 +460,7 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
filedone = -1; filedone = -1;
complete = list_add(complete, fn); complete = list_add(complete, fn);
} else { } else {
fprintf(stderr, "\nfailed downloading %s from %s: %s\n", src, server->server, FtpLastResponse(control)); ERR(NL, "\nfailed downloading %s from %s: %s\n", src, server->server, FtpLastResponse(control));
/* we leave the partially downloaded file in place so it can be resumed later */ /* we leave the partially downloaded file in place so it can be resumed later */
} }
} else { } else {
@ -473,7 +471,7 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
fmtime2.tm_year+1900, fmtime2.tm_mon+1, fmtime2.tm_mday, fmtime2.tm_year+1900, fmtime2.tm_mon+1, fmtime2.tm_mday,
fmtime2.tm_hour, fmtime2.tm_min, fmtime2.tm_sec); fmtime2.tm_hour, fmtime2.tm_min, fmtime2.tm_sec);
} else { } else {
fprintf(stderr, "warning: failed to get mtime for %s\n", fn); WARN(NL, "failed to get mtime for %s\n", fn);
} }
} }
filedone = 1; filedone = 1;
@ -484,7 +482,7 @@ int downloadfiles_forreal(list_t *servers, const char *localpath,
vprint("copying %s to %s/%s\n", src, localpath, fn); vprint("copying %s to %s/%s\n", src, localpath, fn);
/* local repository, just copy the file */ /* local repository, just copy the file */
if(copyfile(src, output)) { if(copyfile(src, output)) {
fprintf(stderr, "failed copying %s\n", src); ERR(NL, "failed copying %s\n", src);
} else { } else {
filedone = 1; filedone = 1;
} }
@ -568,11 +566,7 @@ char *fetch_pkgurl(char *target)
list_t *servers = NULL; list_t *servers = NULL;
list_t *files; list_t *files;
server = (server_t *)malloc(sizeof(server_t)); MALLOC(server, sizeof(server_t));
if(server == NULL) {
fprintf(stderr, "error: failed to allocate %d bytes\n", sizeof(server_t));
return(NULL);
}
server->protocol = url; server->protocol = url;
server->server = host; server->server = host;
server->path = spath; server->path = spath;

4
src/pacman/log.h
View file

@ -26,6 +26,10 @@
pm_fprintf(stderr, line, "error: "); \ pm_fprintf(stderr, line, "error: "); \
pm_fprintf(stderr, CL, fmt, ##args); \ pm_fprintf(stderr, CL, fmt, ##args); \
} while(0) } while(0)
#define WARN(line, fmt, args...) do { \
pm_fprintf(stderr, line, "warning: "); \
pm_fprintf(stderr, CL, fmt, ##args); \
} while(0)
enum { enum {
NL, /* new line */ NL, /* new line */

4
src/pacman/sync.c
View file

@ -692,13 +692,13 @@ int pacman_sync(list_t *targets)
fflush(stdout); fflush(stdout);
if(stat(ldir, &buf)) { if(stat(ldir, &buf)) {
/* no cache directory.... try creating it */ /* no cache directory.... try creating it */
MSG(NL, "warning: no %s cache exists. creating...\n", ldir); WARN(NL, "no %s cache exists. creating...\n", ldir);
alpm_logaction("warning: no %s cache exists. creating...", ldir); alpm_logaction("warning: no %s cache exists. creating...", ldir);
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.
*/ */
MSG(NL, "warning: couldn't create package cache, using /tmp instead"); WARN(NL, "couldn't create package cache, using /tmp instead");
alpm_logaction("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");
if(alpm_set_option(PM_OPT_CACHEDIR, (long)ldir) == -1) { if(alpm_set_option(PM_OPT_CACHEDIR, (long)ldir) == -1) {