Fixes for mbfile index

This commit is contained in:
Michiel Broek 2002-02-04 12:05:05 +00:00
parent 65b93420c5
commit 8d4311b6a3
2 changed files with 15 additions and 12 deletions

View File

@ -2772,7 +2772,7 @@ v0.33/g5 13-Nov-1999.
mbsetup: mbsetup:
In edit tic area and edit message area editing of connected In edit tic area and edit message area editing of connected
systems now uses the excisting node setup. systems now uses the existing node setup.
Made a new menu selector for areas with Global and Move Made a new menu selector for areas with Global and Move
options. options.
Implemented new menu selector in message and tic areas select. Implemented new menu selector in message and tic areas select.
@ -2844,7 +2844,7 @@ v0.33/g8 12-Dec-1999
Removed and changed nodelist lookup debug logging. Removed and changed nodelist lookup debug logging.
mbuseradd: mbuseradd:
Now check the excistance of the users home directory, if it Now check the existance of the users home directory, if it
is found then it is removed before the home directory is is found then it is removed before the home directory is
created again. This fixes problems with RedHat 6.1. created again. This fixes problems with RedHat 6.1.
@ -3562,7 +3562,7 @@ v0.33.15 08-Oct-2000
Now closes active SMTP and NNTP servers only once if they have Now closes active SMTP and NNTP servers only once if they have
been used instead of opening and closing for each message. been used instead of opening and closing for each message.
The filemover now creates destination directories if they don't The filemover now creates destination directories if they don't
excist. exist.
Added patches from Redy Rodriguez of 2:283/613.6: Added patches from Redy Rodriguez of 2:283/613.6:
. Added %RESCAN and %MSGS to the Areamgr. . Added %RESCAN and %MSGS to the Areamgr.
. It also fixes two bugs in %QUERY: it incorrectly listed the . It also fixes two bugs in %QUERY: it incorrectly listed the
@ -3647,7 +3647,7 @@ v0.33.15 08-Oct-2000
run_inout: run_inout:
Changed this script to check for the inbound/bad directory, Changed this script to check for the inbound/bad directory,
if it doesn't excist it is created. if it doesn't exist it is created.
Removed all old news/email gateway stuff. Removed all old news/email gateway stuff.
The goldnode compiler is called if it is in $MBSE_ROOT/bin. The goldnode compiler is called if it is in $MBSE_ROOT/bin.
@ -3911,7 +3911,7 @@ v0.33.17 21-May-2001
if the internet connection is available with ICMP ping. if the internet connection is available with ICMP ping.
Added Internet connection status, system running status and Added Internet connection status, system running status and
system load average to the GSTA command for mbmon. system load average to the GSTA command for mbmon.
Create's the file ~/etc/config.data if it doesn't excist and Create's the file ~/etc/config.data if it doesn't exist and
fills it with default parameters. fills it with default parameters.
Note: the internet connection status is for future use. Note: the internet connection status is for future use.
@ -4167,7 +4167,7 @@ v0.33.18 27-Jul-2001
mbcico: mbcico:
Renamed sendfile function in zmsend.c to sendzfile to prevent a Renamed sendfile function in zmsend.c to sendzfile to prevent a
conflict with an excisting library call on FreeBSD. conflict with an existing library call on FreeBSD.
Removed some debug logmessages. Removed some debug logmessages.
The filerquest response message doesn't use the tmpnam function The filerquest response message doesn't use the tmpnam function
anymore, this was the last one of the unsafe tmpnam calls. anymore, this was the last one of the unsafe tmpnam calls.
@ -4224,7 +4224,7 @@ v0.33.19 26-Oct-2001
the new style (not setuid) of mbsebbs. the new style (not setuid) of mbsebbs.
Remove /opt/mbse/etc/maint to let it replace with a new Remove /opt/mbse/etc/maint to let it replace with a new
version, or change it by hand. version, or change it by hand.
On RedHat, Mandrake or e-smith systems remove the excisting On RedHat, Mandrake or e-smith systems remove the existing
start and stop commands with the runlevel editor, they will start and stop commands with the runlevel editor, they will
be installed with other values when the system is installed. be installed with other values when the system is installed.
If you forget this then mbsebbs will start and stop twice. If you forget this then mbsebbs will start and stop twice.
@ -4264,7 +4264,7 @@ v0.33.19 26-Oct-2001
Fixed filemodes for some directories and data files. Fixed filemodes for some directories and data files.
SETUP.sh: SETUP.sh:
Better grep to check for excisting usernames like bbs, mbse. Better grep to check for existing usernames like bbs, mbse.
Ported to NetBSD. Ported to NetBSD.
Added support for xinetd configuration. Added support for xinetd configuration.
Changed distribution test for Mandrake. Changed distribution test for Mandrake.
@ -4529,6 +4529,8 @@ v0.33.19 26-Oct-2001
Implemented "mbfile delete" and "mbfile undelete" commands. Implemented "mbfile delete" and "mbfile undelete" commands.
The command mbfile check now removes obsolete file databases. The command mbfile check now removes obsolete file databases.
Fixes for Sparc systems. Fixes for Sparc systems.
Fixed index screens to prevent negative totals with large
filebases.
mball: mball:
The index function is now obsolete, this is added to mbfile. The index function is now obsolete, this is added to mbfile.

View File

@ -379,7 +379,7 @@ void closepage(FILE *fa, char *Path, int inArea, int Current)
void Index(void) void Index(void)
{ {
FILE *pAreas, *pFile, *pIndex, *fa, *fm, *fp; FILE *pAreas, *pFile, *pIndex, *fa, *fm, *fp;
long i, iAreas, iAreasNew = 0, record, iSize = 0L, aSize = 0; unsigned long i, iAreas, iAreasNew = 0, record, KSize = 0L, aSize = 0;
int iTotal = 0, AreaNr = 0, j, z, x = 0, Areas = 0; int iTotal = 0, AreaNr = 0, j, z, x = 0, Areas = 0;
int Total = 0, aTotal = 0, inArea = 0, filenr; int Total = 0, aTotal = 0, inArea = 0, filenr;
int fbAreas = 0, fbFiles = 0; int fbAreas = 0, fbFiles = 0;
@ -603,7 +603,8 @@ void Index(void)
* check if a thumbnail file exists. If not try to * check if a thumbnail file exists. If not try to
* create a thumbnail file to add to the html listing. * create a thumbnail file to add to the html listing.
*/ */
if (strstr(file.LName, ".gif") || strstr(file.LName, ".jpg")) { if (strstr(file.LName, ".gif") || strstr(file.LName, ".jpg") ||
strstr(file.LName, ".GIF") || strstr(file.LName, ".JPG")) {
sprintf(linebuf, "%s/%s", area.Path, file.LName); sprintf(linebuf, "%s/%s", area.Path, file.LName);
sprintf(outbuf, "%s/.%s", area.Path, file.LName); sprintf(outbuf, "%s/.%s", area.Path, file.LName);
if (file_exist(outbuf, R_OK)) { if (file_exist(outbuf, R_OK)) {
@ -642,7 +643,6 @@ void Index(void)
} }
fprintf(fa, "</PRE></TD></TR>\n"); fprintf(fa, "</PRE></TD></TR>\n");
aSize += file.Size; aSize += file.Size;
iSize += file.Size;
if (file.FileDate > last) if (file.FileDate > last)
last = file.FileDate; last = file.FileDate;
if ((aTotal % CFG.www_files_page) == 0) { if ((aTotal % CFG.www_files_page) == 0) {
@ -651,6 +651,7 @@ void Index(void)
} }
} /* if (!file.deleted) */ } /* if (!file.deleted) */
} }
KSize += aSize / 1024;
closepage(fa, area.Path, inArea, aTotal); closepage(fa, area.Path, inArea, aTotal);
fclose(fp); fclose(fp);
chmod(temp, 0644); chmod(temp, 0644);
@ -689,7 +690,7 @@ void Index(void)
if (fm) { if (fm) {
fprintf(fm, "<TR align=right><TH>&nbsp;</TH><TH>Total</TH><TD>%d</TD><TD>%ld Mb.</TD><TD>&nbsp;</TD></TR>\n", fprintf(fm, "<TR align=right><TH>&nbsp;</TH><TH>Total</TH><TD>%d</TD><TD>%ld Mb.</TD><TD>&nbsp;</TD></TR>\n",
Total, iSize / 1048576); Total, KSize / 1024);
fprintf(fm, "</TABLE><P>\n"); fprintf(fm, "</TABLE><P>\n");
fprintf(fm, "<A HREF=\"/index.html\"><IMG SRC=\"/icons/%s\" ALT=\"%s\" BORDER=0>%s</A>\n", fprintf(fm, "<A HREF=\"/index.html\"><IMG SRC=\"/icons/%s\" ALT=\"%s\" BORDER=0>%s</A>\n",
CFG.www_icon_home, CFG.www_name_home, CFG.www_name_home); CFG.www_icon_home, CFG.www_name_home, CFG.www_name_home);