Consistent unicode handling in buffer-position (CTL-X =) and $curchar.

eval.c

@@ -686,10 +686,13 @@ static char *gtenv( char *vname) {
 		return i_to_a(gacount);
 	case EVLASTKEY:
 		return i_to_a(lastkey);
-	case EVCURCHAR:
+	case EVCURCHAR: {
-		return (curwp->w_dotp->l_used ==
+			unicode_t c ;
-			curwp->w_doto ? i_to_a('\n') :
+
-			i_to_a(lgetc(curwp->w_dotp, curwp->w_doto)));
+			lgetchar( &c) ;
+			return i_to_a( c) ;
+		}
+	
 	case EVDISCMD:
 		return ltos(discmd);
 	case EVVERSION:

line.c

@@ -398,22 +398,20 @@ int linsert( int n, unicode_t c) {
 		return rdonly();	/* we are in read only mode     */
 
 	if( n > 0) {
-		char utf8[ 6] ;
+		char utf8[ 4] ;
-		int bytes, i ;
+		int bytes ;
 
 		bytes = unicode_to_utf8(c, utf8) ;
 		if (bytes == 1)
 			return linsert_byte(n, (unsigned char) utf8[0]);
 
-		for (i = 0; i < n; i++) {
+		do {
 			int j ;
 
-			for (j = 0; j < bytes; j++) {
+			for( j = 0 ; j < bytes ; j += 1)
-				unsigned char c = utf8[j];
+				if( !linsert_byte( 1, (unsigned char) utf8[ j]))
-				if (!linsert_byte(1, c))
 					return FALSE ;
-			}
+		} while( --n > 0) ;
-		}
 	}
 
 	return TRUE;
@@ -520,11 +518,13 @@ int lnewline(void)
 	return TRUE;
 }
 
-int lgetchar(unicode_t *c)
+int lgetchar( unicode_t *c) {
-{
+	if( curwp->w_dotp->l_used == curwp->w_doto) {
-	int len = llength(curwp->w_dotp);
+		*c = (curbp->b_mode & MDDOS) ? '\r' : '\n' ;
-	char *buf = curwp->w_dotp->l_text;
+		return 1 ;
-	return utf8_to_unicode(buf, curwp->w_doto, len, c);
+	} else
+		return utf8_to_unicode( curwp->w_dotp->l_text, curwp->w_doto,
+												llength( curwp->w_dotp), c) ;
 }
 
 /*

random.c

@@ -86,20 +86,12 @@ int showcpos(int f, int n)
 	numlines = 0;
 	predchars = 0;
 	predlines = 0;
-	curchar = 0;
+	bytes = lgetchar( &curchar) ;
-	bytes = 1 ;
 	for( lp = lforw( curbp->b_linep) ; lp != curbp->b_linep ; lp = lforw( lp)) {
 		/* if we are on the current line, record it */
 		if (lp == curwp->w_dotp) {
-			int len ;
-			
 			predlines = numlines;
 			predchars = numchars + curwp->w_doto;
-			len = llength( lp) ;				
-			if( (curwp->w_doto) == len)
-				curchar = (curbp->b_mode & MDDOS) ? '\r' : '\n' ;
-			else
-				bytes = utf8_to_unicode( lp->l_text, curwp->w_doto, len, &curchar) ;
 		}
 		/* on to the next line */
 		++numlines;

termio.c

@@ -276,29 +276,14 @@ void ttclose(void)
 }
 
 /*
- * Write a character to the display. On VMS, terminal output is buffered, and
+ * Write a character to the display.
- * we just put the characters in the big array, after checking for overflow.
- * On CPM terminal I/O unbuffered, so we just write the byte out. Ditto on
- * MS-DOS (use the very very raw console output routine).
  */
 int ttputc( unicode_t c) {
-#if     VMS
+	char utf8[ 4] ;
-    if (nobuf >= NOBUF)
-        ttflush();
-    obuf[nobuf++] = c;
-#endif
-
-#if MSDOS & ~IBMPC
-    bdos(6, c, 0);
-#endif
-
-#if     V7 | USG | BSD
-    char utf8[6];
 	int bytes ;
 
 	bytes = unicode_to_utf8( c, utf8) ;
 	fwrite( utf8, 1, bytes, stdout) ;
-#endif
 	return 0 ;
 }
 

utf8.c

@@ -66,15 +66,6 @@ unsigned utf8_to_unicode(char *line, unsigned index, unsigned len, unicode_t *re
     return bytes;
 }
 
-static void reverse_string(char *begin, char *end)
-{
-    do {
-        char a = *begin, b = *end;
-        *end = a; *begin = b;
-        begin++; end--;
-    } while (begin < end);
-}
-
 /*
  * unicode_to_utf8()
  *
@@ -108,8 +99,13 @@ unsigned unicode_to_utf8( unicode_t c, char *utf8) {
             c >>= 6 ;
         } while( c >= prefix) ;
 
-        *p = (char) (c - 2 * prefix) ;
+		*p-- = *utf8 ;
-        reverse_string( utf8, p) ;
+		*utf8++ = (char) (c - 2 * prefix) ;
+		if( utf8 < p) {	/* swap middle two bytes if 4 bytes utf-8 code */
+			char c = *p ;
+			*p = *utf8 ;
+			*utf8 = c ;
+		}
     }
 
     return bytes ;