svn commit: r283165 - stable/10/usr.sbin/kbdmap

Ed Maste emaste at FreeBSD.org
Thu May 21 01:50:07 UTC 2015


Author: emaste
Date: Thu May 21 01:50:06 2015
New Revision: 283165
URL: https://svnweb.freebsd.org/changeset/base/283165

Log:
  MFC r282904: kbdmap(1): increase description size to 256 bytes
  
    After conversion to UTF-8 some INDEX.keymaps descriptions are longer
    than the previous limit of 64 bytes.
  
  PR:		193656

Modified:
  stable/10/usr.sbin/kbdmap/kbdmap.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/kbdmap/kbdmap.c
==============================================================================
--- stable/10/usr.sbin/kbdmap/kbdmap.c	Thu May 21 01:47:12 2015	(r283164)
+++ stable/10/usr.sbin/kbdmap/kbdmap.c	Thu May 21 01:50:06 2015	(r283165)
@@ -571,7 +571,7 @@ menu_read(void)
 	char *p;
 	int mark, num_keymaps, items, i;
 	char buffer[256], filename[PATH_MAX];
-	char keym[64], lng[64], desc[64];
+	char keym[64], lng[64], desc[256];
 	char dialect[64], lang_abk[64];
 	struct keymap *km;
 	struct keymap **km_sorted;
@@ -616,7 +616,7 @@ menu_read(void)
 				continue;
 
 			/* Parse input, removing newline */
-			matches = sscanf(p, "%64[^:]:%64[^:]:%64[^:\n]", 
+			matches = sscanf(p, "%64[^:]:%64[^:]:%256[^:\n]", 
 			    keym, lng, desc);
 			if (matches == 3) {
 				if (strcmp(keym, "FONT")


More information about the svn-src-all mailing list