===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/infocmp/infocmp.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/infocmp/infocmp.c	2000/10/08 22:47:12	1.11
--- src/usr.bin/infocmp/infocmp.c	2001/01/22 18:02:18	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: infocmp.c,v 1.11 2000/10/08 22:47:12 millert Exp $	*/
  
  /****************************************************************************
   * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
--- 1,4 ----
! /*	$OpenBSD: infocmp.c,v 1.12 2001/01/22 18:02:18 millert Exp $	*/
  
  /****************************************************************************
   * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
***************
*** 43,49 ****
  #include <term_entry.h>
  #include <dump_entry.h>
  
! MODULE_ID("$From: infocmp.c,v 1.57 2000/10/01 01:26:25 tom Exp $")
  
  #define L_CURL "{"
  #define R_CURL "}"
--- 43,49 ----
  #include <term_entry.h>
  #include <dump_entry.h>
  
! MODULE_ID("$From: infocmp.c,v 1.59 2000/11/05 00:22:07 tom Exp $")
  
  #define L_CURL "{"
  #define R_CURL "}"
***************
*** 951,957 ****
  
      (void) sprintf(initializer, "%s_data_%s", type, entries->tterm.term_names);
      for (s = initializer; *s != 0 && *s != '|'; s++) {
! 	if (!isalnum(*s))
  	    *s = '_';
      }
      *s = 0;
--- 951,957 ----
  
      (void) sprintf(initializer, "%s_data_%s", type, entries->tterm.term_names);
      for (s = initializer; *s != 0 && *s != '|'; s++) {
! 	if (!isalnum(CharOf(*s)))
  	    *s = '_';
      }
      *s = 0;
***************
*** 1031,1040 ****
  	    for (sp = term->Strings[n];
  		 *sp != 0 && (tp - buf) < MAX_STRING - 6;
  		 sp++) {
! 		if (isascii(*sp) && isprint(*sp) && *sp != '\\' && *sp != '"')
  		    *tp++ = *sp;
  		else {
! 		    (void) sprintf(tp, "\\%03o", *sp & 0xff);
  		    tp += 4;
  		}
  	    }
--- 1031,1043 ----
  	    for (sp = term->Strings[n];
  		 *sp != 0 && (tp - buf) < MAX_STRING - 6;
  		 sp++) {
! 		if (isascii(CharOf(*sp))
! 		    && isprint(CharOf(*sp))
! 		    && *sp != '\\'
! 		    && *sp != '"')
  		    *tp++ = *sp;
  		else {
! 		    (void) sprintf(tp, "\\%03o", CharOf(*sp));
  		    tp += 4;
  		}
  	    }