* utils.c (query): Remove test for energize from top. Now

handled in input_from_terminal_p().
This commit is contained in:
Stu Grossman 1992-09-15 05:04:08 +00:00
parent 5ca812d4fe
commit 3e3b0eb9d9
2 changed files with 34 additions and 13 deletions

View File

@ -1,5 +1,8 @@
Mon Sep 14 19:20:43 1992 Stu Grossman (grossman at cygnus.com) Mon Sep 14 19:20:43 1992 Stu Grossman (grossman at cygnus.com)
* utils.c (query): Remove test for energize from top. Now
handled in input_from_terminal_p().
* energize.c (send_location): New routine to consolidate all * energize.c (send_location): New routine to consolidate all
places where we must notify kernel of where the given pc is. places where we must notify kernel of where the given pc is.
(cplus_demangle): Put single-quotes around demangled names. (cplus_demangle): Put single-quotes around demangled names.

View File

@ -703,9 +703,19 @@ query (va_alist)
fflush (stdout); fflush (stdout);
va_start (args); va_start (args);
ctlstr = va_arg (args, char *); ctlstr = va_arg (args, char *);
energize_query (ctlstr, args);
vfprintf_filtered (stdout, ctlstr, args); vfprintf_filtered (stdout, ctlstr, args);
va_end (args);
printf_filtered ("(y or n) "); printf_filtered ("(y or n) ");
if (energize)
{
char *buf;
buf = energize_command_line_input(0, 0);
answer = buf ? *buf : 'Y';
energize_acknowledge_query(buf);
}
else
{
fflush (stdout); fflush (stdout);
answer = fgetc (stdin); answer = fgetc (stdin);
clearerr (stdin); /* in case of C-d */ clearerr (stdin); /* in case of C-d */
@ -718,6 +728,7 @@ query (va_alist)
clearerr (stdin); clearerr (stdin);
} }
while (ans2 != EOF && ans2 != '\n'); while (ans2 != EOF && ans2 != '\n');
}
if (answer >= 'a') if (answer >= 'a')
answer -= 040; answer -= 040;
if (answer == 'Y') if (answer == 'Y')
@ -725,6 +736,7 @@ query (va_alist)
if (answer == 'N') if (answer == 'N')
return 0; return 0;
printf_filtered ("Please answer y or n.\n"); printf_filtered ("Please answer y or n.\n");
va_end (args);
} }
} }
@ -991,6 +1003,12 @@ fputs_filtered (linebuffer, stream)
if (linebuffer == 0) if (linebuffer == 0)
return; return;
if (energize)
{
energize_fputs(linebuffer);
return;
}
/* Don't do any filtering if it is disabled. */ /* Don't do any filtering if it is disabled. */
if (stream != stdout if (stream != stdout
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX)) || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))