--- freem/src/ssvn_global.c 2025/03/09 19:50:47 1.4 +++ freem/src/ssvn_global.c 2025/04/13 04:22:43 1.8 @@ -1,5 +1,5 @@ /* - * $Id: ssvn_global.c,v 1.4 2025/03/09 19:50:47 snw Exp $ + * $Id: ssvn_global.c,v 1.8 2025/04/13 04:22:43 snw Exp $ * ^$GLOBAL ssvn * * @@ -24,6 +24,18 @@ * along with FreeM. If not, see . * * $Log: ssvn_global.c,v $ + * Revision 1.8 2025/04/13 04:22:43 snw + * Fix snprintf calls + * + * Revision 1.7 2025/04/10 17:21:54 snw + * Remove traces of BDB global handler + * + * Revision 1.6 2025/04/09 19:52:02 snw + * Eliminate as many warnings as possible while building with -Wall + * + * Revision 1.5 2025/03/22 18:43:54 snw + * Make STRLEN 255 chars and add BIGSTR macro for larger buffers + * * Revision 1.4 2025/03/09 19:50:47 snw * Second phase of REUSE compliance and header reformat * @@ -121,11 +133,10 @@ void frm_decode_block(db_blockinfo *b, c void ssvn_global(short action, char *key, char *data) { char gb_ns[STRLEN]; - char gb_path[STRLEN]; - char gb_cpath[STRLEN]; + char gb_path[PATHLEN]; + char gb_cpath[PATHLEN]; - char ns_key[256]; - char ns_data[256]; + char ns_key[STRLEN]; long blkcount; @@ -150,8 +161,8 @@ void ssvn_global(short action, char *key goto done; } - snprintf (ns_key, 255, "^$SYSTEM\202MAPPINGS\202GLOBAL\202^%s\201", mref_get_subscript (r, 0)); - global (set_sym, ns_key, data); + snprintf (ns_key, STRLEN - 1, "^$SYSTEM\202MAPPINGS\202GLOBAL\202^%s\201", mref_get_subscript (r, 0)); + symtab_shm (set_sym, ns_key, data); goto done; @@ -162,8 +173,8 @@ void ssvn_global(short action, char *key goto done; } - snprintf (ns_key, 255, "^$SYSTEM\202MAPPINGS\202GLOBAL\202^%s\201", mref_get_subscript (r, 0)); - global (kill_sym, ns_key, data); + snprintf (ns_key, STRLEN - 1, "^$SYSTEM\202MAPPINGS\202GLOBAL\202^%s\201", mref_get_subscript (r, 0)); + symtab_shm (kill_sym, ns_key, data); goto done; @@ -341,8 +352,6 @@ void ssvn_global(short action, char *key } else if (strcmp (mref_get_subscript (r, 1), "BYTES") == 0) { - - FILE *fp; long bytecount; stcpy (gb_cpath, gb_path); @@ -353,8 +362,7 @@ void ssvn_global(short action, char *key sprintf (data, "%ld\201", bytecount); merr_raise (OK); - goto done; - + goto done; } merr_raise (M38); @@ -377,23 +385,23 @@ done: short frm_global_exists(char *gbl_namespace, char *gbl_path, char *global_name) { char *gpth; - char glofile[STRLEN]; + char glofile[PATHLEN]; char goobuf[STRLEN]; - char mapk_buf[255]; - char mapd_buf[255]; - char old_ns[255]; + char mapk_buf[STRLEN]; + char mapd_buf[STRLEN]; + char old_ns[STRLEN]; int ierr_sav = OK; if (global_name[0] != '^') { - snprintf (mapk_buf, 254, "^$SYSTEM\202MAPPINGS\202GLOBAL\202^%s\201", global_name); + snprintf (mapk_buf, STRLEN - 1, "^$SYSTEM\202MAPPINGS\202GLOBAL\202^%s\201", global_name); } else { - snprintf (mapk_buf, 254, "^$SYSTEM\202MAPPINGS\202GLOBAL\202%s\201", global_name); + snprintf (mapk_buf, STRLEN - 1, "^$SYSTEM\202MAPPINGS\202GLOBAL\202%s\201", global_name); } - global (get_sym, mapk_buf, mapd_buf); + symtab_shm (get_sym, mapk_buf, mapd_buf); stcnv_m2c (mapd_buf); @@ -430,10 +438,10 @@ short frm_global_exists(char *gbl_namesp stcnv_m2c (goobuf); if (global_name[0] != '^') { - snprintf (glofile, STRLEN - 1, "%s/^%s", goobuf, global_name); + snprintf (glofile, PATHLEN - 1, "%s/^%s", goobuf, global_name); } else { - snprintf (glofile, STRLEN - 1, "%s/%s", goobuf, global_name); + snprintf (glofile, PATHLEN - 1, "%s/%s", goobuf, global_name); } strcpy (gbl_path, glofile);