bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Michiel Broek 2005-08-19 19:46:55 +00:00
parent 829514d215
commit ccc8390ad3
6 changed files with 474 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -8,6 +8,15 @@ v0.71.5 18-Aug-2005
mbdiff: mbdiff:
Code cleanup. Code cleanup.
mball:
Code cleanup.
mbstat:
Code cleanup.
mbuser:
Code cleanup.
v0.71.4 12-Aug-2005 - 18-Aug-2005 v0.71.4 12-Aug-2005 - 18-Aug-2005

2
mbfido/mbdiff.c
View File

@ -438,7 +438,7 @@ void Help(void)
printf(" directory.\n"); printf(" directory.\n");
mbse_colour(LIGHTBLUE, BLACK); mbse_colour(LIGHTBLUE, BLACK);
printf("\n Options are:\n\n"); printf("\n Options are:\n\n");
mbse_colour(CYAN, BLAKC); mbse_colour(CYAN, BLACK);
printf(" -quiet Quiet mode\n"); printf(" -quiet Quiet mode\n");
mbse_colour(LIGHTGRAY, BLACK); mbse_colour(LIGHTGRAY, BLACK);
printf("\n"); printf("\n");

5
mbutils/dlcount.c
View File

@ -41,6 +41,7 @@ static char *months[]={(char *)"Jan",(char *)"Feb",(char *)"Mar",
void count_download(char *, time_t, off_t, char *); void count_download(char *, time_t, off_t, char *);
extern int do_quiet;
void dlcount(void) void dlcount(void)
@ -84,6 +85,8 @@ void dlcount(void)
/* /*
* Check apache logfile * Check apache logfile
*/ */
if (!do_quiet)
printf("Checking WWW downloads\n");
Syslog('+', "Checking WWW downloads"); Syslog('+', "Checking WWW downloads");
while (fgets(temp, PATH_MAX-1, fp)) { while (fgets(temp, PATH_MAX-1, fp)) {
@ -163,6 +166,8 @@ void dlcount(void)
/* /*
* Check apache logfile * Check apache logfile
*/ */
if (!do_quiet)
printf("Checking FTP downloads\n");
Syslog('+', "Checking FTP downloads"); Syslog('+', "Checking FTP downloads");
while (fgets(temp, PATH_MAX-1, fp)) { while (fgets(temp, PATH_MAX-1, fp)) {

33
mbutils/mball.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Creates allfiles listings * Purpose ...............: Creates allfiles listings
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2004 * Copyright (C) 1997-2005
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -52,9 +52,9 @@ void ProgName()
if (do_quiet) if (do_quiet)
return; return;
mbse_colour(15, 0); mbse_colour(WHITE, BLACK);
printf("\nMBALL: MBSE BBS %s Allfiles Listing Creator\n", VERSION); printf("\nMBALL: MBSE BBS %s Allfiles Listing Creator\n", VERSION);
mbse_colour(14, 0); mbse_colour(YELLOW, BLACK);
printf(" %s\n", COPYRIGHT); printf(" %s\n", COPYRIGHT);
} }
@ -95,7 +95,7 @@ void die(int onsig)
Syslog(' ', "MBALL finished in %s", t_elapsed(t_start, t_end)); Syslog(' ', "MBALL finished in %s", t_elapsed(t_start, t_end));
if (!do_quiet) { if (!do_quiet) {
mbse_colour(7, 0); mbse_colour(LIGHTGRAY, BLACK);
printf("\n"); printf("\n");
} }
ExitClient(onsig); ExitClient(onsig);
@ -108,18 +108,18 @@ void Help()
do_quiet = FALSE; do_quiet = FALSE;
ProgName(); ProgName();
mbse_colour(11, 0); mbse_colour(LIGHTCYAN, BLACK);
printf("\nUsage: mball [command] <options>\n\n"); printf("\nUsage: mball [command] <options>\n\n");
mbse_colour(9, 0); mbse_colour(LIGHTBLUE, BLACK);
printf(" Commands are:\n\n"); printf(" Commands are:\n\n");
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf(" l list Create allfiles and newfiles lists\n"); printf(" l list Create allfiles and newfiles lists\n");
mbse_colour(9, 0); mbse_colour(LIGHTBLUE, BLACK);
printf("\n Options are:\n\n"); printf("\n Options are:\n\n");
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf(" -q -quiet Quiet mode\n"); printf(" -q -quiet Quiet mode\n");
printf(" -z -zip Create .zip archives\n"); printf(" -z -zip Create .zip archives\n");
mbse_colour(7, 0); mbse_colour(LIGHTGRAY, BLACK);
printf("\n"); printf("\n");
die(MBERR_COMMANDLINE); die(MBERR_COMMANDLINE);
} }
@ -181,7 +181,7 @@ int main(int argc, char **argv)
free(cmd); free(cmd);
if (!do_quiet) { if (!do_quiet) {
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf("\n"); printf("\n");
} }
@ -273,10 +273,8 @@ void Masterlist()
FILE *fp, *np, *pAreas, *pHeader; FILE *fp, *np, *pAreas, *pHeader;
int AreaNr = 0, z, x = 0, New; int AreaNr = 0, z, x = 0, New;
unsigned long AllFiles = 0, AllKBytes = 0, NewFiles = 0, NewKBytes = 0; unsigned long AllFiles = 0, AllKBytes = 0, NewFiles = 0, NewKBytes = 0;
unsigned long AllAreaFiles, AllAreaBytes, popdown, down; unsigned long AllAreaFiles, AllAreaBytes, popdown, down, NewAreaFiles, NewAreaBytes;
unsigned long NewAreaFiles, NewAreaBytes; char *sAreas, temp[81], pop[81];
char *sAreas;
char temp[81], pop[81];
struct _fdbarea *fdb_area = NULL; struct _fdbarea *fdb_area = NULL;
sAreas = calloc(PATH_MAX, sizeof(char)); sAreas = calloc(PATH_MAX, sizeof(char));
@ -287,7 +285,7 @@ void Masterlist()
if(( pAreas = fopen (sAreas, "r")) == NULL) { if(( pAreas = fopen (sAreas, "r")) == NULL) {
WriteError("Can't open File Areas File: %s", sAreas); WriteError("Can't open File Areas File: %s", sAreas);
mbse_colour(7,0); mbse_colour(LIGHTGRAY, BLACK);
die(MBERR_GENERAL); die(MBERR_GENERAL);
} }
fread(&areahdr, sizeof(areahdr), 1, pAreas); fread(&areahdr, sizeof(areahdr), 1, pAreas);
@ -338,7 +336,7 @@ void Masterlist()
Nopper(); Nopper();
if ((fdb_area = mbsedb_OpenFDB(AreaNr, 30)) == 0) { if ((fdb_area = mbsedb_OpenFDB(AreaNr, 30)) == 0) {
WriteError("$Can't open Area %d (%s)! Skipping ...", AreaNr, area.Name); WriteError("Can't open Area %d (%s)! Skipping ...", AreaNr, area.Name);
} else { } else {
popdown = 0; popdown = 0;
while (fread(&fdb, fdbhdr.recsize, 1, fdb_area->fp) == 1) { while (fread(&fdb, fdbhdr.recsize, 1, fdb_area->fp) == 1) {
@ -507,6 +505,7 @@ void MakeArc()
if (!execute_str(cmd, (char *)"newfiles.zip newfiles.txt", (char *)NULL, (char *)"/dev/null", if (!execute_str(cmd, (char *)"newfiles.zip newfiles.txt", (char *)NULL, (char *)"/dev/null",
(char *)"/dev/null", (char *)"/dev/null") == 0) (char *)"/dev/null", (char *)"/dev/null") == 0)
WriteError("Create newfiles.zip failed"); WriteError("Create newfiles.zip failed");
free(cmd); free(cmd);
cmd = NULL; cmd = NULL;
} }

24
mbutils/mbstat.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: Change BBS status * Purpose ...............: Change BBS status
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2004 * Copyright (C) 1997-2005
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -44,20 +44,20 @@ void Help(void)
do_quiet = FALSE; do_quiet = FALSE;
ProgName(); ProgName();
mbse_colour(11, 0); mbse_colour(LIGHTCYAN, BLACK);
printf("\nUsage: mbstat [command] <options>\n\n"); printf("\nUsage: mbstat [command] <options>\n\n");
mbse_colour(9, 0); mbse_colour(LIGHTBLUE, BLACK);
printf(" Commands are:\n\n"); printf(" Commands are:\n\n");
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf(" c close Close the BBS for users\n"); printf(" c close Close the BBS for users\n");
printf(" o open Open the BBS for users\n"); printf(" o open Open the BBS for users\n");
printf(" s set semafore Set named semafore\n"); printf(" s set semafore Set named semafore\n");
printf(" w wait Wait until the BBS is free\n\n"); printf(" w wait Wait until the BBS is free\n\n");
mbse_colour(9,0); mbse_colour(LIGHTBLUE, BLACK);
printf(" Options are:\n\n"); printf(" Options are:\n\n");
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf(" -q -quiet Quiet, no screen output\n"); printf(" -q -quiet Quiet, no screen output\n");
mbse_colour(7, 0); mbse_colour(LIGHTGRAY, BLACK);
die(MBERR_COMMANDLINE); die(MBERR_COMMANDLINE);
} }
@ -68,11 +68,11 @@ void ProgName(void)
if (do_quiet) if (do_quiet)
return; return;
mbse_colour(15, 0); mbse_colour(WHITE, BLACK);
printf("\nMBSTAT: MBSE BBS %s Status Changer\n", VERSION); printf("\nMBSTAT: MBSE BBS %s Status Changer\n", VERSION);
mbse_colour(14, 0); mbse_colour(YELLOW, BLACK);
printf(" %s\n", COPYRIGHT); printf(" %s\n", COPYRIGHT);
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
} }
@ -85,7 +85,7 @@ void die(int onsig)
WriteError("Terminated on signal %d", onsig); WriteError("Terminated on signal %d", onsig);
if (!do_quiet) { if (!do_quiet) {
mbse_colour(7, 0); mbse_colour(LIGHTGRAY, BLACK);
printf("\n"); printf("\n");
} }
@ -155,7 +155,7 @@ int main(int argc, char **argv)
free(cmd); free(cmd);
if (!do_quiet) { if (!do_quiet) {
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf("\n"); printf("\n");
} }

47
mbutils/mbuser.c
View File

@ -4,7 +4,7 @@
* Purpose ...............: User Pack Util * Purpose ...............: User Pack Util
* *
***************************************************************************** *****************************************************************************
* Copyright (C) 1997-2004 * Copyright (C) 1997-2005
* *
* Michiel Broek FIDO: 2:280/2802 * Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10 * Beekmansbos 10
@ -111,7 +111,7 @@ int main(int argc, char **argv)
oldmask = umask(027); oldmask = umask(027);
if (!do_quiet) if (!do_quiet)
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
UserPack(Days, Level, pack); UserPack(Days, Level, pack);
umask(oldmask); umask(oldmask);
@ -120,7 +120,7 @@ int main(int argc, char **argv)
Syslog(' ', "MBUSER finished in %s", t_elapsed(t_start, t_end)); Syslog(' ', "MBUSER finished in %s", t_elapsed(t_start, t_end));
if (!do_quiet) if (!do_quiet)
mbse_colour(7, 0); mbse_colour(LIGHTGRAY, BLACK);
ExitClient(MBERR_OK); ExitClient(MBERR_OK);
return 0; return 0;
} }
@ -135,11 +135,11 @@ void ProgName(void)
if (do_quiet) if (do_quiet)
return; return;
mbse_colour(15, 0); mbse_colour(WHITE, BLACK);
printf("\nMBUSER: MBSE BBS %s - User maintenance utility\n", VERSION); printf("\nMBUSER: MBSE BBS %s - User maintenance utility\n", VERSION);
mbse_colour(14, 0); mbse_colour(YELLOW, BLACK);
printf(" %s\n\n", COPYRIGHT); printf(" %s\n\n", COPYRIGHT);
mbse_colour(7, 0); mbse_colour(LIGHTGRAY, BLACK);
} }
@ -149,19 +149,19 @@ void Help(void)
do_quiet = FALSE; do_quiet = FALSE;
ProgName(); ProgName();
mbse_colour(11, 0); mbse_colour(LIGHTCYAN, BLACK);
printf("\nUsage: mbuser [commands] <options>\n\n"); printf("\nUsage: mbuser [commands] <options>\n\n");
mbse_colour(9, 0); mbse_colour(LIGHTBLUE, BLACK);
printf(" Commands are:\n\n"); printf(" Commands are:\n\n");
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf(" kill [n] [l] Kill users not called in \"n\" days below level \"l\"\n"); printf(" kill [n] [l] Kill users not called in \"n\" days below level \"l\"\n");
printf(" pack Pack the userbase\n"); printf(" pack Pack the userbase\n");
mbse_colour(9, 0); mbse_colour(LIGHTBLUE, BLACK);
printf("\n Options are:\n\n"); printf("\n Options are:\n\n");
mbse_colour(3, 0); mbse_colour(CYAN, BLACK);
printf(" -quiet Quiet mode, (no screen output)\n\n"); printf(" -quiet Quiet mode, (no screen output)\n\n");
mbse_colour(7, 0); mbse_colour(LIGHTGRAY, BLACK);
printf("\n"); printf("\n");
ExitClient(MBERR_COMMANDLINE); ExitClient(MBERR_COMMANDLINE);
} }
@ -174,11 +174,10 @@ void Help(void)
void UserPack(int days, int level, int pack) void UserPack(int days, int level, int pack)
{ {
FILE *fin, *fout; FILE *fin, *fout;
char *fnin, *fnout; char *fnin, *fnout, *cmd;
long oldsize, curpos; long oldsize, curpos;
int updated, delete = 0, rc, highest = 0, record = 0, sysop = FALSE; int updated, delete = 0, rc, highest = 0, record = 0, sysop = FALSE;
time_t Last; time_t Last;
char *cmd;
fnin = calloc(PATH_MAX, sizeof(char)); fnin = calloc(PATH_MAX, sizeof(char));
fnout = calloc(PATH_MAX, sizeof(char)); fnout = calloc(PATH_MAX, sizeof(char));
@ -190,13 +189,13 @@ void UserPack(int days, int level, int pack)
* on a the copy. * on a the copy.
*/ */
if ((fin = fopen(fnin, "r")) == NULL) { if ((fin = fopen(fnin, "r")) == NULL) {
WriteError("Can't open %s", fnin); WriteError("$Can't open %s", fnin);
free(fnin); free(fnin);
free(fnout); free(fnout);
return; return;
} }
if ((fout = fopen(fnout, "w+")) == NULL) { if ((fout = fopen(fnout, "w+")) == NULL) {
WriteError("Can't create %s", fnout); WriteError("$Can't create %s", fnout);
fclose(fin); fclose(fin);
free(fnin); free(fnin);
free(fnout); free(fnout);
@ -257,7 +256,7 @@ void UserPack(int days, int level, int pack)
/* /*
* Handle packing for days below level * Handle packing for days below level
*/ */
if ((days) && (level)) { if (days && level) {
fseek(fout, sizeof(usrhdr), SEEK_SET); fseek(fout, sizeof(usrhdr), SEEK_SET);
curpos = sizeof(usrhdr); curpos = sizeof(usrhdr);
@ -272,11 +271,9 @@ void UserPack(int days, int level, int pack)
Last = usr.tLastLoginDate; Last = usr.tLastLoginDate;
/* /*
* Wow, killing on the second exact!. Don't kill * Wow, killing on the second exact!. Don't kill the guest accounts.
* the guest accounts.
*/ */
if ((((t_start - Last) / 86400) > days) && if ((((t_start - Last) / 86400) > days) && (usr.Security.level < level) && (!usr.Guest) &&
(usr.Security.level < level) && (!usr.Guest) &&
(usr.sUserName[0] != '\0') && (!usr.NeverDelete)) { (usr.sUserName[0] != '\0') && (!usr.NeverDelete)) {
Syslog('+', "Mark user %s", usr.sUserName); Syslog('+', "Mark user %s", usr.sUserName);
if (!do_quiet) { if (!do_quiet) {
@ -330,15 +327,13 @@ void UserPack(int days, int level, int pack)
#ifdef _VPOPMAIL_PATH #ifdef _VPOPMAIL_PATH
cmd = xstrcpy((char *)_VPOPMAIL_PATH); cmd = xstrcpy((char *)_VPOPMAIL_PATH);
cmd = xstrcat(cmd, (char *)"/vdeluser "); cmd = xstrcat(cmd, (char *)"/vdeluser ");
rc = execute_str(cmd, usr.Name, NULL, rc = execute_str(cmd, usr.Name, NULL, (char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
(char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
free(cmd); free(cmd);
#endif #endif
if (chdir(CFG.bbs_usersdir) == 0) { if (chdir(CFG.bbs_usersdir) == 0) {
cmd = xstrcpy((char *)"-Rf "); cmd = xstrcpy((char *)"-Rf ");
cmd = xstrcat(cmd, usr.Name); cmd = xstrcat(cmd, usr.Name);
rc = execute_pth((char *)"rm", cmd, rc = execute_pth((char *)"rm", cmd, (char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
(char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
free(cmd); free(cmd);
} }
} }
@ -364,7 +359,7 @@ void UserPack(int days, int level, int pack)
*/ */
fseek(fout, 0, SEEK_SET); fseek(fout, 0, SEEK_SET);
if ((fin = fopen(fnin, "w")) == NULL) { if ((fin = fopen(fnin, "w")) == NULL) {
WriteError("Can't open %s", fnin); WriteError("$Can't open %s", fnin);
free(fnin); free(fnin);
free(fnout); free(fnout);
return; return;