741bf840da
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
27 lines
769 B
Diff
27 lines
769 B
Diff
diff --git a/com32/include/menu.h b/com32/include/menu.h
|
|
index bc0182f..b0251e4 100644
|
|
--- a/com32/include/menu.h
|
|
+++ b/com32/include/menu.h
|
|
@@ -195,7 +195,7 @@ void local_cursor_enable(bool);
|
|
|
|
static inline int my_isspace(char c)
|
|
{
|
|
- return (unsigned char)c <= ' ';
|
|
+ return (unsigned char)c <= ' ' || (unsigned char)c == '\x7f';
|
|
}
|
|
|
|
int my_isxdigit(char c);
|
|
diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c
|
|
index b7814be..a433fad 100644
|
|
--- a/com32/menu/readconfig.c
|
|
+++ b/com32/menu/readconfig.c
|
|
@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src)
|
|
char c;
|
|
|
|
while ((c = *src++)) {
|
|
- if (c <= ' ' && c == '\x7f') {
|
|
+ if (my_isspace(c)) {
|
|
if (!was_space)
|
|
*dst++ = '_';
|
|
was_space = true;
|