head	1.3;
access;
symbols
	RELEASE_4_7_0:1.2
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.2;
locks; strict;
comment	@# @;


1.3
date	2002.11.27.15.38.37;	author vanilla;	state dead;
branches;
next	1.2;

1.2
date	2000.04.03.02.29.18;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	2000.04.02.11.18.21;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Fix build in -current.

PR:		ports/45710
Submitted by:	Statue <statue@@freebsd.sinica.edu.tw>
Obtained from:	japanese/kon2-*
@
text
@--- lib/font.c.orig	Sun Apr  2 18:56:50 2000
+++ lib/font.c	Sun Apr  2 18:57:54 2000
@@@@ -35,6 +35,7 @@@@
     struct shmid_ds shmseg;
 
     shmkey = ftok(CONFIG_NAME, fnum);
+    shmkey = 5000 + (fnum & 0x7F);
     if ((shmid = shmget(shmkey, sizeof(struct fontInfo), 0444)) < 0)
 	return;
     shmctl(shmid, IPC_STAT, &shmseg);
@@@@ -50,6 +51,7 @@@@
     int shmid;
 
     shmkey = ftok(CONFIG_NAME, fnum);
+    shmkey = 5000 + (fnum & 0x7F);
     if ((shmid = shmget(shmkey, sizeof(struct fontInfo), 0444)) < 0) return(0);
     return((u_char*)shmat(shmid, 0, SHM_RDONLY));
 }
--- fld/fld.c.orig	Sun Apr  2 18:59:37 2000
+++ fld/fld.c	Sun Apr  2 19:01:18 2000
@@@@ -55,7 +55,7 @@@@
 	int	shmid;
 	struct shmid_ds shmseg;
 
-	shmkey = ftok(CONFIG_NAME, fnum);
+	shmkey = 5000 + (fnum & 0x7F);
 	if ((shmid = shmget(shmkey, sizeof(struct fontInfo), 0444)) < 0)
 	return;
 	shmctl(shmid, IPC_STAT, &shmseg);
@@@@ -70,7 +70,7 @@@@
 	extern int forceLoad;
 
 	if (forceLoad) return(EOF);
-	shmkey = ftok(SHMEM_NAME, fnum);
+	shmkey = 5000 + (fnum & 0x7F);
 	if (shmget(shmkey, 1, 0444) == EOF) return(EOF);
 	return(0);
 }
@@@@ -82,7 +82,7 @@@@
 	int	shmid;
 	u_char *shmbuff;
 
-	shmkey = ftok(SHMEM_NAME, fi->type);
+	shmkey = 5000 + (fi->type & 0x0000007F);
 	shmid = shmget(shmkey, fi->size+sizeof(struct fontInfo),
 		   IPC_CREAT|0666);
 	fprintf( stderr,"%ld\n",fi->size+sizeof(struct fontInfo) );
@@@@ -120,7 +120,7 @@@@
 	int shmid;
 	struct fontInfo *fi;
 
-	shmkey = ftok(CONFIG_NAME, fnum);
+	shmkey = 5000 + (fnum & 0x7F);
 	if ((shmid = shmget(shmkey, sizeof(struct fontInfo), 0444)) < 0)
 	return(0);
 	fi = (struct fontInfo*)shmat(shmid, 0, SHM_RDONLY);
@


1.2
log
@Remove a foolish patch.
@
text
@@


1.1
log
@Add a patch for vga_cursor.
@
text
@a0 18
--- lib/coding.c.orig	Sun Apr  2 18:56:03 2000
+++ lib/coding.c	Sun Apr  2 18:56:36 2000
@@@@ -140,13 +140,13 @@@@
 
     i = 0;
     while (fSRegs[i].registry) {
-	if (!strcasecmp(fSRegs[i].registry, reg))
+	if (!strncasecmp(fSRegs[i].registry, reg, strlen(reg)))
 	    return(i|CHR_SFLD);
 	i ++;
     }
     i = 0;
     while (fDRegs[i].registry) {
-	if (!strcasecmp(fDRegs[i].registry, reg))
+	if (!strncasecmp(fDRegs[i].registry, reg, strlen(reg)))
 	    return(i|CHR_DFLD);
 	i ++;
     }
@

