--- freem/src/locktab.c	2025/01/19 02:04:04	1.1
+++ freem/src/locktab.c	2025/05/01 21:02:31	1.7
@@ -1,23 +1,11 @@
 /*
- *                            *
- *                           * *
- *                          *   *
- *                     ***************
- *                      * *       * *
- *                       *  MUMPS  *
- *                      * *       * *
- *                     ***************
- *                          *   *
- *                           * *
- *                            *
- *
- *   locktab.c
+ *   $Id: locktab.c,v 1.7 2025/05/01 21:02:31 snw Exp $
  *    lock table implementation
  *
  *  
- *   Author: Serena Willis <jpw@coherent-logic.com>
+ *   Author: Serena Willis <snw@coherent-logic.com>
  *    Copyright (C) 1998 MUG Deutschland
- *    Copyright (C) 2021 Coherent Logic Development LLC
+ *    Copyright (C) 2021, 2025 Coherent Logic Development LLC
  *
  *
  *   This file is part of FreeM.
@@ -35,6 +23,22 @@
  *   You should have received a copy of the GNU Affero Public License
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
+ *   $Log: locktab.c,v $
+ *   Revision 1.7  2025/05/01 21:02:31  snw
+ *   Documentation updates
+ *
+ *   Revision 1.6  2025/04/13 04:22:43  snw
+ *   Fix snprintf calls
+ *
+ *   Revision 1.5  2025/03/24 02:57:25  snw
+ *   Shared memory compatibility fixes for OS/2
+ *
+ *   Revision 1.4  2025/03/09 19:14:25  snw
+ *   First phase of REUSE compliance and header reformat
+ *
+ *
+ * SPDX-FileCopyrightText:  (C) 2025 Coherent Logic Development LLC
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  **/
 
 #include <stdio.h>
@@ -48,8 +52,9 @@
 #include "shmmgr.h"
 #include "mref.h"
 #include "transact.h"
+#include "log.h"
 
-#if !defined(__OpenBSD__) && !defined(__APPLE__)
+#if !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__OS2__)
 union semun {
     int              val;    /* Value for SETVAL */
     struct semid_ds *buf;    /* Buffer for IPC_STAT, IPC_SET */
@@ -109,7 +114,7 @@ short locktab_get_sem(void)
         if (semop (semid_locktab, &s, 1) != -1) {
             return TRUE;
         }
-
+        printf ("jibjaw\r\n");
         sleep (1);
 
     }
@@ -236,6 +241,8 @@ void locktab_increment(char *key, long l
                 
             }
             else {
+                int sigint_ct = 0;
+                
                 for (;;) {
                     
                     if (locktab_insert (key) != NULL) {
@@ -243,6 +250,18 @@ void locktab_increment(char *key, long l
                         return;
                     }
                     else {
+                        if (merr () == INRPT) {
+                            sigint_ct++;
+
+                            if (sigint_ct == 1) {
+                                printf ("\r\nlocktab_insert:  got Ctrl-C in blocking LOCK; Ctrl-C again to force the process to halt\r\n");
+                                merr_clear ();
+                            }
+                            else {
+                                printf ("\r\n");
+                                logprintf (FM_LOG_FATAL, "locktab_insert:  blocking LOCK was interrupted; forcing halt");
+                            }
+                        }
                         sleep (1);
                     }
                 
@@ -408,12 +427,25 @@ void locktab_decrement(char *key, long l
 
 void locktab_unlock_all(void)
 {
+    locktab_unlock_all_by_pid (pid);
+}
+
+void locktab_unlock_all_by_pid(const pid_t target_pid)
+{
     locktab_ent_t *lck;
+    int remove_ct;
+
+    remove_ct = 0;
+    if (target_pid != pid) {
+        logprintf (FM_LOG_INFO, "locktab_unlock_all_by_pid:  removing all locks for pid %ld", target_pid);
+    }
+
     
     for (lck = shm_config->hdr->locktab_head; lck != NULL; lck = lck->next) {
 
-        if (lck->owner_job == pid) {
-
+        if (lck->owner_job == target_pid) {
+            remove_ct++;
+            
             if (tp_level > lck->tp_level) {
                 merr_raise (M41);
                 return;
@@ -427,7 +459,12 @@ void locktab_unlock_all(void)
             
         }
 
-    }       
+    }
+
+    if (target_pid != pid) {
+        logprintf (FM_LOG_INFO, "locktab_unlock_all_by_pid:  removed %ld lock(s) for pid %ld", remove_ct, target_pid);
+    }
+
     
 }
 
@@ -438,10 +475,10 @@ locktab_ent_t *locktab_find(char *key)
     char chk_ns[255];
 
     if (key[1] == '%') {
-        snprintf (chk_ns, 255, "SYSTEM");
+        snprintf (chk_ns, sizeof (chk_ns) - 1, "SYSTEM");
     }
     else {
-        snprintf (chk_ns, 255, nsname);
+        snprintf (chk_ns, sizeof (chk_ns) - 1, "%s", nsname);
     }
 
     for (lck = shm_config->hdr->locktab_head; lck != NULL; lck = lck->next) {
@@ -482,10 +519,10 @@ locktab_ent_t *locktab_insert(char *key)
     ik = internal_to_mref (ik, key);
     
     if (key[1] == '%') {
-        snprintf (chk_ns, 255, "SYSTEM");
+        snprintf (chk_ns, sizeof (chk_ns) - 1, "SYSTEM");
     }
     else {
-        snprintf (chk_ns, 255, "%s", nsname);
+        snprintf (chk_ns, sizeof (chk_ns) - 1, "%s", nsname);
     }
     
     for (l = shm_config->hdr->locktab_head; l != NULL; l = l->next) {
@@ -537,7 +574,7 @@ new_insert:
     }
 
     stcpy (l->nref, key);
-    snprintf (l->namespace, 255, "%s", chk_ns);
+    snprintf (l->namespace, sizeof (l->namespace) - 1, "%s", chk_ns);
         
     l->owner_job = pid;
     l->ct = 1;