--- freem/src/xecline.c 2025/04/30 14:41:03 1.19 +++ freem/src/xecline.c 2025/05/14 12:22:04 1.24 @@ -1,5 +1,5 @@ /* - * $Id: xecline.c,v 1.19 2025/04/30 14:41:03 snw Exp $ + * $Id: xecline.c,v 1.24 2025/05/14 12:22:04 snw Exp $ * freem interpreter proper * * @@ -24,6 +24,21 @@ * along with FreeM. If not, see . * * $Log: xecline.c,v $ + * Revision 1.24 2025/05/14 12:22:04 snw + * Further work on shared memory + * + * Revision 1.23 2025/05/06 16:10:06 snw + * Add extra blank before readline call on NetBSD + * + * Revision 1.22 2025/05/05 14:53:17 snw + * Modify rpm spec to include documentation TODO + * + * Revision 1.21 2025/05/01 17:02:30 snw + * Further debugging improvements + * + * Revision 1.20 2025/04/30 17:19:16 snw + * Improve backtraces in debugger + * * Revision 1.19 2025/04/30 14:41:03 snw * Further debugger work * @@ -174,7 +189,6 @@ int xecline(int typ) short new_and_set = FALSE; short new_object = FALSE; short destructor_run = FALSE; - short debug_mode = FALSE; short libcall = FALSE; char *namold; long rouoldc; @@ -197,6 +211,7 @@ int xecline(int typ) char *reeval_codptr; char reeval_code[512]; + char entryref[256]; int i; int j; @@ -247,9 +262,9 @@ int xecline(int typ) next_line: /* entry point for next command line */ if (debug_mode) { - debug_mode = debugger (DEBENTRY_LINE, codptr); + debug_mode = debugger (DEBENTRY_LINE, entryref); } - + job_set_status (pid, JSTAT_INTERPRETER); if (then_ctr > 0) { @@ -297,8 +312,9 @@ next_line: /* entry point for n codptr = code; next_cmnd: /* continue line entry point */ + getraddress (entryref, nstx); if (debug_mode) { - debug_mode = debugger (DEBENTRY_CMD, codptr); + debug_mode = debugger (DEBENTRY_CMD, entryref); } if (sigint_in_for) goto for_quit; @@ -4956,7 +4972,8 @@ open_socket: if (merr () > OK) break; } else { - halt:i = 0; +halt: + i = 0; } cleanup (); @@ -6802,14 +6819,6 @@ err: stcpy (er_buf, errmes[merr ()]); stcnv_m2c (er_buf); - - /* - if (usermode == 1 && ztrap[nstx][0] == EOL && etrap[0] == '\0') { - debug_mode = TRUE; - debugger (DEBENTRY_ERROR, codptr); - } - */ - #if !defined(MSDOS) logprintf (FM_LOG_DEBUG, "xecline: interpreter error %d [%s]", ierr, er_buf); @@ -7284,7 +7293,11 @@ direct_mode: set_io (UNIX); job_set_status (pid, JSTAT_DIRECTMODE); - + +#if defined(__NetBSD__) + printf ("\r\n"); +#endif + /* readline() does its own malloc() */ fmrl_buf = readline (fmrl_prompt); @@ -7295,6 +7308,7 @@ direct_mode: goto halt; } + if (strlen (fmrl_buf) > 0) { add_history (fmrl_buf);