Instead of defining CONS_CLRHIST if it isn't defined, simply disable
the -c option [when CONS_CLRHIST isn't defined]. This is okay since the only time CONS_CLRHIST wouldn't be defined is when kbdcontrol is being built in bootstrap-tools, and -c isn't needed then. Submitted by: imp
This commit is contained in:
parent
92d08a4dcf
commit
50eb7c28e9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=77258
@ -44,16 +44,12 @@ static const char rcsid[] =
|
||||
#include "lex.h"
|
||||
|
||||
/*
|
||||
* PASTE and CONS_CLRHIST are't defined in 4.x, but we need them to
|
||||
* bridge to 5.0-current so define them here as a stop gap transition
|
||||
* measure.
|
||||
* PASTE isn't defined in 4.x, but we need it to bridge to 5.0-current
|
||||
* so define it here as a stop gap transition measure.
|
||||
*/
|
||||
#ifndef PASTE
|
||||
#define PASTE 0xa3 /* paste from cut-paste buffer */
|
||||
#endif
|
||||
#ifndef CONS_CLRHIST
|
||||
#define CONS_CLRHIST _IO('c', 10)
|
||||
#endif
|
||||
|
||||
char ctrl_names[32][4] = {
|
||||
"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
|
||||
@ -988,8 +984,12 @@ void
|
||||
clear_history()
|
||||
{
|
||||
|
||||
#ifdef CONS_CLRHIST
|
||||
if (ioctl(0, CONS_CLRHIST) == -1)
|
||||
warn("clear history buffer");
|
||||
#else
|
||||
warnx("clearing history not supported");
|
||||
#endif
|
||||
}
|
||||
|
||||
static char
|
||||
|
Loading…
Reference in New Issue
Block a user