freem/src/fmadm.c - diff

Return to fmadm.c CVS log

Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/fmadm.c between versions 1.40 and 1.42

version 1.40, 2025/04/15 18:19:40	version 1.42, 2025/05/13 20:03:53
Line 24	Line 24
* along with FreeM. If not, see <https://www.gnu.org/licenses/>.	* along with FreeM. If not, see <https://www.gnu.org/licenses/>.
*	*
* $Log$	* $Log$
	* Revision 1.42 2025/05/13 20:03:53 snw
	* Error-check fopen in fm_daemonctl
	*
	* Revision 1.41 2025/04/25 20:08:19 snw
	* Work on improving routine importer
	*
* Revision 1.40 2025/04/15 18:19:40 snw	* Revision 1.40 2025/04/15 18:19:40 snw
* Further attempts to fix FreeBSD	* Further attempts to fix FreeBSD
*	*
Line 395 int main (int argc, char **argv)	Line 401 int main (int argc, char **argv)

snprintf (env_config_file, sizeof (env_config_file) - 1, "%s/freem/env.conf", SYSCONFDIR);	snprintf (env_config_file, sizeof (env_config_file) - 1, "%s/freem/env.conf", SYSCONFDIR);

/*
printf ("action = '%s' object = '%s' environment = '%s' namespace = '%s' config_file = '%s' base_arg = '%d' next argument = '%s'\n", action, obj_str, fma_environment, fma_namespace, config_file, base_arg, argv[base_arg]);	//printf ("action = '%s' object = '%s' environment = '%s' namespace = '%s' config_file = '%s' base_arg = '%d' next argument = '%s'\n", action, obj_str, fma_environment, fma_namespace, config_file, base_arg, argv[base_arg]);
exit(1);	//exit(1);
*/
strncpy (shm_env, fma_environment, sizeof (shm_env) - 1);	strncpy (shm_env, fma_environment, sizeof (shm_env) - 1);
init_log ();	init_log ();

Line 580 act_switch:	Line 586 act_switch:


case ACT_IMPORT:	case ACT_IMPORT:
	//printf ("opts[0] = %s\n", opts[0]);
fmadm_exit (fm_import (obj, optc, opts));	fmadm_exit (fm_import (obj, optc, opts));


Line 1366 int fm_daemonctl (short action, short ob	Line 1373 int fm_daemonctl (short action, short ob
envlist = (char ) malloc (sizeof (char) BIGSTR);	envlist = (char ) malloc (sizeof (char) BIGSTR);
NULLPTRCHK(envlist,"fm_daemonctl");	NULLPTRCHK(envlist,"fm_daemonctl");

ef = fopen (env_config_file, "r");	if ((ef = fopen (env_config_file, "r")) == NULL) {
	logprintf (FM_LOG_FATAL, "fm_daemonctl: failed to open %s (error code %d [%s])", env_config_file, errno, strerror (errno));
	}

while (fgets (line, 254, ef)) {	while (fgets (line, 254, ef)) {
if (line[0] == '[') {	if (line[0] == '[') {
strncpy (env, &(line[1]), 255);	strncpy (env, &(line[1]), 255);
Line 1543 void fm_configure (void)	Line 1552 void fm_configure (void)
char sysgbl[4096];	char sysgbl[4096];
char usrrtn[4096];	char usrrtn[4096];
char usrgbl[4096];	char usrgbl[4096];

char jnldir[4096];	char jnldir[4096];
char jnlfile[4096];	char jnlfile[4096];
char jnlmode[4];	char jnlmode[4];

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.40
changed lines
	Added in v.1.42