--- freem/src/global_bltin.c 2025/04/08 16:46:11 1.9 +++ freem/src/global_bltin.c 2025/05/02 16:30:16 1.25 @@ -1,5 +1,5 @@ /* - * $Id: global_bltin.c,v 1.9 2025/04/08 16:46:11 snw Exp $ + * $Id: global_bltin.c,v 1.25 2025/05/02 16:30:16 snw Exp $ * freem database engine * * @@ -24,11 +24,11 @@ * along with FreeM. If not, see . * * $Log: global_bltin.c,v $ - * Revision 1.9 2025/04/08 16:46:11 snw - * Add global file header and offsets + * Revision 1.25 2025/05/02 16:30:16 snw + * Fix broken build due to time issues * - * Revision 1.8 2025/04/08 14:39:21 snw - * Initial work on global handler refactor + * Revision 1.24 2025/04/28 14:52:54 snw + * Temporarily revert global handler refactor and fix reference regression in xecline * * Revision 1.7 2025/03/24 04:13:11 snw * Replace action macro dat with fra_dat to avoid symbol conflict on OS/2 @@ -52,13 +52,16 @@ #include #include #include -#include +#if defined(USE_SYS_TIME_H) && !defined(MSDOS) && !defined(__osf__) +# include +#else +# include +#endif + #include -#include "mpsdef.h" -#include "global_bltin.h" -global_handle *global_handles_head; +#include "mpsdef.h" static void b_free (short filedes, unsigned long blknbr); static void splitp (short filedes, char *block, long *addr, long *offs, unsigned long *blknbr); @@ -112,293 +115,10 @@ static void panic (void); #define BOTTOM 6 #define DATA 8 -#if !defined(__OpenBSD__) && !defined(_AIX) && !defined(__osf__) && !defined(MSDOS) && !defined(__vax__) && !defined(__OS2__) +#if !defined(__OpenBSD__) && !defined(_AIX) && !defined(__osf__) && !defined(MSDOS) && !defined(__vax__) && !defined(__OS2__) && !defined(__linux__) long time (); #endif -inline long gbl_path(char *key, char *buf) -{ - long savj; - long savch; /* saved j and ch for multiple pathes */ - - register long int i; - register long int j; - register long int k; - register long int ch; - long pathscan; /* flag for repeated scan of pathlist setting an undef global */ - - /* construct full UNIX filename */ - savj = 0; - savch = ch = EOL; - pathscan = TRUE; -nextpath: - k = 0; - j = savj; - - if (key[1] == '%' || key[1] == '$') { /* %-globals and SSVN backing storage, no explicit path */ - - if (gloplib[0] != EOL) { - - /* append % global access path */ - while ((ch = buf[k++] = gloplib[j++]) != ':' && ch != EOL); - - } - - } - else if (key[1] != '/') { /* no explicit path specified */ - - if (glopath[0] != EOL) { - - /* append global access path */ - while ((ch = buf[k++] = glopath[j++]) != ':' && ch != EOL); - - } - - } - - if (savj == 0 && ch == EOL) pathscan = FALSE; /* one path only: inhibit search */ - - if (k > 0) { - - if (k == 1 || (k == 2 && buf[0] == '.')) { - k = 0; - } - else { - buf[k - 1] = '/'; - } - - } - - savch = ch; - savj = j; - i = 0; - j = 0; - - while (key[i] != EOL) { - - if ((buf[k] = key[i]) == DELIM) break; - - if (buf[k] == '/') { - - j = i; - - if (k > i) { - i = 0; - j = 0; - k = 0; - - continue; - } - - } - - i++; - k++; - - } - - buf[k] = NUL; /* NUL not EOL !!! */ - - return i; -} /* gbl_path() */ - -int gbl_lock(global_handle *g, int type) -{ - if (g->locked == TRUE || lonelyflag == TRUE) { - return TRUE; - } - - locking (g->fd, type, 0L); - g->locked = TRUE; -} /* gbl_lock() */ - -int gbl_unlock(global_handle *g) -{ - if (g->locked == FALSE || lonelyflag == TRUE) { - return TRUE; - } - - locking (g->fd, 0, 0L); - g->locked = FALSE; -} /* gbl_unlock() */ - -void gbl_close(global_handle *g) -{ - if (g->opened == TRUE) { - close (g->fd); - - g->use_count = 0; - g->age = 0; - g->last_block = 0; - g->locked = FALSE; - g->opened = FALSE; - } -} /* gbl_close() */ - -void gbl_close_all(void) -{ - global_handle *g; - - for (g = global_handles_head; g != NULL; g = g->next) { - gbl_close (g); - } -} /* gbl_close_all() */ - -int gbl_write_header(global_handle *g) -{ - global_header hdr; - unsigned long old_position; - char m[5] = GBL_MAGIC; - char msg[256]; - - if (g->opened == FALSE) { - return FALSE; - } - - memcpy (hdr.magic, m, 5); - hdr.format_version = GBL_FORMAT_VERSION; - strncpy (hdr.host_triplet, HOST, 40); - hdr.block_size = BLOCKLEN; - hdr.last_transaction_id = 0; - hdr.created = time (0L); - hdr.last_backup = -1; - - gbl_lock (g, 1); - old_position = lseek (g->fd, 0, SEEK_CUR); - lseek (g->fd, 0, SEEK_SET); - - if (write (g->fd, &hdr, sizeof (global_header)) == -1) { - snprintf (msg, 256, "error %d writing global header for %s", errno, g->global_name); - m_fatal (msg); - } - - lseek (g->fd, old_position, SEEK_SET); - gbl_unlock (g); - - return TRUE; -} /* gbl_write_header() */ - -int gbl_create(global_handle *g) -{ - while (1) { - errno = 0; - - if ((g->fd = creat (g->global_path, 0666)) != -1) break; - - if (errno == EMFILE || errno == ENFILE) { - gbl_close_all (); - continue; - } - - return PROTECT; - } - - g->opened = TRUE; - g->age = time (0L); - g->last_block = 0; - g->use_count = 1; - - gbl_write_header (g); - - return OK; -} /* gbl_create() */ - -short gbl_open(global_handle *g, short action) -{ - if (g->opened == FALSE) { - while (1) { - errno = 0; - g->fd = open (g->global_path, 2); - - if (g->fd != -1) break; - - switch (errno) { - case EINTR: - continue; - - case EMFILE: - case ENFILE: - close_all_globals (); - continue; - } - - break; - } - - if (g->fd == -1) { - g->use_count = 0; - g->age = 0; - g->last_block = 0; - g->locked = FALSE; - g->opened = FALSE; - } - else { - g->opened = TRUE; - } - } - - return g->opened; - -} /* gbl_open() */ - -global_handle *gbl_handle(char *key) -{ - global_handle *g; - char global_name[256]; - int i; - long path_len; - char block[BLOCKLEN]; - struct stat dinf; - - i = 0; - while (key[i] != EOL) { - if ((global_name[i] = key[i]) == DELIM) break; - - i++; - } - global_name[i] = NUL; - - - for (g = global_handles_head; g != NULL; g = g->next) { - if (strncmp (g->global_name, global_name, 256) == 0) { - g->use_count++; - if (!lonelyflag) { - g->fast_path = 0; - } - - fstat (g->fd, &dinf); - if (g->age > dinf.st_mtime) { - g->fast_path = 2; - return g; - } - - g->age = time (0L); - g->fast_path = 0; - - return g; - } - } - g = (global_handle *) malloc (sizeof (global_handle)); - NULLPTRCHK(g,"gbl_open"); - - g->use_count = 1; - g->locked = FALSE; - g->age = time (0L); - g->last_block = 0; - g->opened = FALSE; - g->fd = 0; - g->fast_path = -1; - - strcpy (g->global_name, global_name); - gbl_path (key, g->global_path); - - g->next = global_handles_head; - global_handles_head = g; - - return g; -} /* gbl_handle() */ - - /* globals management */ /* 0 = set_sym 1 = get_sym */ @@ -473,35 +193,34 @@ global_handle *gbl_handle(char *key) * the file is *not* closed on return. since access is regulated by the * locking mechanism, that will not spell trouble. */ - + void global_bltin (short action, char *key, char *data) { - global_handle *g; - - unsigned long hdr_offset; - /* these must be static variables */ + static short filedes; /* filedescr for global access */ static char filnam[256]; /* name of global/unix file */ /* the following vars may be */ /* static or dynamic */ + static unsigned long blknbr; /* block number */ + static unsigned long oldblk; static unsigned long newblk; static unsigned long other; static long j1; static long limit; static short typ; /* block type */ - static long keyl; /* length of compacted key */ - static long datal; /* length of data */ - static long olddatal; - static long offset; - static long found; - static long addr; /* address of key in 'block' */ - static long needed; /* new bytes needed to ins. stuff */ - static long ret_to; /* return code */ - static long kill_again; + static long keyl, /* length of compacted key */ + datal, /* length of data */ + olddatal, + offset, + found, + addr, /* address of key in 'block' */ + needed, /* new bytes needed to ins. stuff */ + ret_to, /* return code */ + kill_again; static char key1[256]; static char tmp1[256]; /* intermediate storage for op= */ static char block[BLOCKLEN]; @@ -509,20 +228,17 @@ void global_bltin (short action, char *k static int tryfast; /* try fast access if get_sym on */ /* previous global */ - int iresult; - struct stat dinf; /* get modification date */ - long savj; - long savch; /* saved j and ch for multiple pathes */ - register long int i; - register long int j; - register long int k; - register long int ch; - long pathscan; /* flag for repeated scan of pathlist setting an undef global */ + long savj, + savch; /* saved j and ch for multiple pathes */ + register long int i, + j, + k, + ch; + long pathscan; /* flag for repeated scan of pathlist setting an undef global */ + - hdr_offset = sizeof (global_header); - /* process optional limitations */ if (glvnflag.all && key[0] >= '%' && key[0] <= 'z') { @@ -599,8 +315,8 @@ void global_bltin (short action, char *k } } - if (action == getnext) { + getnflag = TRUE; varnam[0] = EOL; @@ -674,9 +390,90 @@ void global_bltin (short action, char *k } } - g = gbl_handle (key); - i = gbl_path (key, filnam); + /* construct full UNIX filename */ + savj = 0; + savch = ch = EOL; + pathscan = TRUE; + nextpath: + k = 0; + j = savj; + + if (key[1] == '%' || key[1] == '$') { /* %-globals and SSVN backing storage, no explicit path */ + + if (gloplib[0] != EOL) { + + /* append % global access path */ + while ((ch = filnam[k++] = gloplib[j++]) != ':' && ch != EOL); + + } + + } + else if (key[1] != '/') { /* no explicit path specified */ + + if (glopath[0] != EOL) { + + /* append global access path */ + while ((ch = filnam[k++] = glopath[j++]) != ':' && ch != EOL); + + } + + } + + if (savj == 0 && ch == EOL) pathscan = FALSE; /* one path only: inhibit search */ + + if (k > 0) { + + if (k == 1 || (k == 2 && filnam[0] == '.')) { + k = 0; + } + else { + filnam[k - 1] = '/'; + } + + } + + savch = ch; + savj = j; + i = 0; + j = 0; + + while (key[i] != EOL) { + + if ((filnam[k] = key[i]) == DELIM) break; + if (filnam[k] == '/') { + + j = i; + + if (k > i) { + i = 0; + j = 0; + k = 0; + + continue; + } + + } + + i++; + k++; + + } + + filnam[k] = NUL; /* NUL not EOL !!! */ + + /* if a unix directory is specified, reposition '^' */ + /* '^/usr/test' becomes '/usr/^test' */ + if (j > 0) { + + for (k = 0; k < j; k++) { + filnam[k] = filnam[k + 1]; + } + + filnam[j] = '^'; + + } + /* compact key to internal format: characters are shifted left */ /* delimiters become LSB of previous character */ /* test subscripts for being numeric or not */ @@ -812,11 +609,93 @@ void global_bltin (short action, char *k compactkey[k] = g_EOL; + /* look whether file is already open */ + tryfast = FALSE; + ch = usage[i = j = inuse]; + + while (i < NO_GLOBLS) { + + k = 0; + + while (filnam[k] == oldfil[i][k]) { + + if (filnam[k++] == NUL) { + + filedes = olddes[i]; + + if (inuse == i && action == get_sym) { + + tryfast = TRUE; + + if (usage[i] != (-1)) usage[i]++; + if (lonelyflag) goto tfast2; + + fstat (filedes, &dinf); + + if (g_ages[i] > dinf.st_mtime) goto tfast2; + + g_ages[i] = time (0L); + + goto tfast0; + + } + + inuse = i; + + if (usage[i] != (-1)) usage[i]++; + + goto lock; + } + + } + + if (ch < 0 || (usage[i] >= 0 && usage[i] < ch)) ch = usage[j = i]; + + if (i++ == inuse) { + inuse = (-1); + i = 0; + } + + } + + inuse = j; + usage[j] = 1; + + /* close previous file */ + if ((filedes = olddes[j]) > 0) { + close (filedes); + olddes[j] = 0; + } + + strcpy (oldfil[j], filnam); /* save current filename */ + reopen: - gbl_open (g, action); - if (g->fd == -1) { + for (;;) { + + errno = 0; + + if ((filedes = open (filnam, 2)) != -1) break; + if (errno == EINTR) continue; + + if (errno == EMFILE || errno == ENFILE) { /* too many open files now */ + close_all_globals (); + + continue; + } + break; + } + + if (filedes == -1) { + + usage[inuse] = 0; + oldfil[inuse][0] = NUL; + olddes[inuse] = 0; + g_ages[inuse] = 0; + + if ((pathscan || errno != ENOENT) && (savch != EOL)) goto nextpath; /* try next access path */ + /* file not found */ if (action != set_sym) { @@ -849,7 +728,15 @@ reopen: merr_raise (PROTECT); return; } - + + if (pathscan) { + savj = 0; + savch = ch = EOL; + pathscan = FALSE; + + goto nextpath; + } + if (setop) { tmp1[0] = EOL; @@ -879,19 +766,29 @@ reopen: block[NRBLK + 2] = ROOT + 1; /* nr. of blocks */ /* create file, write_lock it and initialize root block */ - gbl_lock (g, 1); + for (;;) { - if ((iresult = gbl_create (g)) != OK) { - merr_raise (iresult); + errno = 0; + + if ((filedes = creat (filnam, 0666)) != -1) break; + + if (errno == EMFILE || errno == ENFILE) { + close_all_globals (); + continue; + } + + merr_raise (PROTECT); return; - } + } + + if (lonelyflag == FALSE) locking (filedes, 1, 0L); for (;;) { errno = 0; - lseek (g->fd, hdr_offset + (ROOT * BLOCKLEN), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, ROOT * BLOCKLEN, 0); + write (filedes, block, BLOCKLEN); if (errno == 0) break; @@ -912,23 +809,25 @@ reopen: for (;;) { errno = 0; - write (g->fd, block, BLOCKLEN); + write (filedes, block, BLOCKLEN); if (errno == 0) break; - lseek (g->fd, hdr_offset + ((ROOT + 1L) * BLOCKLEN), SEEK_SET); + lseek (filedes, (ROOT + 1L) * BLOCKLEN, 0); panic (); } - gbl_close (g); - gbl_unlock (g); - gbl_open (g, action); - + close (filedes); + + if (lonelyflag == FALSE) locking (filedes, 0, 0L); /* unlock */ + /* close new file, so other users can find it */ return; } + olddes[inuse] = filedes; /* save current filedescriptor */ + /* request global for exclusive use */ /* odd numbered actions get read access (get_sym,data,fra_order) 3 */ /* even ones read/write access (set_sym,kill_sym) 1 */ @@ -938,18 +837,19 @@ lock: if (action == get_sym) { tfast0: - gbl_lock (g, 3); + + if (lonelyflag == FALSE) locking (filedes, 3, 0L); if (tryfast) goto tfast1; /* try again last block */ - blknbr = g->last_block = ROOT; /* start with ROOT block */ + blknbr = oldblk = ROOT; /* start with ROOT block */ for (;;) { tfast1: - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); tfast2: @@ -993,6 +893,7 @@ tfast2: } + /* key1[j]=g_EOL; */ j = ch; do { @@ -1036,8 +937,7 @@ tfast2: if (typ == EMPTY) { if (blknbr == ROOT) { - //close (filedes); - gbl_close (g); + close (filedes); goto reopen; } @@ -1052,35 +952,41 @@ tfast2: addr += UNSIGN (block[addr]) + 2; /* skip key */ - if ((blknbr = UNSIGN (block[addr]) * 65536 + UNSIGN (block[addr + 1]) * 256 + UNSIGN (block[addr + 2])) == g->last_block) { + if ((blknbr = UNSIGN (block[addr]) * 65536 + UNSIGN (block[addr + 1]) * 256 + UNSIGN (block[addr + 2])) == oldblk) { merr_raise (DBDGD); goto quit; } addr += PLEN; /* skip data */ - g->last_block = blknbr; + oldblk = blknbr; if (merr () == INRPT) goto quit; } } /* end of get_sym */ - gbl_lock (g, action & 01 ? 3 : 1); - + + if (lonelyflag == FALSE) locking (filedes, (action & 01 ? 3 : 1), 0L); + /* a KILL on an unsubscripted global deletes the entire file */ if (action == kill_sym && compactkey[0] == g_EOL) { - lseek (g->fd, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); /* note : UNIX does not tell other */ block[BTYP] = EMPTY; /* jobs that a file has been unlinked */ /* as long as they keep it open. */ /* so we mark this global as EMPTY */ - write (g->fd, block, BLOCKLEN); - - gbl_unlock (g); - gbl_close (g); + write (filedes, block, BLOCKLEN); + + if (lonelyflag == FALSE) locking (filedes, 0, 0L); /* unlock */ + + close (filedes); + + olddes[inuse] = 0; + oldfil[inuse][0] = NUL; + usage[inuse] = 0; unlink (filnam); @@ -1090,7 +996,7 @@ tfast2: k_again: /* entry point for repeated kill operations */ /* scan tree for the proper position of key */ - blknbr = g->last_block = ROOT; /* start with ROOT block */ + blknbr = oldblk = ROOT; /* start with ROOT block */ trx = (-1); for (;;) { @@ -1103,8 +1009,8 @@ k_again: /* entry point for repeated traceblk[trx] = blknbr; traceadr[trx] = 0; - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); typ = block[BTYP]; @@ -1116,7 +1022,7 @@ k_again: /* entry point for repeated if (typ == EMPTY) { if (blknbr == ROOT) { - gbl_close (g); + close (filedes); goto reopen; } @@ -1130,13 +1036,13 @@ k_again: /* entry point for repeated addr += UNSIGN (block[addr]); addr += 2; /* skip key */ - if ((blknbr = UNSIGN (block[addr]) * 65536 + UNSIGN (block[addr + 1]) * 256 + UNSIGN (block[addr + 2])) == g->last_block) { + if ((blknbr = UNSIGN (block[addr]) * 65536 + UNSIGN (block[addr + 1]) * 256 + UNSIGN (block[addr + 2])) == oldblk) { merr_raise (DBDGD); goto quit; } addr += PLEN; /* skip data */ - g->last_block = blknbr; + oldblk = blknbr; } traceadr[trx] = addr; @@ -1271,10 +1177,10 @@ s10: { } - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + write (filedes, block, BLOCKLEN); - if (traceadr[trx] == 0) update (g->fd, compactkey, keyl); + if (traceadr[trx] == 0) update (filedes, compactkey, keyl); break; } @@ -1316,6 +1222,7 @@ s10: { } else { + /* if (j1<0) */ /* we need more space */ if ((offset - j1) > DATALIM) { @@ -1358,8 +1265,8 @@ s20: } stcpy0 (&block[++addr], data, (long) datal); - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + write (filedes, block, BLOCKLEN); break; @@ -1390,8 +1297,8 @@ s20: if ((blknbr = UNSIGN (block[RLPTR]) * 65536 + UNSIGN (block[RLPTR + 1]) * 256 + UNSIGN (block[RLPTR + 2]))) { - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); j1 = UNSIGN (block[0]); i = 0; @@ -1473,8 +1380,8 @@ s20: goto quit; } /* no next block */ - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); scandblk (block, &addr, &found); } @@ -1630,8 +1537,8 @@ s20: goto quit; /* no next block */ } - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); addr = 0; offset = UNSIGN (block[OFFS]) * 256 + @@ -1654,8 +1561,8 @@ s20: goto quit; /* no next block */ } - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); addr = 0; } @@ -1865,8 +1772,8 @@ killo: /* entry from killone section other = traceblk[--trx]; addr = traceadr[trx]; - lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); addr += UNSIGN (block[addr]); addr += (2 + PLEN); /* skip previous entry */ @@ -1885,8 +1792,8 @@ killo: /* entry from killone section trx = trxsav; - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); offset = UNSIGN (block[OFFS]) * 256 + UNSIGN (block[OFFS + 1]); @@ -1992,33 +1899,33 @@ p_empty: /* entry if pointer block goes if (left) { - lseek (g->fd, hdr_offset + ((long) left * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) left * (long) (BLOCKLEN), 0); + read (filedes, block0, BLOCKLEN); block0[RLPTR] = block[RLPTR]; block0[RLPTR + 1] = block[RLPTR + 1]; block0[RLPTR + 2] = block[RLPTR + 2]; - lseek (g->fd, hdr_offset + ((long) left * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) left * (long) (BLOCKLEN), 0); + write (filedes, block0, BLOCKLEN); } if (right) { - lseek (g->fd, hdr_offset + ((long) right * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) right * (long) (BLOCKLEN), 0); + read (filedes, block0, BLOCKLEN); block0[LLPTR] = block[LLPTR]; block0[LLPTR + 1] = block[LLPTR + 1]; block0[LLPTR + 2] = block[LLPTR + 2]; - lseek (g->fd, hdr_offset + ((long) right * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) right * (long) (BLOCKLEN), 0); + write (filedes, block0, BLOCKLEN); } - b_free (g->fd, blknbr); /* modify free list */ + b_free (filedes, blknbr); /* modify free list */ /* delete pointer */ /**************************/ @@ -2031,8 +1938,8 @@ p_empty: /* entry if pointer block goes blknbr = traceblk[--trx]; addr = traceadr[trx]; - lseek (g->fd, hdr_offset + ((long) (blknbr) * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) (blknbr) * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); offset = UNSIGN (block[OFFS]) * 256 + UNSIGN (block[OFFS + 1]); freecnt = UNSIGN (block[addr]) + 2 + PLEN; @@ -2044,18 +1951,18 @@ p_empty: /* entry if pointer block goes if (blknbr == ROOT) { /* global went empty */ - lseek (g->fd, hdr_offset + 0L, SEEK_SET); + lseek (filedes, 0L, 0); /* note : UNIX does not tell other */ block[BTYP] = EMPTY; /* jobs that a file has been unlinked */ /* as long as they keep it open. */ /* so we mark this global as EMPTY */ - write (g->fd, block, BLOCKLEN); - gbl_close (g); + write (filedes, block, BLOCKLEN); + close (filedes); unlink (filnam); - - gbl_unlock (g); + + if (lonelyflag == FALSE) locking (filedes, 0, 0L); /* unlock */ olddes[inuse] = 0; oldfil[inuse][0] = NUL; @@ -2076,13 +1983,13 @@ p_empty: /* entry if pointer block goes for (i = offset; i < offset + freecnt; block[i++] = 0); - lseek (g->fd, hdr_offset + ((long) (blknbr) * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, (long) (blknbr) * (long) (BLOCKLEN), 0); + write (filedes, block, BLOCKLEN); if (addr == 0) { /* update of pointer */ traceadr[trx] = 0; - update (g->fd, &block[2], (long) UNSIGN (block[0])); + update (filedes, &block[2], (long) UNSIGN (block[0])); } trx = trxsav; @@ -2124,11 +2031,11 @@ p_empty: /* entry if pointer block goes } block[OFFS] = offset / 256; block[OFFS + 1] = offset % 256; - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + write (filedes, block, BLOCKLEN); if (addr < 3) { /* update of pointer */ traceadr[trx] = 0; - update (g->fd, &block[2], (long) UNSIGN (block[0])); + update (filedes, &block[2], (long) UNSIGN (block[0])); } } @@ -2151,8 +2058,8 @@ zinv: goto quit; } /* no previous block */ - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); addr = UNSIGN (block[OFFS]) * 256 + UNSIGN (block[OFFS + 1]); @@ -2331,8 +2238,8 @@ zinv: break; /* no next block */ } - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + read (filedes, block, BLOCKLEN); addr = 0; offset = UNSIGN (block[OFFS]) * 256 + @@ -2447,9 +2354,10 @@ quit: /* clean things up */ - lseek (g->fd, hdr_offset + ROOT, SEEK_SET); - gbl_unlock (g); - + lseek (filedes, ROOT, 0); + + if (lonelyflag == FALSE) locking (filedes, 0, 0L); /* unlock */ + return; @@ -2460,7 +2368,7 @@ splitd: /* split data block in two se /* 'addr' there I would like to insert, if possible (which is not) */ /* 'offset' filled up to this limit */ - getnewblk (g->fd, &newblk); /* get a new block */ + getnewblk (filedes, &newblk); /* get a new block */ /* if we have to insert at the begin or end of a block */ /* we don't split - we just start a new block */ @@ -2478,8 +2386,8 @@ splitd: /* split data block in two se block[RLPTR + 1] = newblk % 65536 / 256; block[RLPTR + 2] = newblk % 256; - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + write (filedes, block, BLOCKLEN); block[RLPTR] = right; block[RLPTR + 1] = right1; @@ -2491,22 +2399,22 @@ splitd: /* split data block in two se addr = 0; blknbr = newblk; - insert (g->fd, compactkey, keyl, newblk); + insert (filedes, compactkey, keyl, newblk); /* up-date LL-PTR of RL-block */ if ((other = right * 65536 + right1 * 256 + right2)) { char block0[BLOCKLEN]; - lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); + read (filedes, block0, BLOCKLEN); block0[LLPTR] = blknbr / 65536; block0[LLPTR + 1] = blknbr % 65536 / 256; block0[LLPTR + 2] = blknbr % 256; - lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); + write (filedes, block0, BLOCKLEN); } @@ -2524,8 +2432,8 @@ splitd: /* split data block in two se block[LLPTR + 1] = newblk % 65536 / 256; block[LLPTR + 2] = newblk % 256; - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + write (filedes, block, BLOCKLEN); block[LLPTR] = left; block[LLPTR + 1] = left1; @@ -2537,12 +2445,12 @@ splitd: /* split data block in two se blknbr = newblk; traceadr[trx] = (-1); /* inhibit second update of pointers */ - insert (g->fd, compactkey, keyl, newblk); + insert (filedes, compactkey, keyl, newblk); if (addr < 3) { /* update of pointer */ traceadr[trx] = 0; - update (g->fd, compactkey, keyl); + update (filedes, compactkey, keyl); } /* other is ***always*** zero !!! @@ -2650,26 +2558,26 @@ splitd: /* split data block in two se block0[LLPTR + 1] = blknbr % 65536 / 256; block0[LLPTR + 2] = blknbr % 256; - lseek (g->fd, hdr_offset + ((long) (newblk) * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) (newblk) * (long) (BLOCKLEN), 0); + write (filedes, block0, BLOCKLEN); offset = limit; /* insert new block in pointer structure */ - insert (g->fd, &block0[2], (long) UNSIGN (block0[0]), newblk); + insert (filedes, &block0[2], (long) UNSIGN (block0[0]), newblk); /* up-date LL-PTR of RL-block */ if (other != 0) { - lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); + read (filedes, block0, BLOCKLEN); block0[LLPTR] = newblk / 65536; block0[LLPTR + 1] = newblk % 65536 / 256; block0[LLPTR + 2] = newblk % 256; - lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); + write (filedes, block0, BLOCKLEN); } @@ -2690,28 +2598,28 @@ splitd: /* split data block in two se block0[LLPTR + 1] = blknbr % 65536 / 256; block0[LLPTR + 2] = blknbr % 256; - lseek (g->fd, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block, BLOCKLEN); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); + write (filedes, block, BLOCKLEN); stcpy0 (block, block0, (long) BLOCKLEN); traceadr[trx] = (addr -= limit); traceblk[trx] = (blknbr = newblk); /* insert new block in pointer structure */ - insert (g->fd, &block0[2], (long) UNSIGN (block0[0]), newblk); + insert (filedes, &block0[2], (long) UNSIGN (block0[0]), newblk); /* up-date LL-PTR of RL-block */ if (other != 0) { - lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - read (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); + read (filedes, block0, BLOCKLEN); block0[LLPTR] = newblk / 65536; block0[LLPTR + 1] = newblk % 65536 / 256; block0[LLPTR + 2] = newblk % 256; - lseek (g->fd, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); - write (g->fd, block0, BLOCKLEN); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); + write (filedes, block0, BLOCKLEN); } @@ -2747,10 +2655,6 @@ static void splitp (short filedes, char unsigned long other; register int i, j; - long hdr_offset; - - hdr_offset = sizeof (global_header); - getnewblk (filedes, &newblk); /* get a new block */ if (*blknbr == ROOT) { /* ROOT overflow is special */ @@ -2786,7 +2690,7 @@ static void splitp (short filedes, char block0[NRBLK + 2] = i % 256; block0[BTYP] = POINTER; - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); write (filedes, block0, BLOCKLEN); /* shift trace_stack */ @@ -2858,7 +2762,7 @@ static void splitp (short filedes, char block0[LLPTR + 1] = (*blknbr) % 65536 / 256; block0[LLPTR + 2] = (*blknbr) % 256; - lseek (filedes, hdr_offset + ((long) (newblk) * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) (newblk) * (long) (BLOCKLEN), 0); write (filedes, block0, BLOCKLEN); (*offs) = limit; @@ -2868,14 +2772,14 @@ static void splitp (short filedes, char /* up-date LL-PTR of RL-block */ if (other != 0) { - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); read (filedes, block0, BLOCKLEN); block0[LLPTR] = newblk / 65536; block0[LLPTR + 1] = newblk % 65536 / 256; block0[LLPTR + 2] = newblk % 256; - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); write (filedes, block0, BLOCKLEN); } @@ -2901,7 +2805,7 @@ static void splitp (short filedes, char (*addr) -= limit; (*offs) -= limit; - lseek (filedes, hdr_offset + ((long) (*blknbr) * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) (*blknbr) * (long) (BLOCKLEN), 0); write (filedes, block, BLOCKLEN); stcpy0 (block, block0, (long) BLOCKLEN); @@ -2912,14 +2816,14 @@ static void splitp (short filedes, char /* up-date LL-PTR of RL-block */ if (other != 0) { - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); read (filedes, block0, BLOCKLEN); block0[LLPTR] = newblk / 65536; block0[LLPTR + 1] = newblk % 65536 / 256; block0[LLPTR + 2] = newblk % 256; - lseek (filedes, hdr_offset + ((long) other * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) other * (long) (BLOCKLEN), 0); write (filedes, block0, BLOCKLEN); } @@ -2942,10 +2846,7 @@ static void update (short filedes, char unsigned long blknbr; char block[BLOCKLEN]; long i, j, k; - long hdr_offset; - hdr_offset = sizeof (global_header); - while (traceadr[trx] == 0) { /* update of pointer blocks necessary */ if (--trx < 0) break; @@ -2953,7 +2854,7 @@ static void update (short filedes, char blknbr = traceblk[trx]; addr = traceadr[trx]; - lseek (filedes, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); read (filedes, block, BLOCKLEN); { @@ -3004,12 +2905,12 @@ static void update (short filedes, char while (i < keyl) block[j++] = ins_key[i++]; /* block pointed to remains the same */ - lseek (filedes, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); write (filedes, block, BLOCKLEN); } - lseek (filedes, hdr_offset + ((long) blknbr * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) blknbr * (long) (BLOCKLEN), 0); read (filedes, block, BLOCKLEN); } @@ -3034,15 +2935,12 @@ static void insert (int filedes, char *i long needed; long addr; register int i, k; - long hdr_offset; - hdr_offset = sizeof (global_header); - trxsav = trx--; blk = traceblk[trx]; addr = traceadr[trx]; - lseek (filedes, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) (blk) * (long) (BLOCKLEN), 0); read (filedes, block, BLOCKLEN); offset = UNSIGN (block[OFFS]) * 256 + @@ -3079,7 +2977,7 @@ static void insert (int filedes, char *i block[i++] = blknbr % 65536 / 256; block[i] = blknbr % 256; - lseek (filedes, hdr_offset + ((long) (blk) * (long) (BLOCKLEN)), SEEK_SET); + lseek (filedes, (long) (blk) * (long) (BLOCKLEN), 0); write (filedes, block, BLOCKLEN); trx = trxsav; @@ -3099,28 +2997,25 @@ static void b_free (short filedes, unsig unsigned long other; long i; long offset; - long hdr_offset; - - hdr_offset = sizeof (global_header); - + /* mark block as empty */ - lseek (filedes, hdr_offset + ((long) (blknbr) * BLOCKLEN), SEEK_SET); + lseek (filedes, (long) (blknbr) * BLOCKLEN, 0); read (filedes, block0, BLOCKLEN); block0[BTYP] = EMPTY; - lseek (filedes, hdr_offset + ((long) (blknbr) * BLOCKLEN), SEEK_SET); + lseek (filedes, (long) (blknbr) * BLOCKLEN, 0); write (filedes, block0, BLOCKLEN); /* do we have a list of free blocks? */ - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); read (filedes, block0, BLOCKLEN); if ((free = UNSIGN (block0[FREE]) * 65536 + UNSIGN (block0[FREE + 1]) * 256 + UNSIGN (block0[FREE + 2]))) { for (;;) { - lseek (filedes, hdr_offset + ((long) free * (long) BLOCKLEN), SEEK_SET); + lseek (filedes, (long) free * (long) BLOCKLEN, 0); read (filedes, block0, BLOCKLEN); other = UNSIGN (block0[RLPTR]) * 65536 + @@ -3153,7 +3048,7 @@ static void b_free (short filedes, unsig block0[RLPTR + 1] = other % 65536 / 256; block0[RLPTR + 2] = other % 256; - lseek (filedes, hdr_offset + ((long) free * (long) BLOCKLEN), SEEK_SET); + lseek (filedes, (long) free * (long) BLOCKLEN, 0); write (filedes, block0, BLOCKLEN); for (i = 0; i < BLOCKLEN; block0[i++] = 0); /* clear block */ @@ -3174,14 +3069,14 @@ static void b_free (short filedes, unsig getnewblk (filedes, &free); /* set FBLK free blocks pointer */ - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); read (filedes, block0, BLOCKLEN); block0[FREE] = free / 65536; block0[FREE + 1] = free % 65536 / 256; block0[FREE + 2] = free % 256; - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); write (filedes, block0, BLOCKLEN); for (i = 0; i < BLOCKLEN; block0[i++] = 0); /* clear block */ @@ -3197,7 +3092,7 @@ static void b_free (short filedes, unsig block0[OFFS] = offset / 256; block0[OFFS + 1] = offset % 256; - lseek (filedes, hdr_offset + ((long) free * (long) BLOCKLEN), SEEK_SET); + lseek (filedes, (long) free * (long) BLOCKLEN, 0); write (filedes, block0, BLOCKLEN); return; @@ -3324,11 +3219,8 @@ static void getnewblk (int filedes, unsi unsigned long freeblks, no_of_blks; long other; long offset; - long hdr_offset; - hdr_offset = sizeof (global_header); - - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); read (filedes, nblock, BLOCKLEN); freeblks = UNSIGN (nblock[FREE]) * 65536 + UNSIGN (nblock[FREE + 1]) * 256 + UNSIGN (nblock[FREE + 2]); @@ -3336,7 +3228,7 @@ static void getnewblk (int filedes, unsi if (freeblks) { - lseek (filedes, hdr_offset + ((long) (freeblks) * BLOCKLEN), SEEK_SET); + lseek (filedes, (long) (freeblks) * BLOCKLEN, 0); read (filedes, nblock, BLOCKLEN); offset = UNSIGN (nblock[OFFS]) * 256 + UNSIGN (nblock[OFFS + 1]); @@ -3349,27 +3241,27 @@ static void getnewblk (int filedes, unsi /* update RL-block, if any */ if (other) { - lseek (filedes, hdr_offset + ((long) (other) * BLOCKLEN), SEEK_SET); + lseek (filedes, (long) (other) * BLOCKLEN, 0); read (filedes, nblock, BLOCKLEN); nblock[LLPTR] = 0; nblock[LLPTR + 1] = 0; nblock[LLPTR + 2] = 0; - lseek (filedes, hdr_offset + ((long) (other) * BLOCKLEN), SEEK_SET); + lseek (filedes, (long) (other) * BLOCKLEN, 0); write (filedes, nblock, BLOCKLEN); } /* update ROOT block */ - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); read (filedes, nblock, BLOCKLEN); nblock[FREE] = other / 65536; nblock[FREE + 1] = other % 65536 / 256; nblock[FREE + 2] = other % 256; - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); write (filedes, nblock, BLOCKLEN); return; @@ -3383,7 +3275,7 @@ static void getnewblk (int filedes, unsi nblock[OFFS] = offset / 256; nblock[OFFS + 1] = offset % 256; - lseek (filedes, hdr_offset + ((long) (freeblks) * BLOCKLEN), SEEK_SET); + lseek (filedes, (long) (freeblks) * BLOCKLEN, 0); write (filedes, nblock, BLOCKLEN); return; @@ -3396,7 +3288,7 @@ static void getnewblk (int filedes, unsi nblock[NRBLK + 1] = no_of_blks % 65536 / 256; nblock[NRBLK + 2] = no_of_blks % 256; - lseek (filedes, hdr_offset + ROOT, SEEK_SET); + lseek (filedes, ROOT, 0); write (filedes, nblock, BLOCKLEN); *blknbr = no_of_blks; @@ -3405,7 +3297,7 @@ static void getnewblk (int filedes, unsi errno = 0; - lseek (filedes, hdr_offset + ((long) (no_of_blks) * BLOCKLEN), SEEK_SET); + lseek (filedes, (long) (no_of_blks) * BLOCKLEN, 0); write (filedes, nblock, BLOCKLEN); if (errno == 0) break; @@ -3607,9 +3499,7 @@ void close_all_globals (void) } /* end close_all_globals() */ static void panic (void) -{ - printf ("write failed\r\n"); - +{ printf ("\033[s\033[25H\033[5;7mwrite needs more disk space immediately\007"); sleep (1); printf ("\033[m\007\033[2K\033[u"); @@ -3629,15 +3519,15 @@ static void panic (void) void gbl_dump_stat(void) { - global_handle *g; + register int i; printf ("FreeM Global Statistics [PID %d]\r\n", pid); - printf ("%-20s%-10s%-20s%-10s%s\r\n", "GLOBAL", "USECT", "AGE", "LAST BLK", "FILE"); - printf ("%-20s%-10s%-20s%-10s%s\r\n", "======", "=====", "===", "========", "===="); + printf ("%-10s%-20s%s\r\n", "USECT", "AGE", "FILE"); + printf ("%-10s%-20s%s\r\n", "=====", "===", "===="); - for (g = global_handles_head; g != NULL; g = g->next) { - printf ("%-20s%-10d%-20d%-10d%s\r\n", g->global_name, g->use_count, g->age, g->last_block, g->global_path); + for (i = 0; i < NO_GLOBLS; i++) { + printf ("%-10d%-20ld%s\r\n", usage[i], g_ages[i], oldfil[i]); } }