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

Made FDB experiment permanent and bumped to version 0.51.5

Browse Source
This commit is contained in:
Michiel Broek
2004-05-19 21:18:14 +00:00
parent d87e61987f
commit 2804bac993
26 changed files with 2403 additions and 2615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mbcico/respfreq.c
View File

@@ -161,11 +161,7 @@ file_list *respfreq(char *nm, char *pw, char *dt)
FILE *fa, *fi;
long Area;
struct FILEIndex idx;
#ifdef USE_EXPERIMENT
struct _fdbarea *fdb_area = NULL;
#else
FILE *fb;
#endif
if (localoptions & NOFREQS) {
Syslog('+', "File requests disabled");
@@ -266,31 +262,12 @@ file_list *respfreq(char *nm, char *pw, char *dt)
return NULL;
}
Syslog('f', "Area %s", area.Name);
#ifdef USE_EXPERIMENT
if ((fdb_area = mbsedb_OpenFDB(idx.AreaNum, 30)) == 0) {
} else {
#else
p = calloc(PATH_MAX, sizeof(char));
sprintf(p, "%s/fdb/file%ld.data", getenv("MBSE_ROOT"), idx.AreaNum);
if ((fb = fopen(p, "r+")) == NULL) {
WriteError("$Can't open %s", p);
free(p);
} else {
free(p);
fread(&fdbhdr, sizeof(fdbhdr), 1, fb);
#endif
if ((fdb_area = mbsedb_OpenFDB(idx.AreaNum, 30))) {
#ifdef USE_EXPERIMENT
if (fseek(fdb_area->fp, fdbhdr.hdrsize + (idx.Record * fdbhdr.recsize), SEEK_SET) == -1) {
WriteError("$Can't seek filerecord %d", idx.Record);
} else {
if (fread(&fdb, fdbhdr.recsize, 1, fdb_area->fp) != 1) {
#else
if (fseek(fb, fdbhdr.hdrsize + (idx.Record * fdbhdr.recsize), SEEK_SET) == -1) {
WriteError("$Can't seek filerecord %d", idx.Record);
} else {
if (fread(&fdb, fdbhdr.recsize, 1, fb) != 1) {
#endif
WriteError("$Can't read filerecord %d", idx.Record);
} else {
Send = FALSE;
@@ -367,25 +344,16 @@ file_list *respfreq(char *nm, char *pw, char *dt)
*/
fdb.TimesDL++;
fdb.LastDL = time(NULL);
#ifdef USE_EXPERIMENT
if (mbsedb_LockFDB(fdb_area, 30)) {
fseek(fdb_area->fp, - fdbhdr.recsize, SEEK_CUR);
fwrite(&fdb, fdbhdr.recsize, 1, fdb_area->fp);
mbsedb_UnlockFDB(fdb_area);
}
#else
fseek(fb, - fdbhdr.recsize, SEEK_CUR);
fwrite(&fdb, fdbhdr.recsize, 1, fb);
#endif
}
free(tnm);
}
}
#ifdef USE_EXPERIMENT
mbsedb_CloseFDB(fdb_area);
#else
fclose(fb);
#endif
}
}
}