--- freem/src/symtab_bltin.c 2025/04/04 12:46:13 1.8 +++ freem/src/symtab_bltin.c 2025/04/14 19:56:27 1.12 @@ -1,5 +1,5 @@ /* - * $Id: symtab_bltin.c,v 1.8 2025/04/04 12:46:13 snw Exp $ + * $Id: symtab_bltin.c,v 1.12 2025/04/14 19:56:27 snw Exp $ * FreeM local system table and user-defined special variable table * * @@ -24,6 +24,18 @@ * along with FreeM. If not, see . * * $Log: symtab_bltin.c,v $ + * Revision 1.12 2025/04/14 19:56:27 snw + * Working towards FreeBSD fix + * + * Revision 1.11 2025/04/13 04:22:43 snw + * Fix snprintf calls + * + * Revision 1.10 2025/04/10 01:24:39 snw + * Remove C++ style comments + * + * Revision 1.9 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * * Revision 1.8 2025/04/04 12:46:13 snw * Patch Solaris 8 crash and bump version to 0.63.1-rc1 * @@ -154,13 +166,12 @@ void symtab_init (void) mbpartition = (char *) shm_alloc ((size_t) PSIZE + 2); if (mbpartition != NULL) { shm_config->hdr->use_mb_globals = TRUE; + shm_config->hdr->partition = mbpartition; } else { fprintf (stderr, "symtab_init: falling back to global-backed structured system variables\r\n"); shm_config->hdr->use_mb_globals = FALSE; } - - shm_config->hdr->partition = mbpartition; if (symtab_get_sem ()) { for (i = 0; i < 128; i++) shm_config->hdr->alphptr[i] = 0L; @@ -175,8 +186,10 @@ void symtab_init (void) fprintf (stderr, "symtab_init: could not attach to symbol table semaphore\r\n"); exit (1); } - - mbpartition = shm_config->hdr->partition; + + if (shm_config->hdr->use_mb_globals == TRUE) { + mbpartition = shm_config->hdr->partition; + } symtab_release_sem (); } @@ -385,7 +398,7 @@ void symtab_bltin (short action, char *k stcnv_m2c (tt_with); stcnv_m2c (tt_key); - snprintf (key, 100, "%s%s\201\201", tt_with, tt_key); + sprintf (key, "%s%s\201\201", tt_with, tt_key); no_with: @@ -591,7 +604,7 @@ no_with: /* OLD get_sym routine */ if ((i = alphptr[(int) key[0]])) { -// printf ("alphptr match; writing_mb = %d\r\n", writing_mb); +/* printf ("alphptr match; writing_mb = %d\r\n", writing_mb); */ k = 1; j = i + 1; /* first char always matches! */ @@ -634,6 +647,9 @@ no_with: } while (i < PSIZE); } + else { + printf ("alphptr not found\r\n"); + } merr_raise (M6); data[0] = EOL; @@ -1841,7 +1857,7 @@ zinvend: *newptr++ = k1; *newptr++ = set_sym; - //if (mcmnd != ZNEW) test = FALSE; + /*if (mcmnd != ZNEW) test = FALSE; */ return; @@ -1908,7 +1924,7 @@ zinvend: char esbuf[256]; - snprintf (esbuf, 255, "%d\201", estack); + snprintf (esbuf, sizeof (esbuf) - 1, "%d\201", estack); j = stcpy (newptr, esbuf);