patch-2.1.4 linux/drivers/char/consolemap.c

• Lines: 41
• Date: Sun Oct 13 21:11:10 1996
• Orig file: v2.1.3/linux/drivers/char/consolemap.c
• Orig date: Sat Jun 8 16:14:39 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/char/consolemap.c linux/drivers/char/consolemap.c
@@ -233,8 +233,11 @@
 	if (i)
 		return i;
 
-	for (i=0; i<E_TABSZ ; i++)
-		p[i] = UNI_DIRECT_BASE | get_user(arg+i);
+	for (i=0; i<E_TABSZ ; i++) {
+		unsigned char uc;
+		get_user(uc, arg+i);
+		p[i] = UNI_DIRECT_BASE | uc;
+	}
 
 	set_inverse_transl(USER_MAP);
 	return 0;
@@ -267,8 +270,11 @@
 	if (i)
 		return i;
 
-	for (i=0; i<E_TABSZ ; i++)
-	  p[i] = get_user(arg+i);
+	for (i=0; i<E_TABSZ ; i++) {
+		unsigned short us;
+		get_user(us, arg+i);
+		p[i] = us;
+	}
 
 	set_inverse_transl(USER_MAP);
 	return 0;
@@ -374,8 +380,10 @@
 
   while( ct-- )
     {
-      if ( (err1 = con_insert_unipair(get_user(&list->unicode),
-				      get_user(&list->fontpos))) != 0 )
+      unsigned short unicode, fontpos;
+      get_user(unicode, &list->unicode);
+      get_user(fontpos, &list->fontpos);
+      if ( (err1 = con_insert_unipair(unicode,fontpos)) != 0 )
 	err = err1;
       list++;
     }