Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-25 22:07:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

libmisc/shell/edit: Fix closing the editor

Browse Source 
Closes #4564
This commit is contained in:
Chris Johns
2023-01-30 13:59:11 +11:00
parent 2243fd6d6b
commit 45f60cfbcf
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cpukit/libmisc/shell/main_edit.c
View File

@@ -1789,14 +1789,14 @@ static void save_editor(struct editor *ed) {
ed->refresh = 1;
}
static void close_editor(struct editor *ed) {
static struct editor* close_editor(struct editor *ed) {
struct env *env = ed->env;
if (ed->dirty) {
display_message(ed, "Close %s without saving changes (y/n)? ", ed->filename);
if (!ask()) {
ed->refresh = 1;
return;
return ed;
}
}
@@ -1808,6 +1808,7 @@ static void close_editor(struct editor *ed) {
new_file(ed, "");
}
ed->refresh = 1;
return ed;
}
static void pipe_command(struct editor *ed) {
@@ -2131,15 +2132,7 @@ static void edit(struct editor *ed) {
case ctrl('s'): save_editor(ed); break;
case ctrl('p'): pipe_command(ed); break;
#endif
#if defined(__rtems__)
/*
* Coverity spotted this as using ed after free() so changing
* the order of the statements.
*/
case ctrl('w'): ed = ed->env->current; close_editor(ed); break;
#else
case ctrl('w'): close_editor(ed); ed = ed->env->current; break;
#endif
case ctrl('w'): ed = close_editor(ed); break;
}
}
}