Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 9e06893e authored by deuce's avatar deuce

BAJA-related 64-bit conversion.

Changes order of members in sbbs_t... all libs need rebuilding.
parent 291c1a3f
......@@ -664,12 +664,12 @@ typedef struct { /* Command shell image */
cmdrets; /* Command returns on stack */
int32_t ftp_mode, /* FTP operation mode */
*int_var; /* Integer variables */
long retval, /* Return value */
misc, /* Misc bits */
switch_val, /* Current switch value */
*int_var, /* Integer variables */
*str_var_name, /* String variable names (CRC-32) */
*int_var_name; /* Integer variable names (CRC-32) */
long retval, /* Return value */
misc, /* Misc bits */
switch_val; /* Current switch value */
long length; /* Length of image */
......
......@@ -43,7 +43,7 @@ static char* format_string(sbbs_t* sbbs, csi_t* csi)
{
char* fmt;
void* vp;
long* lp;
int32_t* lp;
unsigned i;
unsigned args;
......@@ -69,7 +69,8 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
char str[512],tmp[512],buf[1025],ch,op,*p,**pp,**pp1,**pp2;
ushort w;
uint i=0,j;
long l,*lp=NULL,*lp1=NULL,*lp2=NULL;
long l;
int32_t *lp=NULL,*lp1=NULL,*lp2=NULL;
void *vp;
struct dirent *de;
struct tm tm;
......@@ -133,7 +134,7 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
csi->str_vars++;
csi->str_var=(char **)realloc(csi->str_var
,sizeof(char *)*csi->str_vars);
csi->str_var_name=(long *)realloc(csi->str_var_name
csi->str_var_name=(int32_t *)realloc(csi->str_var_name
,sizeof(long)*csi->str_vars);
if(csi->str_var==NULL
|| csi->str_var_name==NULL) { /* REALLOC failed */
......@@ -156,9 +157,9 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
csi->ip+=4;
return(0); }
csi->int_vars++;
csi->int_var=(long *)realloc(csi->int_var
csi->int_var=(int32_t *)realloc(csi->int_var
,sizeof(char *)*csi->int_vars);
csi->int_var_name=(long *)realloc(csi->int_var_name
csi->int_var_name=(int32_t *)realloc(csi->int_var_name
,sizeof(long)*csi->int_vars);
if(csi->int_var==NULL
|| csi->int_var_name==NULL) { /* REALLOC failed */
......@@ -183,7 +184,7 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
global_str_vars++;
global_str_var=(char **)realloc(global_str_var
,sizeof(char *)*global_str_vars);
global_str_var_name=(long *)realloc(global_str_var_name
global_str_var_name=(int32_t *)realloc(global_str_var_name
,sizeof(long)*global_str_vars);
if(global_str_var==NULL
|| global_str_var_name==NULL) { /* REALLOC failed */
......@@ -207,9 +208,9 @@ int sbbs_t::exec_misc(csi_t* csi, char *path)
csi->ip+=4;
return(0); }
global_int_vars++;
global_int_var=(long *)realloc(global_int_var
global_int_var=(int32_t *)realloc(global_int_var
,sizeof(char *)*global_int_vars);
global_int_var_name=(long *)realloc(global_int_var_name
global_int_var_name=(int32_t *)realloc(global_int_var_name
,sizeof(long)*global_int_vars);
if(global_int_var==NULL
|| global_int_var_name==NULL) { /* REALLOC failed */
......
......@@ -48,7 +48,7 @@ int sbbs_t::exec_net(csi_t* csi)
ushort w;
uint i;
BOOL rd;
long *lp,*lp1,*lp2;
int32_t *lp,*lp1,*lp2;
time_t start;
switch(*(csi->ip++)) { /* sub-op-code stored as next byte */
......
......@@ -369,10 +369,10 @@ public:
/* Global command shell variables */
uint global_str_vars;
char ** global_str_var;
long * global_str_var_name;
int32_t * global_str_var_name;
uint global_int_vars;
int32_t * global_int_var;
long * global_int_var_name;
int32_t * global_int_var_name;
char * sysvar_p[MAX_SYSVARS];
uint sysvar_pi;
int32_t sysvar_l[MAX_SYSVARS];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment