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.14 and 1.18

version 1.14, 2025/03/24 20:57:06	version 1.18, 2025/03/31 16:33:56
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.18 2025/03/31 16:33:56 snw
	* Work on fmadm edit global
	*
	* Revision 1.17 2025/03/30 01:36:58 snw
	* Make it easier to bring back fma_gedit, fix double-free in global handler, limit $CHAR to 7-bit ASCII
	*
	* Revision 1.16 2025/03/24 20:59:58 snw
	* Try using DosCopy API instead of built-in cp function on OS/2
	*
	* Revision 1.15 2025/03/24 20:58:05 snw
	* Try using DosCopy API instead of built-in cp function on OS/2
	*
* Revision 1.14 2025/03/24 20:57:06 snw	* Revision 1.14 2025/03/24 20:57:06 snw
* Try using DosCopy API instead of built-in cp function on OS/2	* Try using DosCopy API instead of built-in cp function on OS/2
*	*
Line 1046 int fm_edit (short object, int optc, cha	Line 1058 int fm_edit (short object, int optc, cha
case OBJ_ROUTINE:	case OBJ_ROUTINE:
return fma_routines_edit (optc, options);	return fma_routines_edit (optc, options);

/*
case OBJ_GLOBAL:	case OBJ_GLOBAL:
return fma_globals_edit (optc, options);	return fma_globals_edit (optc, options);
*/

default:	default:
fprintf (stderr, "fmadm: 'edit' is an invalid action for '%s'\n", obj_str);	fprintf (stderr, "fmadm: 'edit' is an invalid action for '%s'\n", obj_str);
return 1;	return 1;
Line 1085 void fm_reconfigure(void)	Line 1095 void fm_reconfigure(void)
retval = rename (config_file, config_backup);	retval = rename (config_file, config_backup);

if (retval == 0) {	if (retval == 0) {
fprintf (stderr, "[OK]\n\n");	fprintf (stderr, "[OK]\n");

fm_configure ();	fm_configure ();

Line 1144 void fm_configure (void)	Line 1154 void fm_configure (void)
}	}

if (file_exists (config_file)) {	if (file_exists (config_file)) {
fprintf (stderr, "fmadm: '%s' already exists.\n\n", config_file);	fprintf (stderr, "fmadm: '%s' already exists; running fmadm reconfigure instead\n", config_file);
fprintf (stderr, "'fmadm configure' may only be used on a fresh installation of FreeM.\n");	fm_reconfigure ();
exit (1);	return;
}	}


Line 1171 void fm_configure (void)	Line 1181 void fm_configure (void)

fprintf (stderr, "fmadm: running on OS/2; will copy %s to %s\n", srcfile, dstfile);	fprintf (stderr, "fmadm: running on OS/2; will copy %s to %s\n", srcfile, dstfile);

if (DosCopy (srcfile, dstfile) != 0) {	if (DosCopy (srcfile, dstfile, 1) != 0) {
fprintf (stderr, "fmadm: fatal error copying %s to %s\n", srcfile, dstfile);	fprintf (stderr, "fmadm: fatal error copying %s to %s\n", srcfile, dstfile);
exit (1);	exit (1);
}	}

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

Removed from v.1.14
changed lines
	Added in v.1.18