summaryrefslogtreecommitdiff
path: root/usr.bin/infocmp/infocmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/infocmp/infocmp.c')
-rw-r--r--usr.bin/infocmp/infocmp.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.bin/infocmp/infocmp.c b/usr.bin/infocmp/infocmp.c
index 854cd689677..e4263156b2f 100644
--- a/usr.bin/infocmp/infocmp.c
+++ b/usr.bin/infocmp/infocmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: infocmp.c,v 1.11 2000/10/08 22:47:12 millert Exp $ */
+/* $OpenBSD: infocmp.c,v 1.12 2001/01/22 18:02:18 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
@@ -43,7 +43,7 @@
#include <term_entry.h>
#include <dump_entry.h>
-MODULE_ID("$From: infocmp.c,v 1.57 2000/10/01 01:26:25 tom Exp $")
+MODULE_ID("$From: infocmp.c,v 1.59 2000/11/05 00:22:07 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
@@ -951,7 +951,7 @@ name_initializer(const char *type)
(void) sprintf(initializer, "%s_data_%s", type, entries->tterm.term_names);
for (s = initializer; *s != 0 && *s != '|'; s++) {
- if (!isalnum(*s))
+ if (!isalnum(CharOf(*s)))
*s = '_';
}
*s = 0;
@@ -1031,10 +1031,13 @@ dump_initializers(TERMTYPE * term)
for (sp = term->Strings[n];
*sp != 0 && (tp - buf) < MAX_STRING - 6;
sp++) {
- if (isascii(*sp) && isprint(*sp) && *sp != '\\' && *sp != '"')
+ if (isascii(CharOf(*sp))
+ && isprint(CharOf(*sp))
+ && *sp != '\\'
+ && *sp != '"')
*tp++ = *sp;
else {
- (void) sprintf(tp, "\\%03o", *sp & 0xff);
+ (void) sprintf(tp, "\\%03o", CharOf(*sp));
tp += 4;
}
}