freem/src/merr.c - diff

Return to merr.c CVS log

Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/merr.c between versions 1.1.1.1 and 1.8

version 1.1.1.1, 2025/01/19 02:04:04	version 1.8, 2025/05/03 04:12:34
Line 1	Line 1
/*	/*
* *	* $Id$
* * *
* * *
* ***************
* * * * *
* * MUMPS *
* * * * *
* ***************
* * *
* * *
* *
*
* merr.c
* stuff for handling program bogosity	* stuff for handling program bogosity
*	*
*	*
* Author: Serena Willis <jpw@coherent-logic.com>	* Author: Serena Willis <snw@coherent-logic.com>
* Copyright (C) 1998 MUG Deutschland	* Copyright (C) 1998 MUG Deutschland
* Copyright (C) 2020 Coherent Logic Development LLC	* Copyright (C) 2020, 2025 Coherent Logic Development LLC
*	*
*	*
* This file is part of FreeM.	* This file is part of FreeM.
Line 35	Line 23
* You should have received a copy of the GNU Affero Public License	* You should have received a copy of the GNU Affero Public License
* along with FreeM. If not, see <https://www.gnu.org/licenses/>.	* along with FreeM. If not, see <https://www.gnu.org/licenses/>.
*	*
	* $Log$
	* Revision 1.8 2025/05/03 04:12:34 snw
	* Fix user-defined error codes
	*
	* Revision 1.7 2025/05/01 03:56:29 snw
	* -m
	*
	* Revision 1.6 2025/04/30 17:19:16 snw
	* Improve backtraces in debugger
	*
	* Revision 1.5 2025/04/13 04:22:43 snw
	* Fix snprintf calls
	*
	* Revision 1.4 2025/04/09 19:52:02 snw
	* Eliminate as many warnings as possible while building with -Wall
	*
	* Revision 1.3 2025/03/09 19:50:47 snw
	* Second phase of REUSE compliance and header reformat
	*
	*
	* SPDX-FileCopyrightText: (C) 2025 Coherent Logic Development LLC
	* SPDX-License-Identifier: AGPL-3.0-or-later
**/	**/

#include <string.h>	#include <string.h>
Line 208 err_lut errtab[] = {	Line 218 err_lut errtab[] = {

inline int merr_raise(int num)	inline int merr_raise(int num)
{	{
char place[256];	char placebuf[256];
char cod[256];	char lref[256];

	if (num != OK) {
	lasterr[nstx] = ierr;
	}

if (merr_in_break ()) {	if (merr_in_break ()) {
ierr = num - CTRLB;	ierr = num - CTRLB;
Line 221 inline int merr_raise(int num)	Line 235 inline int merr_raise(int num)
if (num != OK) {	if (num != OK) {
merr_set_ecode_ierr ();	merr_set_ecode_ierr ();

stcpy (merr_stack[nstx].MCODE, code);
stcpy (merr_stack[nstx].ECODE, ecode);	stcpy (merr_stack[nstx].ECODE, ecode);

if (direct_mode == 1 && nstx == 0) {	if (direct_mode == 1 && nstx == 0) {
stcpy (merr_stack[nstx].PLACE, "@\201\0");	stcpy (merr_stack[nstx].PLACE, "@\201\0");
	stcpy (merr_stack[nstx].MCODE, " \201\0");
}	}
else {	else {
if (!rtn_get_offset (merr_stack[nstx].PLACE)) {	getraddress (placebuf, nstx);
stcpy (merr_stack[nstx].PLACE, "???\201");	stcpy (merr_stack[nstx].PLACE, &(placebuf[3]));
	stcpy (lref, merr_stack[nstx].PLACE);
	stcnv_m2c (lref);
	if (routine_get_line (lref, merr_stack[nstx].MCODE) == NULL) {
	sprintf (merr_stack[nstx].MCODE, "???\201");
	}
	else {
	stcnv_c2m (merr_stack[nstx].MCODE);
}	}
}	}

if (nstx > merr_topstk) merr_topstk = nstx;	if (nstx > merr_topstk) merr_topstk = nstx;
}	}

return ierr;	return ierr;
}	}
Line 308 void merr_set_ecode_ierr (void)	Line 329 void merr_set_ecode_ierr (void)
char *cod;	char *cod;
char *t;	char *t;

cod = (char ) malloc (256 sizeof (char));	cod = (char ) malloc (MERR_COD_LENGTH sizeof (char));
NULLPTRCHK(cod,"merr_set_ecode_ierr");	NULLPTRCHK(cod,"merr_set_ecode_ierr");

t = (char ) malloc (256 sizeof (char));	t = (char ) malloc (MERR_COD_LENGTH sizeof (char));
NULLPTRCHK(t,"merr_set_ecode_ierr");	NULLPTRCHK(t,"merr_set_ecode_ierr");

if ((merr_num_to_code (merr (), cod)) == -1) goto done;	if ((merr_num_to_code (merr (), cod)) == -1) goto done;

snprintf (t, 255, ",%s,\201", cod);	snprintf (t, MERR_COD_LENGTH - 1, ",%s,\201", cod);
merr_set_ecode (t);	merr_set_ecode (t);

job_set_ecode (pid, cod);	job_set_ecode (pid, cod);
Line 406 void merr_dump (int num, char *rtn, char	Line 427 void merr_dump (int num, char *rtn, char
snprintf (tbuf, STRLEN - 1, "^$JOB\202%d\202USER_ERRORS\202%s\201", pid, &user_ecode[1]);	snprintf (tbuf, STRLEN - 1, "^$JOB\202%d\202USER_ERRORS\202%s\201", pid, &user_ecode[1]);
tbuf [stlen (tbuf) - 1] = '\201';	tbuf [stlen (tbuf) - 1] = '\201';

global (get_sym, tbuf, dbuf);	ssvn (get_sym, tbuf, dbuf);

if (merr () == OK) {	if (merr () == OK) {
stcpy (nem, dbuf);	stcpy (nem, dbuf);
Line 421 void merr_dump (int num, char *rtn, char	Line 442 void merr_dump (int num, char *rtn, char
strcpy (real_ecode, p->canonical_name);	strcpy (real_ecode, p->canonical_name);
}	}



if (!stlen (err_suppl)) {	if (!stlen (err_suppl)) {
sprintf (tbuf, "\r\n>> Error %s: %s in %s.%s::%s [$STACK = %d]\r\n\201", real_ecode, nem, shm_env, nsn, nrt, nstx);	snprintf (tbuf, STRLEN - 1, "\r\n>> Error %s: %s in %s.%s::%s [$STACK = %d]\r\n\201", real_ecode, nem, shm_env, nsn, nrt, nstx);
}	}
else {	else {
stcnv_m2c (err_suppl);	stcnv_m2c (err_suppl);
sprintf (tbuf, "\r\n>> Error %s: %s (%s) in %s::%s [$STACK = %d]\r\n\201", real_ecode, nem, err_suppl, nsn, nrt, nstx);	snprintf (tbuf, STRLEN - 1, "\r\n>> Error %s: %s (%s) in %s::%s [$STACK = %d]\r\n\201", real_ecode, nem, err_suppl, nsn, nrt, nstx);
err_suppl[0] = EOL;	err_suppl[0] = EOL;
}	}
write_m (tbuf);	write_m (tbuf);

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

Removed from v.1.1.1.1
changed lines
	Added in v.1.8