diff --git a/TODO b/TODO index 9bfe0d7f..d69ce059 100644 --- a/TODO +++ b/TODO @@ -146,6 +146,12 @@ mbfile: N: The import function doesn't strip the [0] from the files.bbs when importing the description. + N: With rearc if a LFN results in a new mangled name, update this. + + N: With rearc if a file is a magic file, update the magic entry. + + N: After rearc force index. + mbmsg: N: With the post command if a netmail area is used the netmail area will cause trouble later, should be blocked to be used on netmail diff --git a/html/images/fdb.png b/html/images/fdb.png index 79d33fd7..9ea74809 100644 Binary files a/html/images/fdb.png and b/html/images/fdb.png differ diff --git a/html/images/fegroup.png b/html/images/fegroup.png index 45fae7ef..eeb1d07c 100644 Binary files a/html/images/fegroup.png and b/html/images/fegroup.png differ diff --git a/html/images/files.png b/html/images/files.png index c71b91de..3b1c2c92 100644 Binary files a/html/images/files.png and b/html/images/files.png differ diff --git a/html/images/nodes6.png b/html/images/nodes6.png index 6cb93807..e1b2ff37 100644 Binary files a/html/images/nodes6.png and b/html/images/nodes6.png differ diff --git a/html/programs/mbfile.html b/html/programs/mbfile.html index 9a98f18e..b73db535 100644 --- a/html/programs/mbfile.html +++ b/html/programs/mbfile.html @@ -14,7 +14,7 @@
-
Last update 08-Nov-2003
+
Last update 08-Mar-2004

mbfile - File database maintenance program.

Synopsys.

@@ -70,8 +70,9 @@ file is removed. If the area is a CD-rom area, the check that files on disk must exist in the filedatabase is skipped.

-mbfile delete <area> <file> -Mark a file in an area for later deletion. +mbfile delete <area> "<filemask>" +Mark file(s) in an area for later deletion. You can use wildcards, and if you do +surround them with quotes to prevent shell expansion. The file is not removed until you run mbfile pack.

@@ -136,15 +137,21 @@ you delete files with mbsetup or with mbfile, they are still in your database an until you run mbfile pack.

+mbfile rearc <area> "<filemask>"; +Re-archive file(s) in an file area to the archiver that must be set in the +file area setup. +

+ mbfile sort <area> Sort the files in area on the long filenames. The sort is case insensitive. When the sort is completed, the command mbfile index will automatic run to rebuild all indexes.

-mbfile undelete <area> <file> +mbfile undelete <area> "<filemask>" Mark a file that is marked for deletion to be available again, ie. undo the deletion -mark. +mark. You can use wildcards, and if you do +surround them with quotes to prevent shell expansion.

 

Options.

diff --git a/html/setup/fdb.html b/html/setup/fdb.html index 5a6b963e..f34e5912 100644 --- a/html/setup/fdb.html +++ b/html/setup/fdb.html @@ -14,7 +14,7 @@
-
Last update 21-Jan-2002
+
Last update 08-Mar-2004

MBSE BBS Setup - Files Database.

Introduction.

@@ -33,15 +33,12 @@ will be when I have the time. The basic file entries can't be changed. FileDate The real date of the file. Last DL. The date of the last download of the file. Upl.Date The upload date. +TIC Area The name of the tic area the file was received in. +Magic The magic name to download/freq this file. Uploader The name of the uploader. Times DL The number of times downloaded from the BBS. -Times FTP Not in use yet. -Times Req The number of times requested by mailer. Password The password to access this file. -Cost Not in use yet. -Free If this file is free for download. Deleted If this file should be deleted. -Missing If this file is missing on disk. No Kill Don't delete this file with mbfile Announced If this file is ever announced as new. diff --git a/html/setup/fegroup.html b/html/setup/fegroup.html index 55cb972c..aabb93db 100644 --- a/html/setup/fegroup.html +++ b/html/setup/fegroup.html @@ -14,7 +14,7 @@
-
Last update 30-Sep-2002
+
Last update 08-Mar-2003

MBSE BBS Setup - File Echo's Setup - File Groups.

Introduction.

@@ -33,16 +33,6 @@ each distribution group, ie. Fidonet, SDS etc. The name of that group must exactly match the comment field in the group in this setup.

 

-

Cost Sharing.

-

-With the setup of groups you can also specify the Cost Sharing for the -files distribution. The unit cost is the cost for each transmitted file -if the unit size field is zero, or the unit price per transmitted unit size. -The final cost is multiplied with the "Add Prom." factor to add taxes or so. -Also if your uplink sends advanced .tic files, the cost found in that .tic -file will be added to the cost as well. Further you can set the final price -to divide between your downlinks or let them all pay the full price. -

File Group Setup.

@@ -61,10 +51,6 @@ to divide between your downlinks or let them all pay the full price.
 Active    If this group is active.
 Deleted   If this group must be deleted.
 Start at  New created areas must start at area nr.
-Unit Cost The cost per unit.
-Unit Size The size in Kbytes per unit.
-Add Prom. The prommilage to add to the cost.
-Divide    Divide cost over downlinks.
 Auto chng Auto change when running mbfido areas
 User chng Auto create areas on downlinks requests.
 Replace   Set replace option in new areas.
diff --git a/html/setup/files.html b/html/setup/files.html
index a6e4a75e..2f637a54 100644
--- a/html/setup/files.html
+++ b/html/setup/files.html
@@ -14,7 +14,7 @@
 
 
 

-
Last update 18-Feb-2002

+
Last update 08-Mar-2004

 
MBSE BBS Setup - BBS Setup - File Areas.

 
 
File Areas introduction.

@@ -63,7 +63,6 @@ moved to the new location.
 DL days    How long must a file not been downloaded to (re)move it.
 FD days    How old must a file be to be (re)moved.
 Move area  The area to move the file to, if zero it is deleted.
-Cost       The cost in units to download from this area.
 Archiver   The archiver to use to repack the files with.
 Upload     Alternate upload area. If a user uploads a file in this
            area, it will be placed in the alternate area. If the
diff --git a/html/setup/nodes.html b/html/setup/nodes.html
index ab61a15d..e1452f83 100644
--- a/html/setup/nodes.html
+++ b/html/setup/nodes.html
@@ -14,7 +14,7 @@
 
 
 

-
Last update 08-Jan-2004

+
Last update 08-Mar-2004

 
MBSE BBS Setup - Fidonet nodes.

 

 
@@ -194,20 +194,6 @@ the ticfile. Some braindead systems will forward this line instead of processing
 it and then the next system in the line will fail.
 File forwardForward TIC files for
 this node (not yet).
-BillingIs Costsharing active for
-this node.
-Bill directSend the bill direct or
-on command (billing is not yet available).
-CreditThe credit this node has in
-units.
-DebitThe debit we have with this
-node (informational).
-AddAdd (or substract) factor to
-the bill.
-Warn levelThe debit level when to
-write a warning mesage.
-Stop levelThe debit level when to
-stop sending files.
 
 

 Nodes files setup
diff --git a/lib/rearc.c b/lib/rearc.c
index 0e4357b8..44f84cc7 100644
--- a/lib/rearc.c
+++ b/lib/rearc.c
@@ -45,7 +45,7 @@ int rearc(char *filename, char *arctype, int do_quiet)
 
     if (!do_quiet) {
         colour(12, 0);
-        printf("    ReArc file %s", filename);
+        printf("    ReArc file %s   ", filename);
 	fflush(stdout);
     }
 
@@ -146,7 +146,7 @@ int rearc(char *filename, char *arctype, int do_quiet)
 
     if (!do_quiet) {
 	colour(11, 0);
-	printf("\rUnpacking file %s", filename);
+	printf("\rUnpacking file %s   ", filename);
 	fflush(stdout);
     }
 
@@ -166,7 +166,7 @@ int rearc(char *filename, char *arctype, int do_quiet)
 
     if (!do_quiet) {
 	colour(10, 0);
-	printf("\r  Packing file %s", filename);
+	printf("\r  Packing file %s   ", newname);
     }
 
     /*
diff --git a/mbfido/mbfrearc.c b/mbfido/mbfrearc.c
index 6df406d9..2eefe276 100644
--- a/mbfido/mbfrearc.c
+++ b/mbfido/mbfrearc.c
@@ -48,7 +48,7 @@ void ReArc(int Area, char *File)
 {
     char	    *p, *temp, *linkpath, mask[256];
     FILE	    *fp;
-    int		    i, rc = -1;
+    int		    i, rc = -1, count = 0, errors = 0;
     struct utimbuf  ut;
 
     IsDoing("ReArc file(s)");
@@ -98,7 +98,8 @@ void ReArc(int Area, char *File)
 	if (re_exec(fdb.LName) || re_exec(fdb.Name)) {
 	    Syslog('+', "Will rearc %s", fdb.LName);
 	    sprintf(temp, "%s/%s", area.Path, fdb.Name);
-	    
+	    count++;
+
 	    rc = rearc(temp, area.Archiver, do_quiet);
 	    if (rc == 0) {
 		/*
@@ -106,7 +107,7 @@ void ReArc(int Area, char *File)
 		 */
     		if (!do_quiet) {
 		    colour(9, 0);
-		    printf("\r   Update file %s", temp);
+		    printf("\r   Update file %s   ", temp);
 		    fflush(stdout);
 		}
 
@@ -177,12 +178,13 @@ void ReArc(int Area, char *File)
 		symlink(temp, linkpath);
 		free(linkpath);
 	    } else {
+		errors++;
 		break; // stop when something goes wrong
 	    }
 	    if (!do_quiet) {
 		colour(7, 0);
 		printf("\r");
-		for (i = 0; i < (strlen(temp) + 17); i++)
+		for (i = 0; i < (strlen(temp) + 20); i++)
 		    printf(" ");
 		printf("\r");
 		fflush(stdout);
@@ -191,6 +193,7 @@ void ReArc(int Area, char *File)
     }
     fclose(fp);
     free(temp);
+    Syslog('+', "ReArc Files [%5d]  Good [%5d]  Errors [%5d]", count, count - errors, errors);
 }
 
 
diff --git a/mbfido/mbfutil.c b/mbfido/mbfutil.c
index 45a24151..6777b142 100644
--- a/mbfido/mbfutil.c
+++ b/mbfido/mbfutil.c
@@ -114,17 +114,17 @@ void Help(void)
     colour(CYAN, BLACK);
     printf("	a  adopt   [desc]	Adopt file to area\n");
     printf("	c  check			Check filebase\n");
-    printf("	d  delete  	Mark file(s) in area for deletion\n");
+    printf("	d  delete  \"\"	Mark file(s) in area for deletion\n");
     printf("	im import 		Import files in current dir to area\n");
     printf("	in index			Create filerequest index\n");
     printf("	k  kill				Kill/move old files\n");
     printf("	l  list	[area]			List file areas or one area\n");
     printf("	m  move   	Move file from to area\n");
     printf("	p  pack				Pack filebase\n");
-    printf("	r  rearc  	Rearc file(s) in area to area archive type\n");
+    printf("	r  rearc  \"\"	Rearc file(s) in area to area archive type\n");
     printf("	s  sort 			Sort files in a file area\n");
     printf("	t  toberep			Show toberep database\n");
-    printf("	u  undelete  	Mark file(s) in area for undeletion\n");
+    printf("	u  undelete  \"\"	Mark file(s) in area for undeletion\n");
     colour(LIGHTBLUE, BLACK);
     printf("\n	Options are:\n\n");
     colour(CYAN, BLACK);