First stage port to 64 bit

This commit is contained in:
Michiel Broek
2005-10-11 20:49:41 +00:00
parent ac4e2dce0a
commit 1dfaf10c20
222 changed files with 1620 additions and 1563 deletions

View File

@@ -916,7 +916,7 @@ int edit_bool(int y, int x, int val, char *help)
char *getloglevel(long val)
char *getloglevel(int val)
{
char *p;
@@ -949,7 +949,7 @@ char *getloglevel(long val)
void show_logl(int y, int x, long val)
void show_logl(int y, int x, int val)
{
char *p;
@@ -960,7 +960,7 @@ void show_logl(int y, int x, long val)
long edit_logl(long val, char *txt)
int edit_logl(int val, char *txt)
{
clr_index();
set_color(WHITE, BLACK);
@@ -1149,14 +1149,14 @@ unsigned short toggle_sbit(int y, int x, unsigned short val, unsigned short mask
void show_lbit(int y, int x, long val, long mask)
void show_lbit(int y, int x, int val, int mask)
{
show_bool(y, x, (val & mask) != 0);
}
long toggle_lbit(int y, int x, long val, long mask, char *help)
int toggle_lbit(int y, int x, int val, int mask, char *help)
{
int ch;
@@ -1176,7 +1176,7 @@ long toggle_lbit(int y, int x, long val, long mask, char *help)
char *getflag(unsigned long flag, unsigned long not)
char *getflag(unsigned int flag, unsigned int not)
{
static char temp[33];
int i;

View File

@@ -27,10 +27,10 @@ char *edit_ups(int, int, int, char *, char *);
char *getboolean(int val);
void show_bool(int, int, int);
int edit_bool(int, int, int, char *);
char *getloglevel(long val);
void show_logl(int, int, long);
long edit_logl(long, char *);
char *getflag(unsigned long, unsigned long);
char *getloglevel(int val);
void show_logl(int, int, int);
int edit_logl(int, char *);
char *getflag(unsigned int, unsigned int);
void show_sec(int, int, securityrec);
securityrec edit_sec(int, int, securityrec, char *);
securityrec edit_usec(int, int, securityrec, char *);
@@ -44,8 +44,8 @@ void show_ushort(int, int, unsigned short);
unsigned short edit_ushort(int, int, unsigned short, char *);
void show_sbit(int, int, unsigned short, unsigned short);
unsigned short toggle_sbit(int, int, unsigned short, unsigned short, char *);
void show_lbit(int, int, long, long);
long toggle_lbit(int, int, long, long, char *);
void show_lbit(int, int, int, int);
int toggle_lbit(int, int, int, int, char *);
char *getmsgtype(int);
void show_msgtype(int, int, int);
int edit_msgtype(int, int, int);

View File

@@ -393,7 +393,7 @@ int OpenArchive(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/archiver.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/archiver.temp", getenv("MBSE_ROOT"));
@@ -509,9 +509,9 @@ int EditArchRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -611,7 +611,7 @@ void EditArchive(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -717,7 +717,7 @@ char *PickArchive(char *shdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();

View File

@@ -109,7 +109,7 @@ int OpenDomain(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/domain.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/domain.temp", getenv("MBSE_ROOT"));
@@ -233,8 +233,8 @@ int EditDomainRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -303,7 +303,7 @@ void EditDomain(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
struct domrec tdomtrans;
if (! check_free())

View File

@@ -107,7 +107,7 @@ int OpenFilearea(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/fareas.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/fareas.temp", getenv("MBSE_ROOT"));
@@ -263,8 +263,8 @@ int EditFileRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX], *temp, tpath[65], frpath[81], topath[81];
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
int Available, files, rc, Force = FALSE, count;
DIR *dp;
struct dirent *de;
@@ -469,7 +469,7 @@ void EditFilearea(void)
char pick[12];
FILE *fil, *tfil;
char temp[PATH_MAX], new[PATH_MAX];
long offset, from, too;
int offset, from, too;
clr_index();
working(1, 0, 0);
@@ -590,8 +590,8 @@ void EditFilearea(void)
offset = areahdr.hdrsize + ((from - 1) * areahdr.recsize);
fseek(fil, offset, 0);
fwrite(&area, areahdr.recsize, 1, fil);
snprintf(temp, PATH_MAX, "%s/var/fdb/file%ld.data", getenv("MBSE_ROOT"), from);
snprintf(new, PATH_MAX, "%s/var/fdb/file%ld.data", getenv("MBSE_ROOT"), too);
snprintf(temp, PATH_MAX, "%s/var/fdb/file%d.data", getenv("MBSE_ROOT"), from);
snprintf(new, PATH_MAX, "%s/var/fdb/file%d.data", getenv("MBSE_ROOT"), too);
rename(temp, new);
/*
@@ -664,13 +664,13 @@ void EditFilearea(void)
long PickFilearea(char *shdr)
int PickFilearea(char *shdr)
{
int records, i, o = 0, x, y;
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -1,10 +1,11 @@
#ifndef _FAREA_H
#define _FAREA_H
/* $Id$ */
int CountFilearea(void);
void EditFilearea(void);
long PickFilearea(char *);
int PickFilearea(char *);
void InitFilearea(void);
int bbs_file_doc(FILE *, FILE *, int);

View File

@@ -40,7 +40,7 @@
#include "m_fdb.h"
void E_F(long);
void E_F(int);
void EditFile(void);
@@ -105,20 +105,20 @@ void EditFile()
void E_F(long areanr)
void E_F(int areanr)
{
FILE *fil;
char temp[PATH_MAX], help[81];
int i, y, o, records, Ondisk;
static char *menu = (char *)"0";
long offset;
int offset;
time_t Time;
struct stat statfile;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
snprintf(temp, PATH_MAX, "%s/var/fdb/file%ld.data", getenv("MBSE_ROOT"), areanr);
snprintf(temp, PATH_MAX, "%s/var/fdb/file%d.data", getenv("MBSE_ROOT"), areanr);
if ((fil = fopen(temp, "r+")) == NULL) {
working(2, 0, 0);
return;
@@ -262,7 +262,7 @@ void EditFDB()
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -353,7 +353,7 @@ void EditFDB()
void InitFDB(void)
{
int records, i;
long Area = 0;
int Area = 0;
char *temp, Magic[21];
FILE *fp1, *fp2, *fil, *ft, *fp;
DIR *dp;
@@ -374,12 +374,12 @@ void InitFDB(void)
while (fread(&area, areahdr.recsize, 1, fil)) {
Area++;
if (area.Available) {
snprintf(temp, PATH_MAX, "%s/var/fdb/fdb%ld.data", getenv("MBSE_ROOT"), Area);
snprintf(temp, PATH_MAX, "%s/var/fdb/fdb%d.data", getenv("MBSE_ROOT"), Area);
if ((fp1 = fopen(temp, "r")) != NULL) {
/*
* Old area available, upgrade.
*/
snprintf(temp, PATH_MAX, "%s/var/fdb/file%ld.data", getenv("MBSE_ROOT"), Area);
snprintf(temp, PATH_MAX, "%s/var/fdb/file%d.data", getenv("MBSE_ROOT"), Area);
if ((fp2 = fopen(temp, "w+")) == NULL) {
WriteError("$Can't create %s", temp);
} else {
@@ -452,7 +452,7 @@ void InitFDB(void)
Syslog('+', "Upgraded file area database %d", Area);
}
fclose(fp1);
snprintf(temp, PATH_MAX, "%s/var/fdb/fdb%ld.data", getenv("MBSE_ROOT"), Area);
snprintf(temp, PATH_MAX, "%s/var/fdb/fdb%d.data", getenv("MBSE_ROOT"), Area);
unlink(temp);
} // Old area type upgrade.
@@ -460,7 +460,7 @@ void InitFDB(void)
* Current area, check
*/
if ((fdb_area = mbsedb_OpenFDB(Area, 30)) == NULL)
WriteError("InitFDB(): database area %ld might be corrupt", Area);
WriteError("InitFDB(): database area %d might be corrupt", Area);
else
mbsedb_CloseFDB(fdb_area);
}

View File

@@ -87,7 +87,7 @@ int OpenFilefind(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/scanmgr.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/scanmgr.temp", getenv("MBSE_ROOT"));
@@ -239,8 +239,8 @@ int EditFfRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX], temp1[2];
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
int i;
clr_index();
@@ -331,7 +331,7 @@ void EditFilefind(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -92,7 +92,7 @@ int OpenFGroup(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX], temp[13];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/fgroups.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/fgroups.temp", getenv("MBSE_ROOT"));
@@ -307,11 +307,11 @@ void FgScreen(void)
*/
int EditFGrpRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX], temp[13];
long offset;
int i, j, tmp;
unsigned long crc, crc1;
FILE *fil;
char mfile[PATH_MAX], temp[13];
int offset;
int i, j, tmp;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -485,7 +485,7 @@ void EditFGroup(void)
int records, i, o, x, y;
char pick[12], temp[PATH_MAX];
FILE *fil;
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -598,7 +598,7 @@ char *PickFGroup(char *shdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
@@ -685,6 +685,7 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
char *temp, group[13];
FILE *ti, *wp, *ip, *no;
int refs, i, First = TRUE;;
time_t tt;
temp = calloc(PATH_MAX, sizeof(char));
snprintf(temp, PATH_MAX, "%s/etc/fgroups.data", getenv("MBSE_ROOT"));
@@ -730,7 +731,7 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
add_webtable(wp, (char *)"Use Aka", aka2str(fgroup.UseAka));
add_webtable(wp, (char *)"Uplink Aka", aka2str(fgroup.UpLink));
add_webtable(wp, (char *)"Areas file", fgroup.AreaFile);
snprintf(temp, 81, "%ld", fgroup.StartArea);
snprintf(temp, 81, "%d", fgroup.StartArea);
add_webtable(wp, (char *)"Start autocreate BBS area", temp);
add_webtable(wp, (char *)"Banner file", fgroup.Banner);
add_webtable(wp, (char *)"Default archiver", fgroup.Convert);
@@ -758,8 +759,10 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
fgroup.AnnGroup);
snprintf(temp, 81, "%d", fgroup.Upload);
add_webtable(wp, (char *)"Upload area", temp);
add_webtable(wp, (char *)"Start date", ctime(&fgroup.StartDate));
add_webtable(wp, (char *)"Last active date", ctime(&fgroup.LastDate));
tt = (time_t)fgroup.StartDate;
add_webtable(wp, (char *)"Start date", ctime(&tt));
tt = (time_t)fgroup.LastDate;
add_webtable(wp, (char *)"Last active date", ctime(&tt));
fprintf(wp, "</TBODY>\n");
fprintf(wp, "</TABLE>\n");
fprintf(wp, "<HR>\n");
@@ -863,7 +866,7 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Use Aka %s\n", aka2str(fgroup.UseAka));
fprintf(fp, " Uplink %s\n", aka2str(fgroup.UpLink));
fprintf(fp, " Areas file %s\n", fgroup.AreaFile);
fprintf(fp, " Start area %ld\n", fgroup.StartArea);
fprintf(fp, " Start area %d\n", fgroup.StartArea);
fprintf(fp, " Banner file %s\n", fgroup.Banner);
fprintf(fp, " Def. archiver %s\n", fgroup.Convert);
fprintf(fp, " Filegate fmt %s\n", getboolean(fgroup.FileGate));
@@ -887,8 +890,10 @@ int tic_group_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " BBS group %s\n", fgroup.BbsGroup);
fprintf(fp, " Newfiles group %s\n", fgroup.AnnGroup);
fprintf(fp, " Upload area %d\n", fgroup.Upload);
fprintf(fp, " Start date %s", ctime(&fgroup.StartDate));
fprintf(fp, " Last date %s\n", ctime(&fgroup.LastDate));
tt = (time_t)fgroup.StartDate;
fprintf(fp, " Start date %s", ctime(&tt));
tt = (time_t)fgroup.LastDate;
fprintf(fp, " Last date %s\n", ctime(&tt));
}
fprintf(ip, "</TBODY>\n");

View File

@@ -106,7 +106,7 @@ int OpenFidonet(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/fidonet.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/fidonet.temp", getenv("MBSE_ROOT"));
@@ -226,9 +226,9 @@ int EditFidoRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX], *temp;
long offset;
int offset;
int i, j = 0;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -378,7 +378,7 @@ void EditFidonet(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -49,7 +49,7 @@ int some_fd;
extern int exp_golded;
#define WRLONG cnt = write(some_fd, &longvar, sizeof(longvar));
// #define WRLONG cnt = write(some_fd, &longvar, sizeof(longvar));
@@ -1442,7 +1442,7 @@ void e_html(void)
void global_menu(void)
{
unsigned long crc, crc1;
unsigned int crc, crc1;
int i;
char *temp;
@@ -2100,9 +2100,9 @@ int global_doc(FILE *fp, FILE *toc, int page)
addtoc(fp, toc, 1, 11, page, (char *)"Fileecho processing");
fprintf(fp, " Keep days on hold %d\n", CFG.tic_days);
fprintf(fp, " Hatch password %s\n", CFG.hatchpasswd);
fprintf(fp, " Max. systems %ld\n", CFG.tic_systems);
fprintf(fp, " Max. groups %ld\n", CFG.tic_groups);
fprintf(fp, " Max. dupes %ld\n", CFG.tic_dupes);
fprintf(fp, " Max. systems %d\n", CFG.tic_systems);
fprintf(fp, " Max. groups %d\n", CFG.tic_groups);
fprintf(fp, " Max. dupes %d\n", CFG.tic_dupes);
fprintf(fp, " Keep filedate %s\n", getboolean(CFG.ct_KeepDate));
fprintf(fp, " Keep mgr netmail %s\n", getboolean(CFG.ct_KeepMgr));
fprintf(fp, " Local requests %s\n", getboolean(CFG.ct_LocalRep));
@@ -2150,8 +2150,8 @@ int global_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Default max msgs %d\n", CFG.defmsgs);
fprintf(fp, " Default days %d\n", CFG.defdays);
fprintf(fp, " Reject older then %d days\n", CFG.toss_old);
fprintf(fp, " Maximum systems %ld\n", CFG.toss_systems);
fprintf(fp, " Maximum groups %ld\n", CFG.toss_groups);
fprintf(fp, " Maximum systems %d\n", CFG.toss_systems);
fprintf(fp, " Maximum groups %d\n", CFG.toss_groups);
fprintf(fp, " Use 4d addressing %s\n", getboolean(CFG.addr4d));
fprintf(fp, " AreaMgr: allow +%%* %s\n", getboolean(CFG.ca_PlusAll));
fprintf(fp, " AreaMgr: notify %s\n", getboolean(CFG.ca_Notify));
@@ -2223,7 +2223,7 @@ int global_doc(FILE *fp, FILE *toc, int page)
addtoc(fp, toc, 1, 14, page, (char *)"Newfile reports");
fprintf(fp, " New files days %d\n", CFG.newdays);
fprintf(fp, " Highest sec. level %s\n", get_secstr(CFG.security));
fprintf(fp, " Max. newfile grps %ld\n", CFG.new_groups);
fprintf(fp, " Max. newfile grps %d\n", CFG.new_groups);
fprintf(fp, " WWW logfile %s\n", CFG.www_logfile);
fprintf(fp, " FTP logfile %s\n", CFG.ftp_logfile);
fprintf(wp, "</TBODY>\n");
@@ -2260,11 +2260,11 @@ int global_doc(FILE *fp, FILE *toc, int page)
p = getloglevel(CFG.cico_loglevel);
fprintf(fp, " Mailer loglevel %s\n", p);
free(p);
fprintf(fp, " Res. modem timeout %ld\n", CFG.timeoutreset);
fprintf(fp, " Connect timeout %ld\n", CFG.timeoutconnect);
fprintf(fp, " Random dialdelay %ld\n", CFG.dialdelay);
fprintf(fp, " Res. modem timeout %d\n", CFG.timeoutreset);
fprintf(fp, " Connect timeout %d\n", CFG.timeoutconnect);
fprintf(fp, " Random dialdelay %d\n", CFG.dialdelay);
fprintf(fp, " TCP/IP phone nr. %s\n", CFG.IP_Phone);
fprintf(fp, " TCP/IP speed %lu\n", CFG.IP_Speed);
fprintf(fp, " TCP/IP speed %u\n", CFG.IP_Speed);
fprintf(fp, " TCP/IP flags %s\n", CFG.IP_Flags);
fprintf(fp, " No Filerequests %s\n", getboolean(CFG.NoFreqs));
fprintf(fp, " No Calls %s\n", getboolean(CFG.NoCall));

View File

@@ -97,7 +97,7 @@ int OpenHatch(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
int FieldPatch = FALSE;
snprintf(fnin, PATH_MAX, "%s/etc/hatch.data", getenv("MBSE_ROOT"));
@@ -332,8 +332,8 @@ int EditHatchRec(int Area)
FILE *fil;
char mfile[PATH_MAX];
static char *tmp = NULL;
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
int i, All;
clr_index();
@@ -456,7 +456,7 @@ void EditHatch(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -86,7 +86,7 @@ int OpenIBC(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/ibcsrv.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/ibcsrv.temp", getenv("MBSE_ROOT"));
@@ -202,9 +202,9 @@ int EditIBCRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -289,7 +289,7 @@ void EditIBC(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -114,7 +114,7 @@ int OpenLanguage(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/language.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/language.temp", getenv("MBSE_ROOT"));
@@ -249,11 +249,11 @@ void s_lang(void)
*/
int EditLangRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int j;
unsigned long crc, crc1;
FILE *fil;
char mfile[PATH_MAX];
int offset;
int j;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -332,7 +332,7 @@ void EditLanguage(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -420,7 +420,7 @@ int PickLanguage(char *nr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();

View File

@@ -151,7 +151,7 @@ int OpenLimits(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/limits.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/limits.temp", getenv("MBSE_ROOT"));
@@ -215,7 +215,7 @@ void CloseLimits(int force)
while (fread(&LIMIT, LIMIThdr.recsize, 1, fi) == 1)
if (!LIMIT.Deleted) {
snprintf(temp, 20, "%014ld", LIMIT.Security);
snprintf(temp, 20, "%014d", LIMIT.Security);
fill_stlist(&lim, temp, ftell(fi) - LIMIThdr.recsize);
}
sort_stlist(&lim);
@@ -269,9 +269,9 @@ int EditLimRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -356,7 +356,7 @@ void EditLimits(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -401,7 +401,7 @@ void EditLimits(void)
set_color(CYAN, BLACK);
else
set_color(LIGHTBLUE, BLACK);
snprintf(temp, 81, "%3d. %-6ld %-40s", i, LIMIT.Security, LIMIT.Description);
snprintf(temp, 81, "%3d. %-6d %-40s", i, LIMIT.Security, LIMIT.Description);
temp[37] = '\0';
mbse_mvprintw(y, x, temp);
y++;
@@ -448,7 +448,7 @@ char *PickLimits(int nr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
@@ -489,7 +489,7 @@ char *PickLimits(int nr)
set_color(CYAN, BLACK);
else
set_color(LIGHTBLUE, BLACK);
snprintf(temp, 81, "%3d. %-6ld %-40s", i, LIMIT.Security, LIMIT.Description);
snprintf(temp, 81, "%3d. %-6d %-40s", i, LIMIT.Security, LIMIT.Description);
temp[37] = '\0';
mbse_mvprintw(y, x, temp);
y++;
@@ -500,7 +500,7 @@ char *PickLimits(int nr)
offset = sizeof(LIMIThdr) + ((atoi(pick) - 1) * LIMIThdr.recsize);
fseek(fil, offset, 0);
fread(&LIMIT, LIMIThdr.recsize, 1, fil);
snprintf(Lim, 21, "%ld", LIMIT.Security);
snprintf(Lim, 21, "%d", LIMIT.Security);
}
fclose(fil);
}
@@ -563,9 +563,9 @@ int bbs_limits_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " ------ ------ ------ ------ ------ ------------------------------\n");
while ((fread(&LIMIT, LIMIThdr.recsize, 1, no)) == 1) {
fprintf(fp, " %6ld %6ld %6ld %6d %s %s\n",
fprintf(fp, " %6d %6d %6d %6d %s %s\n",
LIMIT.Security, LIMIT.Time, LIMIT.DownK, LIMIT.DownF, getboolean(LIMIT.Available), LIMIT.Description);
fprintf(ip, "<TR><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%d</TD><TD>%s</TD><TD>%s</TD></TR>\n",
fprintf(ip, "<TR><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%s</TD><TD>%s</TD></TR>\n",
LIMIT.Security, LIMIT.Time, LIMIT.DownK, LIMIT.DownF, getboolean(LIMIT.Available), LIMIT.Description);
}
@@ -589,7 +589,7 @@ int bbs_limits_doc(FILE *fp, FILE *toc, int page)
while (fread(&usrconfig, usrconfighdr.recsize, 1, up) == 1) {
nr++;
if (strlen(usrconfig.sUserName) && (usrconfig.Security.level == LIMIT.Security)) {
fprintf(ip, "<TR><TD>%ld</TD><TD><A HREF=\"user_%d.html\">%s</A></TD><TD>%s</TD></TR>\n",
fprintf(ip, "<TR><TD>%d</TD><TD><A HREF=\"user_%d.html\">%s</A></TD><TD>%s</TD></TR>\n",
LIMIT.Security, nr, usrconfig.sUserName, usrconfig.sLocation);
}
}

View File

@@ -87,7 +87,7 @@ int OpenMagics(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
int FieldPatch = FALSE;
snprintf(fnin, PATH_MAX, "%s/etc/magic.data", getenv("MBSE_ROOT"));
@@ -281,9 +281,9 @@ int EditMagicRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j, choices;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -386,7 +386,7 @@ void EditMagics(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -44,7 +44,7 @@
int MsgUpdated = 0;
unsigned long MsgCrc;
unsigned int MsgCrc;
FILE *tfil = NULL;
extern int exp_golded;
int MailForced = FALSE;
@@ -176,7 +176,7 @@ int OpenMsgarea(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize, oldsys;
int oldsize, oldsys;
struct _sysconnect syscon;
int i, oldsystems;
time_t start = 900000000; /* Faked startdate of 09-07-1998 17:00:00 */
@@ -427,7 +427,7 @@ int EditConnections(FILE *);
int EditConnections(FILE *fil)
{
int systems, o = 0, i, y, x;
long offset;
int offset;
char pick[12];
sysconnect System;
char status[5];
@@ -554,12 +554,12 @@ void SetScreen()
long LoadMsgRec(int, int);
long LoadMsgRec(int Area, int work)
int LoadMsgRec(int, int);
int LoadMsgRec(int Area, int work)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
sysconnect System;
int i;
@@ -603,7 +603,7 @@ int SaveMsgRec(int Area, int work)
{
int i;
FILE *fil;
long offset;
int offset;
char mfile[PATH_MAX];
sysconnect System;
@@ -708,7 +708,7 @@ void MsgGlobal(void)
fidoaddr a1, a2;
int menu = 0, marea, Areas, akan = 0, Found, charset = FTNC_CP437;
int Total, Done, netbrd, daysold, maxmsgs, maxarticles;
long offset;
int offset;
securityrec rs, ws, ss, as;
sysconnect S, Sc;
@@ -1085,7 +1085,7 @@ void MsgGlobal(void)
int EditMsgRec(int);
int EditMsgRec(int Area)
{
unsigned long crc1;
unsigned int crc1;
int tmp, i, connections = 0, changed = FALSE, Active, Forced = FALSE;
sysconnect System;
char *temp, oldpath[81];
@@ -1411,7 +1411,7 @@ void EditMsgarea(void)
int records, rc, i, o, y, from, too;
char pick[12], temp[PATH_MAX];
FILE *fil;
long offset;
int offset;
sysconnect System;
clr_index();
@@ -1577,7 +1577,7 @@ char *PickMsgarea(char *shdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
static char Buf[81];
clr_index();
@@ -1842,7 +1842,7 @@ int mail_area_doc(FILE *fp, FILE *toc, int page)
int i = 0, j, k, systems, refs, First = TRUE, LMiy;
sysconnect System;
struct tm *t;
time_t Now;
time_t Now, tt;
Now = time(NULL);
t = localtime(&Now);
@@ -1921,9 +1921,12 @@ int mail_area_doc(FILE *fp, FILE *toc, int page)
add_webtable(wp, (char *)"Append quotes", getboolean(msgs.Quotes));
add_webtable(wp, (char *)"Nodes mandatory", getboolean(msgs.Mandatory));
add_webtable(wp, (char *)"UnSecure toss", getboolean(msgs.UnSecure));
add_webtable(wp, (char *)"Last msg rcvd", ctime(&msgs.LastRcvd));
add_webtable(wp, (char *)"Last msg posted", ctime(&msgs.LastPosted));
add_webtable(wp, (char *)"Area created at", ctime(&msgs.Created));
tt = (time_t)msgs.LastRcvd;
add_webtable(wp, (char *)"Last msg rcvd", ctime(&tt));
tt = (time_t)msgs.LastPosted;
add_webtable(wp, (char *)"Last msg posted", ctime(&tt));
tt = (time_t)msgs.Created;
add_webtable(wp, (char *)"Area created at", ctime(&tt));
fprintf(wp, "</TBODY>\n");
fprintf(wp, "</TABLE>\n");
fprintf(wp, "<HR>\n");
@@ -1959,9 +1962,12 @@ int mail_area_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Append quotes %s\n", getboolean(msgs.Quotes));
fprintf(fp, " Nodes mandatory %s\n", getboolean(msgs.Mandatory));
fprintf(fp, " UnSecure toss %s\n", getboolean(msgs.UnSecure));
fprintf(fp, " Last msg rcvd. %s", ctime(&msgs.LastRcvd));
fprintf(fp, " Last msg posted %s", ctime(&msgs.LastPosted));
fprintf(fp, " Area created at %s", ctime(&msgs.Created));
tt = (time_t)msgs.LastRcvd;
fprintf(fp, " Last msg rcvd. %s", ctime(&tt));
tt = (time_t)msgs.LastPosted;
fprintf(fp, " Last msg posted %s", ctime(&tt));
tt = (time_t)msgs.Created;
fprintf(fp, " Area created at %s", ctime(&tt));
refs = 0;
for (j = 0; j < systems; j++) {
@@ -2026,8 +2032,8 @@ int mail_area_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, "\n");
fprintf(fp, " Total This Month Last Month\n");
fprintf(fp, " ---------- ---------- ----------\n");
fprintf(fp, " Msgs received %-10ld %-10ld %-10ld\n", msgs.Received.total, msgs.Received.month[Miy], msgs.Received.month[LMiy]);
fprintf(fp, " Msgs posted %-10ld %-10ld %-10ld\n", msgs.Posted.total, msgs.Posted.month[Miy], msgs.Posted.month[LMiy]);
fprintf(fp, " Msgs received %-10d %-10d %-10d\n", msgs.Received.total, msgs.Received.month[Miy], msgs.Received.month[LMiy]);
fprintf(fp, " Msgs posted %-10d %-10d %-10d\n", msgs.Posted.total, msgs.Posted.month[Miy], msgs.Posted.month[LMiy]);
} else
fseek(no, msgshdr.syssize, SEEK_CUR);

View File

@@ -308,8 +308,8 @@ void EditMenu(char *Name)
char mtemp[PATH_MAX], temp[PATH_MAX], pick[12];
FILE *fil, *tmp;
int records = 0, i, o, y, MenuUpdated = FALSE, from, too;
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
struct menufile tmenus;
clr_index();

View File

@@ -100,7 +100,7 @@ int OpenMGroup(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX], temp[13];
long oldsize;
int oldsize;
int i;
snprintf(fnin, PATH_MAX, "%s/etc/mgroups.data", getenv("MBSE_ROOT"));
@@ -301,9 +301,9 @@ int EditMGrpRec(int Area)
{
FILE *fil;
static char mfile[PATH_MAX], temp[13];
static long offset;
static int offset;
static int i, j, tmp;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -442,7 +442,7 @@ void EditMGroup(void)
int records, i, o, x, y;
char pick[12], temp[PATH_MAX];
FILE *fil;
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -556,7 +556,7 @@ char *PickMGroup(char *shdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
@@ -642,6 +642,7 @@ int mail_group_doc(FILE *fp, FILE *toc, int page)
char temp[PATH_MAX], group[13];
FILE *ti, *wp, *ip, *no;
int refs, i, j;
time_t tt;
snprintf(temp, PATH_MAX, "%s/etc/mgroups.data", getenv("MBSE_ROOT"));
if ((no = fopen(temp, "r")) == NULL)
@@ -697,8 +698,10 @@ int mail_group_doc(FILE *fp, FILE *toc, int page)
add_webtable(wp, (char *)"Auto add/del areas", getboolean(mgroup.AutoChange));
add_webtable(wp, (char *)"User add/del areas", getboolean(mgroup.UserChange));
add_webtable(wp, (char *)"Default charset", getftnchrs(mgroup.Charset));
add_webtable(wp, (char *)"Start area date", ctime(&mgroup.StartDate));
add_webtable(wp, (char *)"Last active date", ctime(&mgroup.LastDate));
tt = (time_t)mgroup.StartDate;
add_webtable(wp, (char *)"Start area date", ctime(&tt));
tt = (time_t)mgroup.LastDate;
add_webtable(wp, (char *)"Last active date", ctime(&tt));
fprintf(wp, "</TBODY>\n");
fprintf(wp, "</TABLE>\n");
fprintf(wp, "<HR>\n");
@@ -790,8 +793,10 @@ int mail_group_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Auto add/del areas %s\n", getboolean(mgroup.AutoChange));
fprintf(fp, " User add/del areas %s\n", getboolean(mgroup.UserChange));
fprintf(fp, " Default charset %s\n", getftnchrs(mgroup.Charset));
fprintf(fp, " Start area date %s", ctime(&mgroup.StartDate));
fprintf(fp, " Last active date %s\n", ctime(&mgroup.LastDate));
tt = (time_t)mgroup.StartDate;
fprintf(fp, " Start area date %s", ctime(&tt));
tt = (time_t)mgroup.LastDate;
fprintf(fp, " Last active date %s\n", ctime(&tt));
fprintf(fp, "\n\n");
j++;
}

View File

@@ -167,7 +167,7 @@ int OpenModem(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/modem.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/modem.temp", getenv("MBSE_ROOT"));
@@ -401,9 +401,9 @@ int EditModemRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -505,7 +505,7 @@ void EditModem(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -597,7 +597,7 @@ char *PickModem(char *shdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
static char buf[31];
clr_index();

View File

@@ -107,9 +107,9 @@ int OpenNewfiles(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
int i, old_groups;
long oldgroup;
int oldgroup;
char group[13];
snprintf(fnin, PATH_MAX, "%s/etc/newfiles.data", getenv("MBSE_ROOT"));
@@ -293,8 +293,8 @@ int EditNewRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX], temp1[2];
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
gr_list *fgr = NULL, *tmp;
char group[13];
int groups, i, j, GrpChanged = FALSE;
@@ -435,7 +435,7 @@ void EditNewfiles(void)
int records, i, o, x, y;
char pick[12], temp[PATH_MAX];
FILE *fil;
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -98,7 +98,7 @@ int OpenNGroup(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/ngroups.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/ngroups.temp", getenv("MBSE_ROOT"));
@@ -235,9 +235,9 @@ int EditNGrpRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -307,7 +307,7 @@ void EditNGroup(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -413,7 +413,7 @@ char *PickNGroup(char *shdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();

View File

@@ -93,7 +93,7 @@ int OpenNoderec(void)
FILE *fin, *fout;
char *fnin, *fnout, group[13];
int i, old_fgroups, old_mgroups;
long oldsize, oldfilegrp, oldmailgrp;
int oldsize, oldfilegrp, oldmailgrp;
fnin = calloc(PATH_MAX, sizeof(char));
fnout = calloc(PATH_MAX, sizeof(char));
@@ -211,7 +211,7 @@ void CloseNoderec(int Force)
FILE *fi, *fo;
int i;
st_list *nod = NULL, *tmp;
unsigned long crc1, crc2;
unsigned int crc1, crc2;
fin = calloc(PATH_MAX, sizeof(char));
fout = calloc(PATH_MAX, sizeof(char));
@@ -1025,8 +1025,8 @@ int EditNodeRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
gr_list *fgr = NULL, *egr = NULL, *tmp;
char group[13];
int groups, i, j, GrpChanged = FALSE;
@@ -1204,7 +1204,7 @@ void EditNodes(void)
int records, i, o, x, y;
char pick[12], temp[PATH_MAX];
FILE *fil;
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -1321,7 +1321,7 @@ fidoaddr PullUplink(char *Hdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
memset(&uplink, 0, sizeof(uplink));
clr_index();
@@ -1441,6 +1441,7 @@ int node_doc(FILE *fp, FILE *toc, int page)
int systems, groups, nr, refs, i, j, k, First = TRUE;
char group[13];
sysconnect System;
time_t tt;
snprintf(temp, PATH_MAX, "%s/etc/nodes.data", getenv("MBSE_ROOT"));
if ((no = fopen(temp, "r")) == NULL)
@@ -1485,10 +1486,12 @@ int node_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Outbox dir %s\n", nodes.OutBox);
add_webtable(wp, (char *)"Outbox directory", nodes.OutBox);
}
fprintf(fp, " First date %s", ctime(&nodes.StartDate));
add_webtable(wp, (char *)"First date", ctime(&nodes.StartDate));
fprintf(fp, " Last date %s", ctime(&nodes.LastDate));
add_webtable(wp, (char *)"Last date", ctime(&nodes.LastDate));
tt = (time_t)nodes.StartDate;
fprintf(fp, " First date %s", ctime(&tt));
add_webtable(wp, (char *)"First date", ctime(&tt));
tt = (time_t)nodes.LastDate;
fprintf(fp, " Last date %s", ctime(&tt));
add_webtable(wp, (char *)"Last date", ctime(&tt));
for (i = 0; i < 20; i++)
if (nodes.Aka[i].zone) {
fprintf(fp, " Aka %2d %s\n", i+1, aka2str(nodes.Aka[i]));
@@ -1656,9 +1659,9 @@ int node_doc(FILE *fp, FILE *toc, int page)
add_statcnt(wp, (char *)"sent messages", nodes.MailSent);
fprintf(fp, " Statistics Send KBytes Received KBytes\n");
fprintf(fp, " ------------ -------- -------- -------- --------\n");
fprintf(fp, " Total files %-8lu %-8lu %-8lu %-8lu\n", nodes.FilesSent.total, nodes.F_KbSent.total,
fprintf(fp, " Total files %-8u %-8u %-8u %-8u\n", nodes.FilesSent.total, nodes.F_KbSent.total,
nodes.FilesRcvd.total, nodes.F_KbSent.total);
fprintf(fp, " Total mail %-8lu %-8lu\n\n", nodes.MailSent.total, nodes.MailRcvd.total);
fprintf(fp, " Total mail %-8u %-8u\n\n", nodes.MailSent.total, nodes.MailRcvd.total);
fprintf(wp, "<HR>\n");
fprintf(wp, "<H3>Private data</H3>\n");

View File

@@ -120,7 +120,7 @@ int OpenOneline(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/oneline.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/oneline.temp", getenv("MBSE_ROOT"));
@@ -216,9 +216,9 @@ int EditOnelRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -294,7 +294,7 @@ void EditOneline(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -179,7 +179,7 @@ int OpenProtocol(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX], newkey = 'A', *usedkeys;
long oldsize;
int oldsize;
int AddInt = TRUE;
snprintf(fnin, PATH_MAX, "%s/etc/protocol.data", getenv("MBSE_ROOT"));
@@ -394,9 +394,9 @@ int EditProtRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -508,7 +508,7 @@ void EditProtocol(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -611,7 +611,7 @@ char *PickProtocol(int nr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -91,7 +91,7 @@ int OpenRoute(void)
{
FILE *fin, *fout;
char *fnin, *fnout;
long oldsize;
int oldsize;
fnin = calloc(PATH_MAX, sizeof(char));
fnout = calloc(PATH_MAX, sizeof(char));
@@ -310,8 +310,8 @@ int EditRouteRec(int Area)
{
FILE *fil;
char *mfile, newmask[25];
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
int i;
clr_index();
@@ -409,7 +409,7 @@ void EditRoute(void)
int records, i, o, x, y;
char pick[12], *temp;
FILE *fil;
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -110,7 +110,7 @@ int OpenService(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/service.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/service.temp", getenv("MBSE_ROOT"));
@@ -242,8 +242,8 @@ int EditServiceRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
unsigned long crc, crc1;
int offset;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -313,7 +313,7 @@ void EditService(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -38,7 +38,7 @@
struct taskrec TCFG;
unsigned long crc1, crc2;
unsigned int crc1, crc2;

View File

@@ -44,7 +44,7 @@
int TicUpdated = 0;
unsigned long TicCrc;
unsigned int TicCrc;
FILE *ttfil = NULL;
@@ -96,7 +96,7 @@ int OpenTicarea(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize, oldsys;
int oldsize, oldsys;
struct _sysconnect syscon;
int i, oldsystems;
@@ -333,7 +333,7 @@ int EditTicConnections(FILE *);
int EditTicConnections(FILE *fil)
{
int systems, o = 0, i, y, x;
long offset;
int offset;
char pick[12];
sysconnect System;
char status[4];
@@ -446,12 +446,12 @@ void SetTicScreen(void)
long LoadTicRec(int, int);
long LoadTicRec(int Area, int work)
int LoadTicRec(int, int);
int LoadTicRec(int Area, int work)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
sysconnect System;
int i;
@@ -496,7 +496,7 @@ int SaveTicRec(int Area, int work)
{
int i;
FILE *fil;
long offset;
int offset;
char mfile[PATH_MAX];
sysconnect System;
@@ -557,7 +557,7 @@ void TicGlobal(void)
fidoaddr a1, a2;
int menu = 0, areanr, Areas, akan = 0, Found;
int Total, Done;
long offset;
int offset;
sysconnect S, Sc;
securityrec as;
@@ -811,7 +811,7 @@ void TicGlobal(void)
int EditTicRec(int);
int EditTicRec(int Area)
{
unsigned long crc1;
unsigned int crc1;
int tmp, i, connections = 0, changed = FALSE;
sysconnect System;
char *temp;
@@ -833,11 +833,11 @@ int EditTicRec(int Area)
fread(&areahdr, sizeof(areahdr), 1, fp);
fseek(fp, ((tic.FileArea - 1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET);
fread(&area, areahdr.recsize, 1, fp);
snprintf(temp, 81, "%ld: %s", tic.FileArea, area.Name);
snprintf(temp, 81, "%d: %s", tic.FileArea, area.Name);
temp[24] = '\0';
fclose(fp);
} else {
snprintf(temp, 81, "%ld", tic.FileArea);
snprintf(temp, 81, "%d", tic.FileArea);
}
set_color(WHITE, BLACK);
@@ -1001,7 +1001,7 @@ void EditTicarea(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -1113,7 +1113,7 @@ char *PickTicarea(char *shdr)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
static char Buf[81];
clr_index();
@@ -1312,7 +1312,7 @@ int tic_areas_doc(FILE *fp, FILE *toc, int page)
fread(&areahdr, sizeof(areahdr), 1, ti);
fseek(ti, areahdr.hdrsize + (areahdr.recsize * (tic.FileArea -1)), SEEK_SET);
if (fread(&area, areahdr.recsize, 1, ti) == 1) {
fprintf(wp, "<TR><TH align='left'>BBS area</TH><TD>%ld <A HREF=\"filearea_%ld.html\">%s</A></TD></TR>\n",
fprintf(wp, "<TR><TH align='left'>BBS area</TH><TD>%d <A HREF=\"filearea_%d.html\">%s</A></TD></TR>\n",
tic.FileArea, tic.FileArea, area.Name);
}
fclose(ti);
@@ -1351,7 +1351,7 @@ int tic_areas_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Area tag %s\n", tic.Name);
fprintf(fp, " Active %s\n", getboolean(tic.Active));
fprintf(fp, " Comment %s\n", tic.Comment);
fprintf(fp, " BBS area %ld\n", tic.FileArea);
fprintf(fp, " BBS area %d\n", tic.FileArea);
fprintf(fp, " Message %s\n", tic.Message);
fprintf(fp, " Group %s\n", tic.Group);
fprintf(fp, " Keep Numbe %d\n", tic.KeepLatest);

View File

@@ -195,7 +195,7 @@ int OpenTtyinfo(void)
{
FILE *fin, *fout;
char *fnin, *fnout;
long oldsize;
int oldsize;
fnin = calloc(PATH_MAX, sizeof(char));
fnout = calloc(PATH_MAX, sizeof(char));
@@ -363,9 +363,9 @@ int EditTtyRec(int Area)
{
FILE *fil;
char *mfile;
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -483,7 +483,7 @@ void EditTtyinfo(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -657,7 +657,7 @@ int tty_doc(FILE *fp, FILE *toc, int page)
fprintf(fp, " Honor ZMH %s\n", getboolean(ttyinfo.honor_zmh));
fprintf(fp, " Callout %s\n", getboolean(ttyinfo.callout));
fprintf(fp, " Modem type %s\n", ttyinfo.modem);
fprintf(fp, " Locked speed %ld\n", ttyinfo.portspeed);
fprintf(fp, " Locked speed %d\n", ttyinfo.portspeed);
fprintf(fp, " EMSI name %s\n", ttyinfo.name);
fprintf(fp, "\n\n");
j++;

View File

@@ -92,7 +92,7 @@ int OpenUsers(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/users.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/users.temp", getenv("MBSE_ROOT"));
@@ -480,9 +480,9 @@ int EditUsrRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j = 0;
unsigned long crc, crc1, level;
unsigned int crc, crc1, level;
clr_index();
working(1, 0, 0);
@@ -574,7 +574,7 @@ void EditUsers(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);
@@ -681,6 +681,7 @@ void users_doc(void)
char temp[PATH_MAX];
FILE *wp, *ip, *fp;
int nr = 0;
time_t tt;
snprintf(temp, PATH_MAX, "%s/etc/users.data", getenv("MBSE_ROOT"));
if ((fp = fopen(temp, "r")) == NULL)
@@ -707,9 +708,12 @@ void users_doc(void)
web_secflags(wp, (char *)"Security level", usrconfig.Security);
add_webtable(wp, (char *)"Expiry date", usrconfig.sExpiryDate);
web_secflags(wp, (char *)"Expiry security level", usrconfig.ExpirySec);
add_webtable(wp, (char *)"First login date", ctime(&usrconfig.tFirstLoginDate));
add_webtable(wp, (char *)"Last login date", ctime(&usrconfig.tLastLoginDate));
add_webtable(wp, (char *)"Last password change", ctime(&usrconfig.tLastPwdChange));
tt = (time_t)usrconfig.tFirstLoginDate;
add_webtable(wp, (char *)"First login date", ctime(&tt));
tt = (time_t)usrconfig.tLastLoginDate;
add_webtable(wp, (char *)"Last login date", ctime(&tt));
tt = (time_t)usrconfig.tLastPwdChange;
add_webtable(wp, (char *)"Last password change", ctime(&tt));
add_webdigit(wp, (char *)"Credit", usrconfig.Credit);
add_webtable(wp, (char *)"Hidden from lists", getboolean(usrconfig.Hidden));
add_webtable(wp, (char *)"Never delete", getboolean(usrconfig.NeverDelete));

View File

@@ -139,7 +139,7 @@ int OpenVirus(void)
{
FILE *fin, *fout;
char fnin[PATH_MAX], fnout[PATH_MAX];
long oldsize;
int oldsize;
snprintf(fnin, PATH_MAX, "%s/etc/virscan.data", getenv("MBSE_ROOT"));
snprintf(fnout, PATH_MAX, "%s/etc/virscan.temp", getenv("MBSE_ROOT"));
@@ -254,9 +254,9 @@ int EditVirRec(int Area)
{
FILE *fil;
char mfile[PATH_MAX];
long offset;
int offset;
int j;
unsigned long crc, crc1;
unsigned int crc, crc1;
clr_index();
working(1, 0, 0);
@@ -338,7 +338,7 @@ void EditVirus(void)
char pick[12];
FILE *fil;
char temp[PATH_MAX];
long offset;
int offset;
clr_index();
working(1, 0, 0);

View File

@@ -244,8 +244,8 @@ void add_statcnt(FILE *fp, char * hstr, statcnt st)
fprintf(fp, "<TBODY>\n");
fprintf(fp, "<TR><TH colspan='9'>Weekdays overview of %s</TH></TR>\n", hstr);
fprintf(fp, "<TR><TH>&nbsp;</TH><TH align='left'>Sun</TH><TH align='left'>Mon</TH><TH align='left'>Tue</TH><TH align='left'>Wed</TH><TH align='left'>Thu</TH><TH align='left'>Fri</TH><TH align='left'>Sat</TH><TH align='left'>Total</TH></TR>\n");
fprintf(fp, "<TR><TH align='left'>This week</TH><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD></TR>\n", st.tdow[0], st.tdow[1], st.tdow[2], st.tdow[3], st.tdow[4], st.tdow[5], st.tdow[6], st.tweek);
fprintf(fp, "<TR><TH align='left'>Last week</TH><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD></TR>\n", st.ldow[0], st.ldow[1], st.ldow[2], st.ldow[3], st.ldow[4], st.ldow[5], st.ldow[6], st.lweek);
fprintf(fp, "<TR><TH align='left'>This week</TH><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD></TR>\n", st.tdow[0], st.tdow[1], st.tdow[2], st.tdow[3], st.tdow[4], st.tdow[5], st.tdow[6], st.tweek);
fprintf(fp, "<TR><TH align='left'>Last week</TH><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD></TR>\n", st.ldow[0], st.ldow[1], st.ldow[2], st.ldow[3], st.ldow[4], st.ldow[5], st.ldow[6], st.lweek);
fprintf(fp, "</TBODY>\n");
fprintf(fp, "</TABLE>\n");
fprintf(fp, "<P>\n");
@@ -253,7 +253,7 @@ void add_statcnt(FILE *fp, char * hstr, statcnt st)
fprintf(fp, "<TBODY>\n");
fprintf(fp, "<TR><TH colspan='12'>Monthly overview of %s</TH><TH align='left' rowspan='2'>Total ever</TH></TR>\n", hstr);
fprintf(fp, "<TR><TH align='left'>Jan</TH><TH align='left'>Feb</TH><TH align='left'>Mar</TH><TH align='left'>Apr</TH><TH align='left'>May</TH><TH align='left'>Jun</TH><TH align='left'>Jul</TH><TH align='left'>Aug</TH><TH align='left'>Sep</TH><TH align='left'>Oct</TH><TH align='left'>Nov</TH><TH align='left'>Dec</TH></TR>\n");
fprintf(fp, "<TR><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD><TD>%ld</TD></TR>\n",
fprintf(fp, "<TR><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD><TD>%d</TD></TR>\n",
st.month[0], st.month[1], st.month[2], st.month[3], st.month[4], st.month[5], st.month[6], st.month[7], st.month[8], st.month[0], st.month[10], st.month[11], st.total);
fprintf(fp, "</TBODY>\n");
fprintf(fp, "</TABLE>\n");

View File

@@ -53,7 +53,7 @@ void tidy_stlist(st_list ** fdp)
/*
* Add a string to the array
*/
void fill_stlist(st_list **fdp, char *stringname, long pos)
void fill_stlist(st_list **fdp, char *stringname, int pos)
{
st_list *tmp;

View File

@@ -1,15 +1,17 @@
#ifndef _STLIST_H
#define _STLIST_H
/* $Id$ */
typedef struct _st_list {
struct _st_list *next;
char string[81];
long pos;
int pos;
} st_list;
void tidy_stlist(st_list **);
void fill_stlist(st_list **, char *, long);
void fill_stlist(st_list **, char *, int);
void sort_stlist(st_list **);