mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 00:08:50 -05:00
Added PM_DLFNM_LEN define, via VMiklos
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=pacman;a=commitdiff;h=20061023154138-e2957-de4837230b091cbc2136306e1c55a4b79cc72fc8.gz
This commit is contained in:
parent
7fc4b8d2d5
commit
e21f4c8f2e
@ -379,8 +379,13 @@ int alpm_db_update(int force, PM_DB *db)
|
||||
if(_alpm_unpack(path, db->path, NULL)) {
|
||||
RET_ERR(PM_ERR_SYSTEM, 1);
|
||||
}
|
||||
|
||||
/* remove the .tar.gz */
|
||||
/* aaron: let's not do this... we'll keep the DB around to be read for the
|
||||
* "new and improved" db routines
|
||||
|
||||
unlink(path);
|
||||
*/
|
||||
}
|
||||
|
||||
return(0);
|
||||
|
@ -79,6 +79,8 @@ int alpm_logaction(char *fmt, ...);
|
||||
* Options
|
||||
*/
|
||||
|
||||
#define PM_DLFNM_LEN 22
|
||||
|
||||
/* Parameters */
|
||||
enum {
|
||||
PM_OPT_LOGCB = 1,
|
||||
|
@ -299,22 +299,22 @@ int _alpm_downloadfiles_forreal(pmlist_t *servers, const char *localpath,
|
||||
struct stat st;
|
||||
snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn);
|
||||
if(pm_dlfnm) {
|
||||
strncpy(pm_dlfnm, fn, 22);
|
||||
strncpy(pm_dlfnm, fn, PM_DLFNM_LEN);
|
||||
}
|
||||
/* drop filename extension */
|
||||
ptr = strstr(fn, PM_EXT_DB);
|
||||
if(pm_dlfnm && ptr && (ptr-fn) < 22) {
|
||||
if(pm_dlfnm && ptr && (ptr-fn) < PM_DLFNM_LEN) {
|
||||
pm_dlfnm[ptr-fn] = '\0';
|
||||
}
|
||||
ptr = strstr(fn, PM_EXT_PKG);
|
||||
if(ptr && (ptr-fn) < 24) {
|
||||
if(ptr && (ptr-fn) < PM_DLFNM_LEN) {
|
||||
pm_dlfnm[ptr-fn] = '\0';
|
||||
}
|
||||
if(pm_dlfnm) {
|
||||
for(j = strlen(pm_dlfnm); j < 22; j++) {
|
||||
for(j = strlen(pm_dlfnm); j < PM_DLFNM_LEN; j++) {
|
||||
(pm_dlfnm)[j] = ' ';
|
||||
}
|
||||
pm_dlfnm[22] = '\0';
|
||||
pm_dlfnm[PM_DLFNM_LEN] = '\0';
|
||||
}
|
||||
if(pm_dloffset) {
|
||||
*pm_dloffset = 0;
|
||||
|
@ -40,7 +40,7 @@
|
||||
#include "conf.h"
|
||||
|
||||
/* progress bar */
|
||||
char sync_fnm[23];
|
||||
char sync_fnm[PM_DLFNM_LEN+1];
|
||||
int offset;
|
||||
struct timeval t0, t;
|
||||
float rate;
|
||||
|
@ -21,7 +21,7 @@
|
||||
#ifndef _PM_DOWNLOAD_H
|
||||
#define _PM_DOWNLOAD_H
|
||||
|
||||
extern char sync_fnm[23];
|
||||
extern char sync_fnm[PM_DLFNM_LEN+1];
|
||||
extern int offset;
|
||||
extern struct timeval t0, t;
|
||||
extern float rate;
|
||||
|
Loading…
Reference in New Issue
Block a user