d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If PASTE isn't defined, define it as a transitional measure. This

Browse Source 
allows me to complete make buildworld on my stable machine.

Also change termination case to be clearer what is going on while
searching for map files.
This commit is contained in:
imp 2001-05-15 22:53:05 +00:00
parent 0f88f52bf4
commit e96335e5e0
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/kbdcontrol/kbdcontrol.c
View File

@ -43,6 +43,14 @@ static const char rcsid[] =
#include "path.h"
#include "lex.h"
/*
* 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
char ctrl_names[32][4] = {
"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
"bs ", "ht ", "nl ", "vt ", "ff ", "cr ", "so ", "si ",
@ -755,12 +763,13 @@ load_keymap(char *opt, int dumponly)
if (cp != NULL)
asprintf(&(prefix[0]), "%s/", cp);
for (i=0; prefix[i]; i++)
for (j=0; postfix[j]; j++) {
fd = NULL;
for (i=0; prefix[i] && fd == NULL; i++) {
for (j=0; postfix[j] && fd == NULL; j++) {
name = mkfullname(prefix[i], opt, postfix[j]);
if ((fd = fopen(name, "r")))
prefix[i + 1] = postfix[j + 1] = NULL;
fd = fopen(name, "r");
}
}
if (fd == NULL) {
warn("keymap file not found");
return;
@ -1128,5 +1137,3 @@ main(int argc, char **argv)
usage();
exit(0);
}