--- freem/src/shmmgr.c	2025/04/15 16:49:36	1.9
+++ freem/src/shmmgr.c	2025/05/12 14:26:15	1.16
@@ -1,5 +1,5 @@
 /*
- *   $Id: shmmgr.c,v 1.9 2025/04/15 16:49:36 snw Exp $
+ *   $Id: shmmgr.c,v 1.16 2025/05/12 14:26:15 snw Exp $
  *    shared memory manager
  *
  *  
@@ -24,6 +24,27 @@
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *
  *   $Log: shmmgr.c,v $
+ *   Revision 1.16  2025/05/12 14:26:15  snw
+ *   Revert bad change in shared memory manager
+ *
+ *   Revision 1.15  2025/05/09 19:44:50  snw
+ *   Begin shm rework
+ *
+ *   Revision 1.14  2025/05/08 14:47:26  snw
+ *   Break everything to begin shared memory rewrite
+ *
+ *   Revision 1.13  2025/04/16 17:36:12  snw
+ *   Add FreeBSD shm cleanup script
+ *
+ *   Revision 1.12  2025/04/15 21:57:10  snw
+ *   Fix SysV IPC bugs on FreeBSD
+ *
+ *   Revision 1.11  2025/04/15 21:08:51  snw
+ *   Add some useful debug output
+ *
+ *   Revision 1.10  2025/04/15 19:26:13  snw
+ *   Remove extra whitespace
+ *
  *   Revision 1.9  2025/04/15 16:49:36  snw
  *   Make use of logprintf throughout codebase
  *
@@ -84,12 +105,22 @@ void shm_daemon_init(void);
 
 shm_config_t *shm_config = (shm_config_t *) NULL;
 
+#if defined(__FreeBSD__)
+# define FM_SHM_PERMS 0777
+#else
+# define FM_SHM_PERMS 0770
+#endif
+
 short shm_init(const size_t seg_size)
 {
     size_t alloc_map_size;
     long pg_size;
     key_t shm_sk;
-
+    
+#if defined(__FreeBSD__)
+    struct shmid_ds ctl;
+#endif
+    
     shm_sk = ftok (config_file, 5);    
     pg_size = sysconf (_SC_PAGESIZE);
     
@@ -105,8 +136,8 @@ short shm_init(const size_t seg_size)
     shm_config->segsiz = seg_size + alloc_map_size + pg_size;
     shm_config->key = ftok (config_file, 1);
     shm_config->pgsiz = pg_size;
-    
-    shm_config->seg_id = shmget (shm_config->key, shm_config->segsiz, 0770 | IPC_CREAT);
+       
+    shm_config->seg_id = shmget (shm_config->key, shm_config->segsiz, FM_SHM_PERMS | IPC_CREAT);
     if (shm_config->seg_id == -1) {
         if (errno == 22) {
             logprintf (FM_LOG_ERROR, "shm_init:  cannot get shared memory segment of %ld bytes", (unsigned long) shm_config->segsiz);
@@ -122,7 +153,7 @@ short shm_init(const size_t seg_size)
 #endif
     
     if (shm_config->dta == (void *) -1) {     
-        return SHMS_ATTACH_ERR;
+        logprintf (FM_LOG_FATAL, "shm_init:  shmat() failed (error code %d [%s])", errno, strerror (errno));
     }
     /* view the first sizeof (shm_hdr_t) bytes of the data area as an shm_hdr_t */
     shm_config->hdr = (shm_hdr_t *) shm_config->dta;
@@ -162,39 +193,9 @@ short shm_init(const size_t seg_size)
                 logprintf (FM_LOG_FATAL, "shm_init:  could not attach to shared memory semaphore [%s]", strerror (errno));         
             }
             
-            /* we are NOT the initial process. if addresses don't match, re-attach! */
-            /* (again, borrowed from RSM) */
-            if (shm_config->hdr->shmad != shm_config->dta) {
-                
-                /* grab the pointers we need */
-                void *old_addr = shm_config->dta;
-                void *new_addr = shm_config->hdr->shmad;
-                
-                /* detach and reattach */
-                if (shmdt (old_addr) == -1) {
-                    logprintf (FM_LOG_FATAL, "shm_init:  detach failed during detach/reattach [shmdt error %s]", strerror (errno));
-                }
 
-#if defined(__FreeBSD__)
-                shm_config->dta = shmat (shm_config->seg_id, new_addr, SHM_REMAP);
-#else                
-                shm_config->dta = shmat (shm_config->seg_id, new_addr, 0);
-#endif
-                
-                
-
-                if (shm_config->dta == (void *) -1) {
-                    logprintf (FM_LOG_FATAL, "shm_init:  fatal error attaching shared memory segment [shmat error '%s']", strerror (errno));
-                }
-                
-                shm_config->hdr = (shm_hdr_t *) shm_config->dta;
+            shm_config->buf = SHMALIGN(shm_config->dta + (sizeof (shm_hdr_t) * shm_config->pgct));
 
-                /* allocator buffer at the next page-aligned address after the header and allocation map */
-                shm_config->buf = SHMALIGN(shm_config->dta + (sizeof (shm_hdr_t) * shm_config->pgct));
-            }
-            else {
-                shm_config->buf = SHMALIGN(shm_config->dta + (sizeof (shm_hdr_t) * shm_config->pgct));
-            }
         
         }