--- freem/src/frmgbl.c 2025/04/01 16:37:12 1.7 +++ freem/src/frmgbl.c 2025/04/16 17:36:12 1.12 @@ -1,5 +1,5 @@ /* - * $Id: frmgbl.c,v 1.7 2025/04/01 16:37:12 snw Exp $ + * $Id: frmgbl.c,v 1.12 2025/04/16 17:36:12 snw Exp $ * freem global C variables * * @@ -24,6 +24,21 @@ * along with FreeM. If not, see . * * $Log: frmgbl.c,v $ + * Revision 1.12 2025/04/16 17:36:12 snw + * Add FreeBSD shm cleanup script + * + * Revision 1.11 2025/04/13 04:22:43 snw + * Fix snprintf calls + * + * Revision 1.10 2025/04/10 01:24:38 snw + * Remove C++ style comments + * + * Revision 1.9 2025/04/03 01:41:02 snw + * New features frozen; prepare 0.63.0-rc1 + * + * Revision 1.8 2025/04/02 03:02:42 snw + * Stop requiring users to pass -e to fmadm when -u or -g are passed + * * Revision 1.7 2025/04/01 16:37:12 snw * Configure DEFAULT environment the same as others, and set permissions/ownership directly in fmadm configure. Add env.conf file as a centralized configuration listing all environments. * @@ -122,10 +137,7 @@ #define VIEW 'v' #define WRITE 'w' #define XECUTE 'x' - -#define ZALLOCATE 'A' #define ZBREAK 'B' -#define ZDEALLOCATE 'D' #define ZGO 'G' #define ZHALT 'H' #define ZINSERT 'I' @@ -419,6 +431,7 @@ char config_file[4096]; /* path char env_config_file[4096]; /* path to environment config file */ char env_user[255]; char env_group[255]; +char env_enabled[10]; char shm_env[255]; /* shared memory environment */ short fp_mode = 0; /* set to 0 for fixed-point math, 1 for IEEE754 floating point */ @@ -523,14 +536,13 @@ char rou0plib[PATHLEN]; /* % char rou1plib[PATHLEN]; /* %routine path (ZL..) */ char oucpath[PATHLEN] = "\201"; /* OPEN/USE/CLOSE path */ char zargdefname[PATHLEN]= "%\201"; /* default varname for Z-commands */ -char jourfile[PATHLEN] = "/usr/tmp/ioprotocol"; /* journal file */ FILE *jouraccess; /* dto. filedes */ char curdir[256] = "."; /* current directory */ char startuprou[PATHLEN] = "\201"; /* start up routine from cmdline*/ char zcommds[256] = -" za zas zb zd zg zh zi zj zl zn zp zq zr zs zt zwr zallocate zbreak zdeallocate \ +" za zas zb zd zg zh zi zj zl zn zp zq zr zs zt zwr zbreak \ zgo zhalt zinsert zjob zload znamespace zprint zquit zremove zsave ztrap zwrite \201"; /* intrinsic z-commands */ char zfunctions[256] = /* intrinsic z-functions */ " zb zc zd ze zh zht zk zl zm zn zo zp zr zs zt zboolean zcall zcr zcrc zdata zdate zedit zhorolog \ @@ -608,7 +620,7 @@ short sigint_in_for = FALSE; short direct_mode = TRUE; /* are we in direct mode? */ short extr_types[NESTLEVLS + 1]; /* return types of extrinsic functions */ -char destructors[MAX_DESTRUCTORS][50]; +char destructors[MAX_DESTRUCTORS][OBJ_DSTRSIZE]; int destructor_ct; char private_keys[MAX_PRIVATE_KEYS][255]; @@ -641,14 +653,13 @@ short ipc_pending = 0; /* 1 if an inco int strict_mode = 0; short first_process = FALSE; -size_t shm_init_size = 16777216; - +#if defined(__FreeBSD__) + size_t shm_init_size = 4194304; +#else + size_t shm_init_size = 16777216; +#endif short inrpt_after_async = FALSE; -//#ifdef USE_SIGACTION -// struct sigaction act = {0}; /* signals stuff */ -//#endif/*USE_SIGACTION*/ - void unnew (void) { char *xptr;