firebird-checkins — CVS checkins

[Firebird-checkins] CVS: interbase/intl anczech.h,1.1.1.1,1.2

[Pavel C. <pc...@us...>]

Update of /cvsroot/firebird/interbase/intl
In directory usw-pr-cvs1:/tmp/cvs-serv7090

Modified Files:
	anczech.h 
Log Message:
PXW_CSZ correction - CH character

Index: anczech.h
===================================================================
RCS file: /cvsroot/firebird/interbase/intl/anczech.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** anczech.h	2000/08/03 20:44:13	1.1.1.1
--- anczech.h	2001/01/17 14:23:48	1.2
***************
*** 15,19 ****
   *
   * All Rights Reserved.
!  * Contributor(s): ______________________________________.
   */
  /*--------------------------------------------------------*/
--- 15,20 ----
   *
   * All Rights Reserved.
!  * Contributor(s): Karel Brichnac <br...@at...>
!  *                       ______________________________________.
   */
  /*--------------------------------------------------------*/
***************
*** 68,72 ****
  
  
! #define NUM_COMPRESS_CHARS          0
  
  
--- 69,73 ----
  
  
! #define NUM_COMPRESS_CHARS          4
  
  
***************
*** 160,164 ****
  /* End of langdrv/anczech.def */
  
! #define MAX_NCO_PRIMARY  	152
  #define MAX_NCO_SECONDARY	 11
  #define MAX_NCO_TERTIARY 	  0
--- 161,165 ----
  /* End of langdrv/anczech.def */
  
! #define MAX_NCO_PRIMARY  	153
  #define MAX_NCO_SECONDARY	 11
  #define MAX_NCO_TERTIARY 	  0
***************
*** 697,700 ****
--- 698,705 ----
  
  static CONST struct CompressPair CompressTbl [ NUM_COMPRESS_CHARS + 1 ] = {
+ { {99, 104}, { FIRST_PRIMARY+  74, FIRST_SECONDARY+0, NULL_TERTIARY, 0, 0 }, { FIRST_PRIMARY+  74, FIRST_SECONDARY+0, NULL_TERTIARY, 0, 0 } },
+ { {67, 104}, { FIRST_PRIMARY+  74, FIRST_SECONDARY+1, NULL_TERTIARY, 0, 0 }, { FIRST_PRIMARY+  74, FIRST_SECONDARY+1, NULL_TERTIARY, 0, 0 } },
+ { {99, 72}, { FIRST_PRIMARY+  74, FIRST_SECONDARY+2, NULL_TERTIARY, 0, 0 }, { FIRST_PRIMARY+  74, FIRST_SECONDARY+2, NULL_TERTIARY, 0, 0 } },
+ { {67, 72}, { FIRST_PRIMARY+  74, FIRST_SECONDARY+3, NULL_TERTIARY, 0, 0 }, { FIRST_PRIMARY+  74, FIRST_SECONDARY+3, NULL_TERTIARY, 0, 0 } },
  { {0, 0}, {   0,   0,   0,   0,   0 }, {   0,   0,   0,   0,   0 } } /*END OF TABLE */
  };
***************
*** 768,772 ****
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  65 A */
  { FIRST_PRIMARY+ 66, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  66 B */
! { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  67 C */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  68 D */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  69 E */
--- 773,777 ----
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  65 A */
  { FIRST_PRIMARY+ 66, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  66 B */
! { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 1 }, /*  67 C */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  68 D */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  69 E */
***************
*** 774,804 ****
  { FIRST_PRIMARY+ 72, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  71 G */
  { FIRST_PRIMARY+ 73, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  72 H */
! { FIRST_PRIMARY+ 74, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  73 I */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  74 J */
! { FIRST_PRIMARY+ 76, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  75 K */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  76 L */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  77 M */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  78 N */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  79 O */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  80 P */
! { FIRST_PRIMARY+ 82, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  81 Q */
! { FIRST_PRIMARY+ 83, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  82 R */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  83 S */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  84 T */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  85 U */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  86 V */
! { FIRST_PRIMARY+ 90, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  87 W */
! { FIRST_PRIMARY+ 91, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  88 X */
! { FIRST_PRIMARY+ 92, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  89 Y */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  90 Z */
! { FIRST_PRIMARY+ 95, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  91 [ */
! { FIRST_PRIMARY+ 96, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  92 \ */
! { FIRST_PRIMARY+ 97, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  93 ] */
! { FIRST_PRIMARY+ 98, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  94 ^ */
! { FIRST_PRIMARY+ 99, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  95 _ */
! { FIRST_PRIMARY+100, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  96 ` */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /*  97 a */
  { FIRST_PRIMARY+ 66, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /*  98 b */
! { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /*  99 c */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 100 d */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 101 e */
--- 779,809 ----
  { FIRST_PRIMARY+ 72, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  71 G */
  { FIRST_PRIMARY+ 73, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  72 H */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  73 I */
! { FIRST_PRIMARY+ 76, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  74 J */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  75 K */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  76 L */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  77 M */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  78 N */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  79 O */
! { FIRST_PRIMARY+ 82, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  80 P */
! { FIRST_PRIMARY+ 83, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  81 Q */
! { FIRST_PRIMARY+ 84, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  82 R */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  83 S */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  84 T */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  85 U */
! { FIRST_PRIMARY+ 90, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  86 V */
! { FIRST_PRIMARY+ 91, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  87 W */
! { FIRST_PRIMARY+ 92, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  88 X */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  89 Y */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /*  90 Z */
! { FIRST_PRIMARY+ 96, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  91 [ */
! { FIRST_PRIMARY+ 97, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  92 \ */
! { FIRST_PRIMARY+ 98, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  93 ] */
! { FIRST_PRIMARY+ 99, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  94 ^ */
! { FIRST_PRIMARY+100, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  95 _ */
! { FIRST_PRIMARY+101, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*  96 ` */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /*  97 a */
  { FIRST_PRIMARY+ 66, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /*  98 b */
! { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 1 }, /*  99 c */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 100 d */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 101 e */
***************
*** 806,902 ****
  { FIRST_PRIMARY+ 72, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 103 g */
  { FIRST_PRIMARY+ 73, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 104 h */
! { FIRST_PRIMARY+ 74, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 105 i */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 106 j */
! { FIRST_PRIMARY+ 76, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 107 k */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 108 l */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 109 m */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 110 n */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 111 o */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 112 p */
! { FIRST_PRIMARY+ 82, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 113 q */
! { FIRST_PRIMARY+ 83, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 114 r */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 115 s */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 116 t */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 117 u */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 118 v */
! { FIRST_PRIMARY+ 90, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 119 w */
! { FIRST_PRIMARY+ 91, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 120 x */
! { FIRST_PRIMARY+ 92, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 121 y */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 122 z */
! { FIRST_PRIMARY+101, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 123 { */
! { FIRST_PRIMARY+102, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 124 | */
! { FIRST_PRIMARY+103, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 125 } */
! { FIRST_PRIMARY+104, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 126 ~ */
! { FIRST_PRIMARY+105, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 127   */
! { FIRST_PRIMARY+106, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 128   */
! { FIRST_PRIMARY+107, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 129   */
! { FIRST_PRIMARY+108, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 130   */
! { FIRST_PRIMARY+109, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 131   */
! { FIRST_PRIMARY+110, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 132   */
! { FIRST_PRIMARY+111, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 133   */
! { FIRST_PRIMARY+112, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 134   */
! { FIRST_PRIMARY+113, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 135   */
! { FIRST_PRIMARY+114, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 136   */
! { FIRST_PRIMARY+115, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 137   */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /* 138   */
! { FIRST_PRIMARY+116, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 139   */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 140   */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 141   */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /* 142   */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 143   */
! { FIRST_PRIMARY+117, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 144   */
! { FIRST_PRIMARY+118, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 145   */
! { FIRST_PRIMARY+119, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 146   */
! { FIRST_PRIMARY+120, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 147   */
! { FIRST_PRIMARY+121, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 148   */
! { FIRST_PRIMARY+122, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 149   */
! { FIRST_PRIMARY+123, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 150   */
! { FIRST_PRIMARY+124, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 151   */
! { FIRST_PRIMARY+125, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 152   */
! { FIRST_PRIMARY+126, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 153   */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 154   */
! { FIRST_PRIMARY+127, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 155   */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 156   */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 157   */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 158   */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 159   */
! { FIRST_PRIMARY+128, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 160   */
! { FIRST_PRIMARY+129, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 161 ¡ */
! { FIRST_PRIMARY+130, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 162 ¢ */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 163 £ */
! { FIRST_PRIMARY+131, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 164 ¤ */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 165 ¥ */
! { FIRST_PRIMARY+132, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 166 ¦ */
! { FIRST_PRIMARY+133, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 167 § */
! { FIRST_PRIMARY+134, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 168 ¨ */
! { FIRST_PRIMARY+135, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 169 © */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 170 ª */
! { FIRST_PRIMARY+136, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 171 « */
! { FIRST_PRIMARY+137, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 172 ¬ */
! { FIRST_PRIMARY+138, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 173 ­ */
! { FIRST_PRIMARY+139, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 174 ® */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 175 ¯ */
! { FIRST_PRIMARY+140, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 176 ° */
! { FIRST_PRIMARY+141, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 177 ± */
! { FIRST_PRIMARY+142, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 178 ² */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 179 ³ */
! { FIRST_PRIMARY+143, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 180 ´ */
! { FIRST_PRIMARY+144, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 181 µ */
! { FIRST_PRIMARY+145, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 182 ¶ */
! { FIRST_PRIMARY+146, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 183 · */
! { FIRST_PRIMARY+147, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 184 ¸ */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 185 ¹ */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 186 º */
! { FIRST_PRIMARY+148, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 187 » */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 188 ¼ */
! { FIRST_PRIMARY+149, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 189 ½ */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 190 ¾ */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 191 ¿ */
! { FIRST_PRIMARY+ 83, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 192 À */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 193 Á */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 194 Â */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 195 Ã */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+ 11, NULL_TERTIARY,      0, 0 }, /* 196 Ä */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 197 Å */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 198 Æ */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 199 Ç */
--- 811,907 ----
  { FIRST_PRIMARY+ 72, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 103 g */
  { FIRST_PRIMARY+ 73, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 104 h */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 105 i */
! { FIRST_PRIMARY+ 76, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 106 j */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 107 k */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 108 l */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 109 m */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 110 n */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 111 o */
! { FIRST_PRIMARY+ 82, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 112 p */
! { FIRST_PRIMARY+ 83, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 113 q */
! { FIRST_PRIMARY+ 84, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 114 r */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 115 s */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 116 t */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 117 u */
! { FIRST_PRIMARY+ 90, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 118 v */
! { FIRST_PRIMARY+ 91, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 119 w */
! { FIRST_PRIMARY+ 92, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 120 x */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 121 y */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 122 z */
! { FIRST_PRIMARY+102, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 123 { */
! { FIRST_PRIMARY+103, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 124 | */
! { FIRST_PRIMARY+104, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 125 } */
! { FIRST_PRIMARY+105, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 126 ~ */
! { FIRST_PRIMARY+106, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 127   */
! { FIRST_PRIMARY+107, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 128   */
! { FIRST_PRIMARY+108, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 129   */
! { FIRST_PRIMARY+109, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 130   */
! { FIRST_PRIMARY+110, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 131   */
! { FIRST_PRIMARY+111, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 132   */
! { FIRST_PRIMARY+112, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 133   */
! { FIRST_PRIMARY+113, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 134   */
! { FIRST_PRIMARY+114, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 135   */
! { FIRST_PRIMARY+115, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 136   */
! { FIRST_PRIMARY+116, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 137   */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /* 138   */
! { FIRST_PRIMARY+117, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 139   */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 140   */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 141   */
! { FIRST_PRIMARY+ 95, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /* 142   */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 143   */
! { FIRST_PRIMARY+118, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 144   */
! { FIRST_PRIMARY+119, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 145   */
! { FIRST_PRIMARY+120, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 146   */
! { FIRST_PRIMARY+121, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 147   */
! { FIRST_PRIMARY+122, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 148   */
! { FIRST_PRIMARY+123, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 149   */
! { FIRST_PRIMARY+124, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 150   */
! { FIRST_PRIMARY+125, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 151   */
! { FIRST_PRIMARY+126, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 152   */
! { FIRST_PRIMARY+127, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 153   */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 154   */
! { FIRST_PRIMARY+128, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 155   */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 156   */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 157   */
! { FIRST_PRIMARY+ 95, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 158   */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 159   */
! { FIRST_PRIMARY+129, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 160   */
! { FIRST_PRIMARY+130, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 161 ¡ */
! { FIRST_PRIMARY+131, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 162 ¢ */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 163 £ */
! { FIRST_PRIMARY+132, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 164 ¤ */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 165 ¥ */
! { FIRST_PRIMARY+133, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 166 ¦ */
! { FIRST_PRIMARY+134, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 167 § */
! { FIRST_PRIMARY+135, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 168 ¨ */
! { FIRST_PRIMARY+136, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 169 © */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 170 ª */
! { FIRST_PRIMARY+137, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 171 « */
! { FIRST_PRIMARY+138, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 172 ¬ */
! { FIRST_PRIMARY+139, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 173 ­ */
! { FIRST_PRIMARY+140, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 174 ® */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 175 ¯ */
! { FIRST_PRIMARY+141, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 176 ° */
! { FIRST_PRIMARY+142, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 177 ± */
! { FIRST_PRIMARY+143, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 178 ² */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 179 ³ */
! { FIRST_PRIMARY+144, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 180 ´ */
! { FIRST_PRIMARY+145, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 181 µ */
! { FIRST_PRIMARY+146, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 182 ¶ */
! { FIRST_PRIMARY+147, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 183 · */
! { FIRST_PRIMARY+148, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 184 ¸ */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 185 ¹ */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 186 º */
! { FIRST_PRIMARY+149, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 187 » */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 188 ¼ */
! { FIRST_PRIMARY+150, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 189 ½ */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 190 ¾ */
! { FIRST_PRIMARY+ 94, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 191 ¿ */
! { FIRST_PRIMARY+ 84, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 192 À */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 193 Á */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 194 Â */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 195 Ã */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+ 11, NULL_TERTIARY,      0, 0 }, /* 196 Ä */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 197 Å */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 198 Æ */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 199 Ç */
***************
*** 906,934 ****
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 203 Ë */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 204 Ì */
! { FIRST_PRIMARY+ 74, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 205 Í */
! { FIRST_PRIMARY+ 74, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 206 Î */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 207 Ï */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 208 Ð */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 209 Ñ */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 210 Ò */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 211 Ó */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 212 Ô */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 213 Õ */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 214 Ö */
! { FIRST_PRIMARY+150, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 215 × */
! { FIRST_PRIMARY+ 84, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /* 216 Ø */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 217 Ù */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 218 Ú */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 219 Û */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 220 Ü */
! { FIRST_PRIMARY+ 92, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 221 Ý */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 222 Þ */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  6, NULL_TERTIARY,      1, 0 }, /* 223 ß */
! { FIRST_PRIMARY+ 83, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 224 à */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 225 á */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 226 â */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 227 ã */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+ 10, NULL_TERTIARY,      0, 0 }, /* 228 ä */
! { FIRST_PRIMARY+ 77, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 229 å */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 230 æ */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 231 ç */
--- 911,939 ----
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 203 Ë */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 204 Ì */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 205 Í */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 206 Î */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 207 Ï */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 208 Ð */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 209 Ñ */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 210 Ò */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 211 Ó */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 212 Ô */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 213 Õ */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 214 Ö */
! { FIRST_PRIMARY+151, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 215 × */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, /* 216 Ø */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 217 Ù */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 218 Ú */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  9, NULL_TERTIARY,      0, 0 }, /* 219 Û */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  7, NULL_TERTIARY,      0, 0 }, /* 220 Ü */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  3, NULL_TERTIARY,      0, 0 }, /* 221 Ý */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  5, NULL_TERTIARY,      0, 0 }, /* 222 Þ */
! { FIRST_PRIMARY+ 86, FIRST_SECONDARY+  6, NULL_TERTIARY,      1, 0 }, /* 223 ß */
! { FIRST_PRIMARY+ 84, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 224 à */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 225 á */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 226 â */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 227 ã */
  { FIRST_PRIMARY+ 65, FIRST_SECONDARY+ 10, NULL_TERTIARY,      0, 0 }, /* 228 ä */
! { FIRST_PRIMARY+ 78, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 229 å */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 230 æ */
  { FIRST_PRIMARY+ 67, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 231 ç */
***************
*** 938,960 ****
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 235 ë */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 236 ì */
! { FIRST_PRIMARY+ 74, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 237 í */
! { FIRST_PRIMARY+ 74, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 238 î */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 239 ï */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 240 ð */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 241 ñ */
! { FIRST_PRIMARY+ 79, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 242 ò */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 243 ó */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 244 ô */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 245 õ */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 246 ö */
! { FIRST_PRIMARY+151, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 247 ÷ */
! { FIRST_PRIMARY+ 84, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 248 ø */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 249 ù */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 250 ú */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 251 û */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 252 ü */
! { FIRST_PRIMARY+ 92, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 253 ý */
! { FIRST_PRIMARY+ 87, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 254 þ */
! { FIRST_PRIMARY+152, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }  /* 255   */
  };
  
--- 943,965 ----
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 235 ë */
  { FIRST_PRIMARY+ 70, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 236 ì */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 237 í */
! { FIRST_PRIMARY+ 75, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 238 î */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 239 ï */
  { FIRST_PRIMARY+ 69, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 240 ð */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 241 ñ */
! { FIRST_PRIMARY+ 80, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 242 ò */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 243 ó */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 244 ô */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 245 õ */
! { FIRST_PRIMARY+ 81, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 246 ö */
! { FIRST_PRIMARY+152, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /* 247 ÷ */
! { FIRST_PRIMARY+ 85, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, /* 248 ø */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 249 ù */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 250 ú */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  8, NULL_TERTIARY,      0, 0 }, /* 251 û */
! { FIRST_PRIMARY+ 89, FIRST_SECONDARY+  6, NULL_TERTIARY,      0, 0 }, /* 252 ü */
! { FIRST_PRIMARY+ 93, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, /* 253 ý */
! { FIRST_PRIMARY+ 88, FIRST_SECONDARY+  4, NULL_TERTIARY,      0, 0 }, /* 254 þ */
! { FIRST_PRIMARY+153, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }  /* 255   */
  };
  

[Firebird-checkins] CVS: interbase ChangeLog,1.14,1.15

[Frank Schlottmann-G. <fs...@us...>]

Update of /cvsroot/firebird/interbase
In directory usw-pr-cvs1:/tmp/cvs-serv16837/interbase

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/interbase/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** ChangeLog	2000/12/29 09:15:15	1.14
--- ChangeLog	2001/01/15 09:20:39	1.15
***************
*** 1,2 ****
--- 1,136 ----
+ 2001-01-14 16:36  gspeicher
+ 
+ 	* interbase/firebird/gspeicher/: README, firebird/Makefile,
+ 	firebird/distinfo, firebird/pkg-comment, firebird/pkg-descr,
+ 	firebird/pkg-install, firebird/pkg-message, firebird/pkg-plist,
+ 	firebird/files/RELNOTES, firebird/files/patch-aa,
+ 	firebird/files/patch-ab, firebird/files/patch-ac,
+ 	firebird/scripts/addservice, firebird/scripts/createuser,
+ 	firebird/scripts/post-install, firebird/scripts/pre-build,
+ 	firebird/scripts/pre-install, firebird/scripts/rmservice:
+ 	
+ 	- Here's my own little directory to hold any work that I do that
+ 	other	people might want to see and/or should be under revision
+ 	control with   the rest of Firebird in case I get hit by a bus. 
+ 	For now, it just   holds the files from the FreeBSD 'port' (as in,
+ 	the stuff that was   submitted to the FreeBSD ports tree).
+ 
+ 2001-01-12 19:18  gspeicher
+ 
+ 	* interbase/builds/original/prefix.freebsd:
+ 	
+ 	- The original version of this file assumed Interbase was installed
+ 	  and running already.	This one doesn't, so that it works with the
+ 	  boot build.
+ 
+ 2001-01-08 17:07  patrickgriffin
+ 
+ 	* interbase/isql/: extra_proto.h, extract.e, isql.e, isql_proto.h,
+ 	show.e:
+ 	
+ 	[ Bug #127473 ] ISQL Always ignores charset NONE in metadata
+ 	extraction.
+ 	
+ 	This patch will change ISQL Extract and Show commands to display
+ 	the character set definition for all fields:
+ 	
+ 	1)  Not using the database default character set 2)  With an
+ 	explicit definition for collation.
+ 	
+ 	This patch also changes the ISQL COPY command (only available in
+ 	development builds) to list every character set definition.
+ 	
+ 	...pat
+ 
+ 2001-01-07 19:18  nmcc
+ 
+ 	* interbase/jrd/evl.c:
+ 	
+ 	Firebird Bug 127375 Grouping on derived fields processing NULL data
+ 	kills IB
+ 	
+ 	Test the null flag before trying to expand a value (via pointer)
+ 	which does not exist when it is a NULL.
+ 
+ 2001-01-07 18:24  nmcc
+ 
+ 	* interbase/builds/original/sfx.interbase:
+ 	
+ 	Add explicit path to run check_messages script. Removes need to add
+ 	. to path.
+ 
+ 2001-01-07 18:17  nmcc
+ 
+ 	* interbase/builds/original/install.unix:
+ 	
+ 	Fix problem of Solaris inetd.conf sym link broken on superserver
+ 	install.
+ 
+ 2001-01-06 16:36  patrickgriffin
+ 
+ 	* interbase/gpre/cob.c:
+ 	
+ 	COBOL programs randomly return a -901 request synchronization
+ 	error.
+ 	
+ 	Alternate title: COBOL programs lose SQLCODE values during UPDATE.
+ 	
+ 	During 'UPDATE SET ... WHERE x=.. ' ('Mass Update') error codes
+ 	returned by the update are not returned to the program, instead the
+ 	program will see a -901 request synchronization error.
+ 	
+ 	It appears that the other language modules do not have this same
+ 	problem.
+ 	
+ 	...pat
+ 
+ 2001-01-05 20:13  nmcc
+ 
+ 	* interbase/jrd/svc_undoc.h:
+ 	
+ 	Fix broken comment syntax.
+ 
+ 2001-01-05 05:34  skywalker
+ 
+ 	* interbase/misc/msg.gbak:
+ 	
+ 	Somehow I committed a broken version of this file in the last
+ 	commit for T0.9-4 Test1 release. it wasn't obvious since I was
+ 	using a set of reference databases that were already built.  I've
+ 	replaced it with the original 1.1 version.
+ 
+ 2001-01-01 16:24  skywalker
+ 
+ 	* interbase/jrd/qatest.c:
+ 	
+ 	Changed the password
+ 
+ 2000-12-30 06:10  rfm
+ 
+ 	* interbase/builds_win32/original/: build_no.ksh, make.jrd:
+ 	
+ 	get the \0 in the version resource instead of \\0 remove qatest.c
+ 	from make.jrd (for fsg's changes)
+ 
+ 2000-12-29 21:06  skywalker
+ 
+ 	* interbase/: builds_win32/original/build_no.ksh,
+ 	firebird/skywalker/install/Makefile,
+ 	firebird/skywalker/install/classic/CSrpmheader.txt,
+ 	firebird/skywalker/install/super/SSrpmheader.txt, jrd/build_no.h,
+ 	jrd/inf.c, jrd/license.h, misc/msg.gbak:
+ 	
+ 	Changes to scripts to build version "T0.9-4 Firebird Test1" This
+ 	also includes changes to build_no.ksh to use internally the 0.9
+ 	number instead of the 6.0 number.  The macro IBSERVER_BASE_LEVEL
+ 	was also defined as 6.0 and used in jrd/inf.c to maintain feature
+ 	compatibility.
+ 
+ 2000-12-29 14:05  skywalker
+ 
+ 	* interbase/jrd/: builtin.c, gds.c:
+ 	
+ 	Changing names
+ 
  2000-12-27 22:58  rfm
  
***************
*** 73,77 ****
  	* interbase/: builds/original/bind_gds_s.im,
  	builds/original/bind_gds_s.sco, builds/original/sfx.jrd,
! 	jrd/builtin.c, jrd/flu_proto.h, jrd/opt.c:
  	
  	Removed ugly security hole from jrd/builtins.c related to this I
--- 207,211 ----
  	* interbase/: builds/original/bind_gds_s.im,
  	builds/original/bind_gds_s.sco, builds/original/sfx.jrd,
! 	jrd/flu_proto.h, jrd/opt.c:
  	
  	Removed ugly security hole from jrd/builtins.c related to this I
***************
*** 174,178 ****
  	
  	Changed all $Log$
! 	Changed all Revision 1.14  2000/12/29 09:15:15  fsg
  	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set
--- 308,312 ----
  	
  	Changed all $Log$
! 	Changed all Revision 1.15  2001/01/15 09:20:39  fsg
  	Changed all Updated ChangeLog
  	Changed all tags to $Id$ BTW this will hopefully set
***************
*** 641,650 ****
  	* interbase/: setup_dirs, builds/original/prefix.netbsd,
  	builds/original/sfx.interbase, gpre/cob.c, gpre/ftn.c,
! 	jrd/common.h, jrd/file_params.h, jrd/flu.c, jrd/gds.c,
! 	jrd/isc_file.c, jrd/isc_ipc.c, jrd/isc_sync.c, jrd/license.h,
! 	jrd/pag.c, jrd/pwd.c, jrd/sort.c, jrd/svc.c, jrd/utl.c, jrd/why.c,
! 	lock/fparamv3.h, lock/lock.c, lock/lockv3.h, pyxis/cdm.c,
! 	remote/inet_server.c, remote/protocol.h, remote/remote_def.h,
! 	utilities/dba.e, utilities/drop.c:
  	
  	NetBSD support. Thanks to Geoffrey C. Speicher for the FreeBSD
--- 775,784 ----
  	* interbase/: setup_dirs, builds/original/prefix.netbsd,
  	builds/original/sfx.interbase, gpre/cob.c, gpre/ftn.c,
! 	jrd/common.h, jrd/file_params.h, jrd/flu.c, jrd/isc_file.c,
! 	jrd/isc_ipc.c, jrd/isc_sync.c, jrd/license.h, jrd/pag.c, jrd/pwd.c,
! 	jrd/sort.c, jrd/svc.c, jrd/utl.c, jrd/why.c, lock/fparamv3.h,
! 	lock/lock.c, lock/lockv3.h, pyxis/cdm.c, remote/inet_server.c,
! 	remote/protocol.h, remote/remote_def.h, utilities/dba.e,
! 	utilities/drop.c:
  	
  	NetBSD support. Thanks to Geoffrey C. Speicher for the FreeBSD
***************
*** 729,741 ****
  	AIX_PPC
  
- 2000-09-23 06:39  rfm
- 
- 	* interbase/jrd/gds.c:
- 	
- 	define V4_THREADING for all superserver platfroms, as recommended
- 	by Charlie Caro. See my message '[Firebird-devel] Re: IB Super
- 	Server on Linux Crash (borland bug #114840)' on firebird-devel for
- 	some thoughts on V4_THREADING in general.
- 
  2000-09-23 05:54  rfm
  
--- 863,866 ----
***************
*** 1121,1125 ****
  	builds/original/prefix.freebsd, builds/original/sfx.interbase,
  	gpre/cob.c, gpre/ftn.c, jrd/common.h, jrd/file_params.h, jrd/flu.c,
! 	jrd/gds.c, jrd/ids.h, jrd/isc.gdb, jrd/isc_file.c, jrd/isc_sync.c,
  	jrd/license.h, jrd/pag.c, jrd/pwd.c, jrd/sort.c, jrd/svc.c,
  	jrd/utl.c, jrd/why.c, lock/fparamv3.h, lock/lock.c, lock/lockv3.h,
--- 1246,1250 ----
  	builds/original/prefix.freebsd, builds/original/sfx.interbase,
  	gpre/cob.c, gpre/ftn.c, jrd/common.h, jrd/file_params.h, jrd/flu.c,
! 	jrd/ids.h, jrd/isc.gdb, jrd/isc_file.c, jrd/isc_sync.c,
  	jrd/license.h, jrd/pag.c, jrd/pwd.c, jrd/sort.c, jrd/svc.c,
  	jrd/utl.c, jrd/why.c, lock/fparamv3.h, lock/lock.c, lock/lockv3.h,
***************
*** 1321,1331 ****
  	Tom Colemans changes script changes for easy linux install.
  
- 2000-08-05 18:26  tamlin
- 
- 	* interbase/jrd/gds.c:
- 	
- 	Win32 path search *real* "Program Files" before falling back to
- 	hardcoded.
- 
  2000-08-05 18:13  tamlin
  
--- 1446,1449 ----
***************
*** 1596,1614 ****
  	jrd/blf.h, jrd/blf_proto.h, jrd/blk.h, jrd/blp.h, jrd/blr.h,
  	jrd/blrtable.c, jrd/blrtable.h, jrd/btr.c, jrd/btr.h,
! 	jrd/btr_proto.h, jrd/build_no.h, jrd/builtin.c, jrd/cch.c,
! 	jrd/cch.h, jrd/cch_proto.h, jrd/cdefs.h, jrd/cmp.c,
! 	jrd/cmp_proto.h, jrd/codes.e, jrd/codes.h, jrd/codetext.h,
! 	jrd/common.h, jrd/constants.h, jrd/cvt.c, jrd/cvt2.c,
! 	jrd/cvt2_proto.h, jrd/cvt_proto.h, jrd/dbg.c, jrd/dbg.h,
! 	jrd/dbg_proto.h, jrd/dbt.c, jrd/depends.mak, jrd/dfloat_stub.c,
! 	jrd/dflt.gdl, jrd/dflt.h, jrd/dfw.e, jrd/dfw_proto.h,
! 	jrd/divor_proto.h, jrd/divorce.c, jrd/dllshell.c, jrd/dls.c,
! 	jrd/dls_proto.h, jrd/dmp.c, jrd/dmp_proto.h, jrd/doserr.h,
! 	jrd/dpm.e, jrd/dpm_proto.h, jrd/drq.h, jrd/dsc.c, jrd/dsc.h,
! 	jrd/dsc_proto.h, jrd/dyn.e, jrd/dyn.h, jrd/dyn_def.e,
! 	jrd/dyn_def.sed, jrd/dyn_del.e, jrd/dyn_df_proto.h,
! 	jrd/dyn_dl_proto.h, jrd/dyn_md_proto.h, jrd/dyn_mod.e,
! 	jrd/dyn_proto.h, jrd/dyn_ut_proto.h, jrd/dyn_util.e, jrd/enc.c,
! 	jrd/enc_proto.h, jrd/entry.h, jrd/envelope.e, jrd/err.c,
  	jrd/err_proto.h, jrd/event.c, jrd/event.h, jrd/event_proto.h,
  	jrd/everything.h, jrd/evl.c, jrd/evl_like.c, jrd/evl_proto.h,
--- 1714,1731 ----
  	jrd/blf.h, jrd/blf_proto.h, jrd/blk.h, jrd/blp.h, jrd/blr.h,
  	jrd/blrtable.c, jrd/blrtable.h, jrd/btr.c, jrd/btr.h,
! 	jrd/btr_proto.h, jrd/build_no.h, jrd/cch.c, jrd/cch.h,
! 	jrd/cch_proto.h, jrd/cdefs.h, jrd/cmp.c, jrd/cmp_proto.h,
! 	jrd/codes.e, jrd/codes.h, jrd/codetext.h, jrd/common.h,
! 	jrd/constants.h, jrd/cvt.c, jrd/cvt2.c, jrd/cvt2_proto.h,
! 	jrd/cvt_proto.h, jrd/dbg.c, jrd/dbg.h, jrd/dbg_proto.h, jrd/dbt.c,
! 	jrd/depends.mak, jrd/dfloat_stub.c, jrd/dflt.gdl, jrd/dflt.h,
! 	jrd/dfw.e, jrd/dfw_proto.h, jrd/divor_proto.h, jrd/divorce.c,
! 	jrd/dllshell.c, jrd/dls.c, jrd/dls_proto.h, jrd/dmp.c,
! 	jrd/dmp_proto.h, jrd/doserr.h, jrd/dpm.e, jrd/dpm_proto.h,
! 	jrd/drq.h, jrd/dsc.c, jrd/dsc.h, jrd/dsc_proto.h, jrd/dyn.e,
! 	jrd/dyn.h, jrd/dyn_def.e, jrd/dyn_def.sed, jrd/dyn_del.e,
! 	jrd/dyn_df_proto.h, jrd/dyn_dl_proto.h, jrd/dyn_md_proto.h,
! 	jrd/dyn_mod.e, jrd/dyn_proto.h, jrd/dyn_ut_proto.h, jrd/dyn_util.e,
! 	jrd/enc.c, jrd/enc_proto.h, jrd/entry.h, jrd/envelope.e, jrd/err.c,
  	jrd/err_proto.h, jrd/event.c, jrd/event.h, jrd/event_proto.h,
  	jrd/everything.h, jrd/evl.c, jrd/evl_like.c, jrd/evl_proto.h,
***************
*** 1617,1621 ****
  	jrd/file_params.h, jrd/filte_proto.h, jrd/filters.c, jrd/flags.h,
  	jrd/flu.c, jrd/flu.h, jrd/flu_proto.h, jrd/fun.e, jrd/fun_proto.h,
! 	jrd/functions.c, jrd/gds.bas, jrd/gds.c, jrd/gds.def, jrd/gds.hxx,
  	jrd/gds.pas, jrd/gds.pli, jrd/gds.vpas, jrd/gds5entry.mar,
  	jrd/gds_aix.f, jrd/gds_apollo.f, jrd/gds_h3.f, jrd/gds_hp.f,
--- 1734,1738 ----
  	jrd/file_params.h, jrd/filte_proto.h, jrd/filters.c, jrd/flags.h,
  	jrd/flu.c, jrd/flu.h, jrd/flu_proto.h, jrd/fun.e, jrd/fun_proto.h,
! 	jrd/functions.c, jrd/gds.bas, jrd/gds.def, jrd/gds.hxx,
  	jrd/gds.pas, jrd/gds.pli, jrd/gds.vpas, jrd/gds5entry.mar,
  	jrd/gds_aix.f, jrd/gds_apollo.f, jrd/gds_h3.f, jrd/gds_hp.f,
***************
*** 1655,1688 ****
  	jrd/perf_proto.h, jrd/pio.h, jrd/pio_proto.h, jrd/pragma.h,
  	jrd/print.c, jrd/procs2.gdl, jrd/prv_m_bypass.h, jrd/pwd.c,
! 	jrd/pwd_proto.h, jrd/qatest.c, jrd/quad.c, jrd/quad.h,
! 	jrd/quad_proto.h, jrd/que.h, jrd/rdb.c, jrd/rdb.h, jrd/rdb_codes.h,
! 	jrd/rdbcodes.h, jrd/rdbcodes.mar, jrd/rdbgentry.mar, jrd/rdbgpas.c,
! 	jrd/rdbint.c, jrd/rec.c, jrd/rec_proto.h, jrd/relations.h,
! 	jrd/req.h, jrd/rlck.c, jrd/rlck_proto.h, jrd/rng.c, jrd/rng.h,
! 	jrd/rng_proto.h, jrd/rse.c, jrd/rse.h, jrd/rse_proto.h, jrd/sbm.c,
! 	jrd/sbm.h, jrd/sbm_proto.h, jrd/sch.c, jrd/sch_proto.h, jrd/scl.e,
! 	jrd/scl.h, jrd/scl_proto.h, jrd/scroll_cursors.h, jrd/sdl.c,
! 	jrd/sdl.h, jrd/sdl_proto.h, jrd/sdw.c, jrd/sdw.h, jrd/sdw_proto.h,
! 	jrd/seg.c, jrd/seg_proto.h, jrd/shdef.h, jrd/shrfinit.c,
! 	jrd/shrinit.c, jrd/shut.c, jrd/shut_proto.h, jrd/sort.c,
! 	jrd/sort.h, jrd/sort_proto.h, jrd/sql_code.h, jrd/sqz.c, jrd/sqz.h,
! 	jrd/sqz_proto.h, jrd/stats.e, jrd/stored_proc.gdl, jrd/stubs.c,
! 	jrd/sun_ftn.c, jrd/svc.c, jrd/svc.h, jrd/svc_proto.h,
! 	jrd/svc_undoc.h, jrd/syidef.h, jrd/sym.c, jrd/sym_proto.h,
! 	jrd/termtype.h, jrd/thd.c, jrd/thd.h, jrd/thd_proto.h,
! 	jrd/thin.asm, jrd/thread.mar, jrd/time.h, jrd/tpc.c, jrd/tpc.h,
! 	jrd/tpc_proto.h, jrd/tra.c, jrd/tra.h, jrd/tra_proto.h, jrd/trig.h,
! 	jrd/types.h, jrd/unix.c, jrd/utl.c, jrd/utl_proto.h, jrd/utls.def,
! 	jrd/utlswep.c, jrd/v2_triggers.gdl, jrd/val.c, jrd/val.h,
! 	jrd/val_proto.h, jrd/version.rc, jrd/version_95.rc, jrd/vio.c,
! 	jrd/vio_debug.h, jrd/vio_proto.h, jrd/vms.c, jrd/vms.h,
! 	jrd/vms_command.c, jrd/vmsevent.c, jrd/vmslo_proto.h,
! 	jrd/vmslock.c, jrd/vmsthread.c, jrd/why.c, jrd/why_proto.h,
! 	jrd/windows.c, jrd/winnt.c, jrd/winnt_dll.c, jrd/yachts.gdb,
! 	lock/config_params, lock/depends.mak, lock/driver.c,
! 	lock/fparamv3.h, lock/lock.c, lock/lock.h, lock/lock_header_mmap,
! 	lock/lock_header_shmem, lock/lock_proto.h, lock/lockv3.h,
! 	lock/lockv3s4.h, lock/manager.c, lock/pls.c, lock/plserver.c,
! 	lock/plserver.h, lock/print.c, lock/printv3.c:
  	
  	Initial revision
--- 1772,1804 ----
  	jrd/perf_proto.h, jrd/pio.h, jrd/pio_proto.h, jrd/pragma.h,
  	jrd/print.c, jrd/procs2.gdl, jrd/prv_m_bypass.h, jrd/pwd.c,
! 	jrd/pwd_proto.h, jrd/quad.c, jrd/quad.h, jrd/quad_proto.h,
! 	jrd/que.h, jrd/rdb.c, jrd/rdb.h, jrd/rdb_codes.h, jrd/rdbcodes.h,
! 	jrd/rdbcodes.mar, jrd/rdbgentry.mar, jrd/rdbgpas.c, jrd/rdbint.c,
! 	jrd/rec.c, jrd/rec_proto.h, jrd/relations.h, jrd/req.h, jrd/rlck.c,
! 	jrd/rlck_proto.h, jrd/rng.c, jrd/rng.h, jrd/rng_proto.h, jrd/rse.c,
! 	jrd/rse.h, jrd/rse_proto.h, jrd/sbm.c, jrd/sbm.h, jrd/sbm_proto.h,
! 	jrd/sch.c, jrd/sch_proto.h, jrd/scl.e, jrd/scl.h, jrd/scl_proto.h,
! 	jrd/scroll_cursors.h, jrd/sdl.c, jrd/sdl.h, jrd/sdl_proto.h,
! 	jrd/sdw.c, jrd/sdw.h, jrd/sdw_proto.h, jrd/seg.c, jrd/seg_proto.h,
! 	jrd/shdef.h, jrd/shrfinit.c, jrd/shrinit.c, jrd/shut.c,
! 	jrd/shut_proto.h, jrd/sort.c, jrd/sort.h, jrd/sort_proto.h,
! 	jrd/sql_code.h, jrd/sqz.c, jrd/sqz.h, jrd/sqz_proto.h, jrd/stats.e,
! 	jrd/stored_proc.gdl, jrd/stubs.c, jrd/sun_ftn.c, jrd/svc.c,
! 	jrd/svc.h, jrd/svc_proto.h, jrd/svc_undoc.h, jrd/syidef.h,
! 	jrd/sym.c, jrd/sym_proto.h, jrd/termtype.h, jrd/thd.c, jrd/thd.h,
! 	jrd/thd_proto.h, jrd/thin.asm, jrd/thread.mar, jrd/time.h,
! 	jrd/tpc.c, jrd/tpc.h, jrd/tpc_proto.h, jrd/tra.c, jrd/tra.h,
! 	jrd/tra_proto.h, jrd/trig.h, jrd/types.h, jrd/unix.c, jrd/utl.c,
! 	jrd/utl_proto.h, jrd/utls.def, jrd/utlswep.c, jrd/v2_triggers.gdl,
! 	jrd/val.c, jrd/val.h, jrd/val_proto.h, jrd/version.rc,
! 	jrd/version_95.rc, jrd/vio.c, jrd/vio_debug.h, jrd/vio_proto.h,
! 	jrd/vms.c, jrd/vms.h, jrd/vms_command.c, jrd/vmsevent.c,
! 	jrd/vmslo_proto.h, jrd/vmslock.c, jrd/vmsthread.c, jrd/why.c,
! 	jrd/why_proto.h, jrd/windows.c, jrd/winnt.c, jrd/winnt_dll.c,
! 	jrd/yachts.gdb, lock/config_params, lock/depends.mak,
! 	lock/driver.c, lock/fparamv3.h, lock/lock.c, lock/lock.h,
! 	lock/lock_header_mmap, lock/lock_header_shmem, lock/lock_proto.h,
! 	lock/lockv3.h, lock/lockv3s4.h, lock/manager.c, lock/pls.c,
! 	lock/plserver.c, lock/plserver.h, lock/print.c, lock/printv3.c:
  	
  	Initial revision
***************
*** 1725,1743 ****
  	jrd/blf.h, jrd/blf_proto.h, jrd/blk.h, jrd/blp.h, jrd/blr.h,
  	jrd/blrtable.c, jrd/blrtable.h, jrd/btr.c, jrd/btr.h,
! 	jrd/btr_proto.h, jrd/build_no.h, jrd/builtin.c, jrd/cch.c,
! 	jrd/cch.h, jrd/cch_proto.h, jrd/cdefs.h, jrd/cmp.c,
! 	jrd/cmp_proto.h, jrd/codes.e, jrd/codes.h, jrd/codetext.h,
! 	jrd/common.h, jrd/constants.h, jrd/cvt.c, jrd/cvt2.c,
! 	jrd/cvt2_proto.h, jrd/cvt_proto.h, jrd/dbg.c, jrd/dbg.h,
! 	jrd/dbg_proto.h, jrd/dbt.c, jrd/depends.mak, jrd/dfloat_stub.c,
! 	jrd/dflt.gdl, jrd/dflt.h, jrd/dfw.e, jrd/dfw_proto.h,
! 	jrd/divor_proto.h, jrd/divorce.c, jrd/dllshell.c, jrd/dls.c,
! 	jrd/dls_proto.h, jrd/dmp.c, jrd/dmp_proto.h, jrd/doserr.h,
! 	jrd/dpm.e, jrd/dpm_proto.h, jrd/drq.h, jrd/dsc.c, jrd/dsc.h,
! 	jrd/dsc_proto.h, jrd/dyn.e, jrd/dyn.h, jrd/dyn_def.e,
! 	jrd/dyn_def.sed, jrd/dyn_del.e, jrd/dyn_df_proto.h,
! 	jrd/dyn_dl_proto.h, jrd/dyn_md_proto.h, jrd/dyn_mod.e,
! 	jrd/dyn_proto.h, jrd/dyn_ut_proto.h, jrd/dyn_util.e, jrd/enc.c,
! 	jrd/enc_proto.h, jrd/entry.h, jrd/envelope.e, jrd/err.c,
  	jrd/err_proto.h, jrd/event.c, jrd/event.h, jrd/event_proto.h,
  	jrd/everything.h, jrd/evl.c, jrd/evl_like.c, jrd/evl_proto.h,
--- 1841,1858 ----
  	jrd/blf.h, jrd/blf_proto.h, jrd/blk.h, jrd/blp.h, jrd/blr.h,
  	jrd/blrtable.c, jrd/blrtable.h, jrd/btr.c, jrd/btr.h,
! 	jrd/btr_proto.h, jrd/build_no.h, jrd/cch.c, jrd/cch.h,
! 	jrd/cch_proto.h, jrd/cdefs.h, jrd/cmp.c, jrd/cmp_proto.h,
! 	jrd/codes.e, jrd/codes.h, jrd/codetext.h, jrd/common.h,
! 	jrd/constants.h, jrd/cvt.c, jrd/cvt2.c, jrd/cvt2_proto.h,
! 	jrd/cvt_proto.h, jrd/dbg.c, jrd/dbg.h, jrd/dbg_proto.h, jrd/dbt.c,
! 	jrd/depends.mak, jrd/dfloat_stub.c, jrd/dflt.gdl, jrd/dflt.h,
! 	jrd/dfw.e, jrd/dfw_proto.h, jrd/divor_proto.h, jrd/divorce.c,
! 	jrd/dllshell.c, jrd/dls.c, jrd/dls_proto.h, jrd/dmp.c,
! 	jrd/dmp_proto.h, jrd/doserr.h, jrd/dpm.e, jrd/dpm_proto.h,
! 	jrd/drq.h, jrd/dsc.c, jrd/dsc.h, jrd/dsc_proto.h, jrd/dyn.e,
! 	jrd/dyn.h, jrd/dyn_def.e, jrd/dyn_def.sed, jrd/dyn_del.e,
! 	jrd/dyn_df_proto.h, jrd/dyn_dl_proto.h, jrd/dyn_md_proto.h,
! 	jrd/dyn_mod.e, jrd/dyn_proto.h, jrd/dyn_ut_proto.h, jrd/dyn_util.e,
! 	jrd/enc.c, jrd/enc_proto.h, jrd/entry.h, jrd/envelope.e, jrd/err.c,
  	jrd/err_proto.h, jrd/event.c, jrd/event.h, jrd/event_proto.h,
  	jrd/everything.h, jrd/evl.c, jrd/evl_like.c, jrd/evl_proto.h,
***************
*** 1746,1750 ****
  	jrd/file_params.h, jrd/filte_proto.h, jrd/filters.c, jrd/flags.h,
  	jrd/flu.c, jrd/flu.h, jrd/flu_proto.h, jrd/fun.e, jrd/fun_proto.h,
! 	jrd/functions.c, jrd/gds.bas, jrd/gds.c, jrd/gds.def, jrd/gds.hxx,
  	jrd/gds.pas, jrd/gds.pli, jrd/gds.vpas, jrd/gds5entry.mar,
  	jrd/gds_aix.f, jrd/gds_apollo.f, jrd/gds_h3.f, jrd/gds_hp.f,
--- 1861,1865 ----
  	jrd/file_params.h, jrd/filte_proto.h, jrd/filters.c, jrd/flags.h,
  	jrd/flu.c, jrd/flu.h, jrd/flu_proto.h, jrd/fun.e, jrd/fun_proto.h,
! 	jrd/functions.c, jrd/gds.bas, jrd/gds.def, jrd/gds.hxx,
  	jrd/gds.pas, jrd/gds.pli, jrd/gds.vpas, jrd/gds5entry.mar,
  	jrd/gds_aix.f, jrd/gds_apollo.f, jrd/gds_h3.f, jrd/gds_hp.f,
***************
*** 1784,1817 ****
  	jrd/perf_proto.h, jrd/pio.h, jrd/pio_proto.h, jrd/pragma.h,
  	jrd/print.c, jrd/procs2.gdl, jrd/prv_m_bypass.h, jrd/pwd.c,
! 	jrd/pwd_proto.h, jrd/qatest.c, jrd/quad.c, jrd/quad.h,
! 	jrd/quad_proto.h, jrd/que.h, jrd/rdb.c, jrd/rdb.h, jrd/rdb_codes.h,
! 	jrd/rdbcodes.h, jrd/rdbcodes.mar, jrd/rdbgentry.mar, jrd/rdbgpas.c,
! 	jrd/rdbint.c, jrd/rec.c, jrd/rec_proto.h, jrd/relations.h,
! 	jrd/req.h, jrd/rlck.c, jrd/rlck_proto.h, jrd/rng.c, jrd/rng.h,
! 	jrd/rng_proto.h, jrd/rse.c, jrd/rse.h, jrd/rse_proto.h, jrd/sbm.c,
! 	jrd/sbm.h, jrd/sbm_proto.h, jrd/sch.c, jrd/sch_proto.h, jrd/scl.e,
! 	jrd/scl.h, jrd/scl_proto.h, jrd/scroll_cursors.h, jrd/sdl.c,
! 	jrd/sdl.h, jrd/sdl_proto.h, jrd/sdw.c, jrd/sdw.h, jrd/sdw_proto.h,
! 	jrd/seg.c, jrd/seg_proto.h, jrd/shdef.h, jrd/shrfinit.c,
! 	jrd/shrinit.c, jrd/shut.c, jrd/shut_proto.h, jrd/sort.c,
! 	jrd/sort.h, jrd/sort_proto.h, jrd/sql_code.h, jrd/sqz.c, jrd/sqz.h,
! 	jrd/sqz_proto.h, jrd/stats.e, jrd/stored_proc.gdl, jrd/stubs.c,
! 	jrd/sun_ftn.c, jrd/svc.c, jrd/svc.h, jrd/svc_proto.h,
! 	jrd/svc_undoc.h, jrd/syidef.h, jrd/sym.c, jrd/sym_proto.h,
! 	jrd/termtype.h, jrd/thd.c, jrd/thd.h, jrd/thd_proto.h,
! 	jrd/thin.asm, jrd/thread.mar, jrd/time.h, jrd/tpc.c, jrd/tpc.h,
! 	jrd/tpc_proto.h, jrd/tra.c, jrd/tra.h, jrd/tra_proto.h, jrd/trig.h,
! 	jrd/types.h, jrd/unix.c, jrd/utl.c, jrd/utl_proto.h, jrd/utls.def,
! 	jrd/utlswep.c, jrd/v2_triggers.gdl, jrd/val.c, jrd/val.h,
! 	jrd/val_proto.h, jrd/version.rc, jrd/version_95.rc, jrd/vio.c,
! 	jrd/vio_debug.h, jrd/vio_proto.h, jrd/vms.c, jrd/vms.h,
! 	jrd/vms_command.c, jrd/vmsevent.c, jrd/vmslo_proto.h,
! 	jrd/vmslock.c, jrd/vmsthread.c, jrd/why.c, jrd/why_proto.h,
! 	jrd/windows.c, jrd/winnt.c, jrd/winnt_dll.c, jrd/yachts.gdb,
! 	lock/config_params, lock/depends.mak, lock/driver.c,
! 	lock/fparamv3.h, lock/lock.c, lock/lock.h, lock/lock_header_mmap,
! 	lock/lock_header_shmem, lock/lock_proto.h, lock/lockv3.h,
! 	lock/lockv3s4.h, lock/manager.c, lock/pls.c, lock/plserver.c,
! 	lock/plserver.h, lock/print.c, lock/printv3.c:
  	
  	Save the whale, feed the poor, and set the sources free.
--- 1899,1931 ----
  	jrd/perf_proto.h, jrd/pio.h, jrd/pio_proto.h, jrd/pragma.h,
  	jrd/print.c, jrd/procs2.gdl, jrd/prv_m_bypass.h, jrd/pwd.c,
! 	jrd/pwd_proto.h, jrd/quad.c, jrd/quad.h, jrd/quad_proto.h,
! 	jrd/que.h, jrd/rdb.c, jrd/rdb.h, jrd/rdb_codes.h, jrd/rdbcodes.h,
! 	jrd/rdbcodes.mar, jrd/rdbgentry.mar, jrd/rdbgpas.c, jrd/rdbint.c,
! 	jrd/rec.c, jrd/rec_proto.h, jrd/relations.h, jrd/req.h, jrd/rlck.c,
! 	jrd/rlck_proto.h, jrd/rng.c, jrd/rng.h, jrd/rng_proto.h, jrd/rse.c,
! 	jrd/rse.h, jrd/rse_proto.h, jrd/sbm.c, jrd/sbm.h, jrd/sbm_proto.h,
! 	jrd/sch.c, jrd/sch_proto.h, jrd/scl.e, jrd/scl.h, jrd/scl_proto.h,
! 	jrd/scroll_cursors.h, jrd/sdl.c, jrd/sdl.h, jrd/sdl_proto.h,
! 	jrd/sdw.c, jrd/sdw.h, jrd/sdw_proto.h, jrd/seg.c, jrd/seg_proto.h,
! 	jrd/shdef.h, jrd/shrfinit.c, jrd/shrinit.c, jrd/shut.c,
! 	jrd/shut_proto.h, jrd/sort.c, jrd/sort.h, jrd/sort_proto.h,
! 	jrd/sql_code.h, jrd/sqz.c, jrd/sqz.h, jrd/sqz_proto.h, jrd/stats.e,
! 	jrd/stored_proc.gdl, jrd/stubs.c, jrd/sun_ftn.c, jrd/svc.c,
! 	jrd/svc.h, jrd/svc_proto.h, jrd/svc_undoc.h, jrd/syidef.h,
! 	jrd/sym.c, jrd/sym_proto.h, jrd/termtype.h, jrd/thd.c, jrd/thd.h,
! 	jrd/thd_proto.h, jrd/thin.asm, jrd/thread.mar, jrd/time.h,
! 	jrd/tpc.c, jrd/tpc.h, jrd/tpc_proto.h, jrd/tra.c, jrd/tra.h,
! 	jrd/tra_proto.h, jrd/trig.h, jrd/types.h, jrd/unix.c, jrd/utl.c,
! 	jrd/utl_proto.h, jrd/utls.def, jrd/utlswep.c, jrd/v2_triggers.gdl,
! 	jrd/val.c, jrd/val.h, jrd/val_proto.h, jrd/version.rc,
! 	jrd/version_95.rc, jrd/vio.c, jrd/vio_debug.h, jrd/vio_proto.h,
! 	jrd/vms.c, jrd/vms.h, jrd/vms_command.c, jrd/vmsevent.c,
! 	jrd/vmslo_proto.h, jrd/vmslock.c, jrd/vmsthread.c, jrd/why.c,
! 	jrd/why_proto.h, jrd/windows.c, jrd/winnt.c, jrd/winnt_dll.c,
! 	jrd/yachts.gdb, lock/config_params, lock/depends.mak,
! 	lock/driver.c, lock/fparamv3.h, lock/lock.c, lock/lock.h,
! 	lock/lock_header_mmap, lock/lock_header_shmem, lock/lock_proto.h,
! 	lock/lockv3.h, lock/lockv3s4.h, lock/manager.c, lock/pls.c,
! 	lock/plserver.c, lock/plserver.h, lock/print.c, lock/printv3.c:
  	
  	Save the whale, feed the poor, and set the sources free.

[Firebird-checkins] CVS: interbase/firebird/gspeicher/firebird/scripts addservice,NONE,1.1 createuser,NONE,1.1 post-install,NONE,1.1 pre-build,NONE,1.1 pre-install,NONE,1.1 rmservice,NONE,1.1

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher/firebird/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv5449/gspeicher/firebird/scripts

Added Files:
	addservice createuser post-install pre-build pre-install 
	rmservice 
Log Message:
- Here's my own little directory to hold any work that I do that other
  people might want to see and/or should be under revision control with
  the rest of Firebird in case I get hit by a bus.  For now, it just
  holds the files from the FreeBSD 'port' (as in, the stuff that was
  submitted to the FreeBSD ports tree).


--- NEW FILE ---
#!/bin/sh

cat >>/etc/services <<EOF
gds_db		 3050/tcp  #InterBase Database Remote Protocol
EOF
cat >>/etc/inetd.conf <<EOF
gds_db	stream	tcp	nowait	firebird	/usr/interbase/bin/gds_inet_server  gds_inet_server
EOF
kill -HUP `cat /var/run/inetd.pid`

--- NEW FILE ---
#!/usr/bin/perl
#

eval '(exit $?0)' && eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
& eval 'exec /usr/bin/perl -S $0 $argv:q'
if 0;

if( $> ) {
	print "\nYou must be root to run this step!\n\n";
	exit 1;
} 

if( getpwnam( "firebird" ) ) {
	( $null, $null, $fbUID ) = getpwnam( "firebird" );
} else {
	$fbUID = 90;
	while( getpwuid( $fbUID ) ) {
		$fbUID++;
	}
}

if( getgrnam( "firebird" ) ) {
	( $null, $null, $fbGID ) = getgrnam( "firebird" );
} else {
	$fbGID = 90;
	while( getgrgid( $fbGID ) ) {
		$fbGID++;
	}
	&append_file( "/etc/group", "firebird:*:$fbGID:" );
}

print "firebird user using uid $fbUID\n";
print "firebird user using gid $fbGID\n";

system( "/usr/bin/chpass -a \"firebird:*:$fbUID:$fbGID\:\:0:0:Firebird pseudo-user:$ENV{'PREFIX'}/firebird:/bin/sh\"" );

sub append_file {
	local($file,@list) = @_;
	local($LOCK_EX) = 2;
	local($LOCK_NB) = 4;
	local($LOCK_UN) = 8;

	open(F, ">> $file") || die "$file: $!\n";
	while( ! flock( F, $LOCK_EX | $LOCK_NB ) ) {
		exit 1;
	}
	print F join( "\n", @list) . "\n";
	close F;
	flock( F, $LOCK_UN );
}

--- NEW FILE ---
#!/bin/sh

chown -R firebird:firebird $PREFIX/firebird

# Turn everybody to read only.
chmod -R o=r $PREFIX/firebird

# Now fix up the mess.

# fix up directories 
for i in `find $PREFIX/firebird -print`
  do
    FileName=$i
    if [ -d $FileName ]
       then
         chmod o=rx $FileName
     fi
  done



cd $PREFIX/firebird/bin

# all users can run everything.
chmod o=rx * 

# SUID is needed for running server programs.

for i in gds_lock_mgr gds_drop gds_inet_server
  do
    chmod ug+s $i
  done


# Lock files

cd $PREFIX/firebird

for i in isc_init1 isc_lock1 isc_event1 
  do
    FileName=$i.`hostname`
    touch $FileName
    chmod uga=rw $FileName
    chown firebird:firebird $FileName
  done


touch interbase.log
chmod ugo=rw interbase.log

# make databases writable by all
chmod ugo=rw examples/v5/*.gdb
chmod ugo=rw help/*.gdb
chmod ugo=rw isc4.gdb

# remove any existing gds service
sh $SCRIPTDIR/rmservice

# add the gds service and restart inetd
sh $SCRIPTDIR/addservice
kill -HUP `cat /var/run/inetd.pid`

sed "s|%%PREFIX%%|$PREFIX|" $SCRIPTDIR/../pkg-message

cat <<EOF

==========================================================
!! NOTE !!

As there are some oddities to the Firebird build process,
it is likely you WILL NOT BE ABLE TO USE IT until you
remove the semaphore created during the build process.
Please read $PREFIX/firebird/RELNOTES for more information.
==========================================================

EOF

--- NEW FILE ---
#!/bin/sh

GDS_LOCK_MGR=`ps ax |grep gds_lock_mgr |grep -v grep`;

if [ "$GDS_LOCK_MGR" != "" ]; then
	echo "It appears you have a gds_lock_manager already running.";
	echo;
	echo "You must cease all InterBase operations to build this port.";
	echo "Make sure nobody is connected to any databases, then use";
	echo "'gds_drop -a' and manually verify (with ipcs) that the";
	echo "semaphores were removed.";
	exit 1;
fi
exit 0


--- NEW FILE ---
#!/bin/sh

if [ -d $PREFIX/firebird ]; then
	if [ -d $PREFIX/firebird.old ]; then
		rm -rf $PREFIX/firebird.old
	fi
	mv $PREFIX/firebird $PREFIX/firebird.old
fi

if [ -L /usr/interbase ]; then
	rm -f /usr/interbase
fi

if [ -d /usr/interbase ]; then
	mv /usr/interbase /usr/interbase.old
fi

ln -fs $PREFIX/firebird /usr/interbase

perl $SCRIPTDIR/createuser

--- NEW FILE ---
#!/bin/sh

cp /etc/services /etc/services.old
cp /etc/inetd.conf /etc/inetd.conf.old
cat /etc/services |grep -v gds_db >/etc/services.new
cat /etc/inetd.conf |grep -v gds_db >/etc/inetd.conf.new
mv /etc/services.new /etc/services
mv /etc/inetd.conf.new /etc/inetd.conf

[Firebird-checkins] CVS: interbase/firebird/gspeicher/firebird/files RELNOTES,NONE,1.1 patch-aa,NONE,1.1 patch-ab,NONE,1.1 patch-ac,NONE,1.1

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher/firebird/files
In directory usw-pr-cvs1:/tmp/cvs-serv5449/gspeicher/firebird/files

Added Files:
	RELNOTES patch-aa patch-ab patch-ac 
Log Message:
- Here's my own little directory to hold any work that I do that other
  people might want to see and/or should be under revision control with
  the rest of Firebird in case I get hit by a bus.  For now, it just
  holds the files from the FreeBSD 'port' (as in, the stuff that was
  submitted to the FreeBSD ports tree).


--- NEW FILE ---
Firebird 0.9_4 FreeBSD Release Notes                       13-Jan-2001
------------------------------------
FB-T0.9.4.34 Firebird Test1

Welcome to the FreeBSD Firebird port!  Users should note that there
was a package called `firebird-1.0.tgz' released in mid-August
2000.  Unfortunately, that package was released before Firebird
version numbering conventions were established, so although the
version number would suggest that it is newer than the current
release, it is certainly not.  Users of the August 1.0 package
should upgrade to 0.9_4 or later, which has fixed many bugs and
security problems, including the recently-discovered back door.

    Firebird originally required a running copy of Firebird (or
InterBase) in order to build itself.  This port uses a boot kit to
overcome that, so that it does not require itself to build.
Unfortunately, the side effect of this is that if you have a lock
manager running from an already-installed version of Firebird or
InterBase, this port will not build.

    Firebird is installed SUID with owner and group `firebird'.
This does affect where you can and cannot create databases when
connecting remotely, as well as which existing databases you can
access.  If you want a database to be available remotely, be sure
it's readable and writeable to group firebird.

    There may be times when you manage to get your system into a
state where using any of the Firebird utilites (isql, gbak, gsec,
etc.) gives you the message "semget failed".  One surefire way to
do this is to build and install the port.  :)  If this happens,
make sure that the lock manager is not running and its semaphores
have been removed.  The former can be accomplished with 'ps ax
|grep gds' and 'kill'; the latter with 'ipcs -s' and 'ipcrm -s'.

    For example, after building and installing the port, you will
probably go through something like this:

# isql /usr/interbase/isc4.gdb
Statement failed, SQLCODE = -902

operating system directive semget failed
-No such file or directory

# ipcs -s
Semaphores:
T     ID     KEY        MODE       OWNER    GROUP
s 1310720  252034728 --rw-rw-rw-     root    wheel

# ipcrm -s 1310720

and you should be in business.

    Once this is done, you should be able to connect normally to
databases.  Your first connection will restart the lock manager.

    There may be times, however, when you still get "semget failed"
even though the lock manager is not running and the semaphores have
been cleaned up.  There seems to be a conflict with this release
and the PostgreSQL 7 release as installed from the ports collection.
If you're having trouble with Firebird and you're running PostgreSQL,
try stopping PostgreSQL:

	/usr/local/etc/rc.d/pgsql.sh stop

and see if that helps.

    Complete documentation for InterBase(tm) is available (free of
charge) from http://www.interbase.com/ in PDF format.  While
InterBase and Firebird are two distinct entities, all InterBase
documentation is pertinent to Firebird.  More information on Firebird
and InterBase can be found at the following:

	http://sourceforge.net/projects/firebird/
	http://www.ibphoenix.com/
	http://www.interbase2000.org/

Geoff Speicher
<ge...@se...>

--- NEW FILE ---
--- buildBootDatabases.orig	Tue Oct 10 23:00:39 2000
+++ buildBootDatabases	Tue Oct 10 23:00:46 2000
@@ -49,7 +49,7 @@
     DefaultAns=$2
     echo -n "${1}"
     Answer="$DefaultAns"
-    read Answer
+#    read Answer
 }
 
 #--------------------------------------------------------------------

--- NEW FILE ---
--- setup_dirs.boot.orig	Tue Oct 10 23:00:07 2000
+++ setup_dirs.boot	Tue Oct 10 23:00:22 2000
@@ -49,7 +49,7 @@
    DefaultAns=$2
    echo -n "${1}"
    Answer="$DefaultAns"
-   read Answer 
+#   read Answer 
 }
 
 

--- NEW FILE ---
--- builds/original/prefix.freebsd	2000/10/08 15:36:25	1.2
+++ builds/original/prefix.freebsd	2001/01/11 19:17:58
@@ -28,7 +28,7 @@
 
 
 PROD_DEBUG_OBJECTS=	nodebug.o
-PROD_SHRLIB_DIR=	
+PROD_SHRLIB_DIR=	-Lsource/jrd
 PROD_VERSION_FLAG=	-DPROD_BUILD
 PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
 
@@ -48,7 +48,7 @@
 UDF_LINK_CMD=		gcc
 UDF_CFLAGS=         	-fPIC -mieee-fp
 UDF_LFLAGS=         	-shared
-UDF_SHRLIBS=        	-L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt
+UDF_SHRLIBS=        	$(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt
 
 #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
 #      to workaround the Solaris threading problems with signals
@@ -69,16 +69,14 @@
 FUNCTIONS=		functions.bin
 FUNCSHR=		source/interbase/lib/gdsf.so
 GDS_LINK=		$(GDSSHR_LINK)
-#GDS_PYXIS=
 GDS_PYXIS=		gds_pyxis.a
 GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
 GDSLIB_LINK=		-Lsource/jrd -lgds_b -lc -ldescrypt
 
 GDSSHR=			source/interbase/lib/gds.so
 LINUX_GDSSHR=		$(GDSSHR)
-GDSSHR_LINK=		$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt
-PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis
-#PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
+GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
+PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
 HLPDIR=			source/qli/
 HOSTNAME=		`hostname | cut -d'.' -f1`
 INCLUDES=		include_so include_so_ada	
@@ -106,11 +104,6 @@
 MUISQL_LINK_OPTS=	$(MUISQL_MU_LIB) $(PIPE_GDSSHR_LINK) -lm 
 PIC_FLAGS=		$(CFLAGS) -fPIC
 PIPE=			gds.a gds_pipe
-#PYXIS=
-#PYXIS_MISC_OBJS=
-#PYXIS_P_MISC_OBJS=
-#PYXIS_OBJECTS=
-#PYXIS_MISC_OBJECTS=
 PYXIS=			pyxis
 PYXIS_MISC_OBJS=	$(PYXIS_MISC)
 PYXIS_P_MISC_OBJS=	$(PYXIS_P_MISC)
@@ -167,5 +160,8 @@
 SHRLIB_EXT=		.so
 
 V3PRINTER=		source/lock/printv3.o
+
+# Forces library build for FreeBSD
+PYXIS_LIBRARY= libpyxis.a

[Firebird-checkins] CVS: interbase/firebird/gspeicher/firebird Makefile,NONE,1.1 distinfo,NONE,1.1 pkg-comment,NONE,1.1 pkg-descr,NONE,1.1 pkg-install,NONE,1.1 pkg-message,NONE,1.1 pkg-plist,NONE,1.1

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher/firebird
In directory usw-pr-cvs1:/tmp/cvs-serv5449/gspeicher/firebird

Added Files:
	Makefile distinfo pkg-comment pkg-descr pkg-install 
	pkg-message pkg-plist 
Log Message:
- Here's my own little directory to hold any work that I do that other
  people might want to see and/or should be under revision control with
  the rest of Firebird in case I get hit by a bus.  For now, it just
  holds the files from the FreeBSD 'port' (as in, the stuff that was
  submitted to the FreeBSD ports tree).


--- NEW FILE ---
# New ports collection makefile for:	Firebird
# Date created:		20 December 2000
# Whom:			Geoffrey C. Speicher <ge...@se...>
#
# $FreeBSD$
#

PORTNAME=	firebird
PORTVERSION=	0.9
PORTREVISION=	4
CATEGORIES=	databases
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=firebird
DISTFILES=	firebird-boot-kit.tar.gz \
		interbase0.9-4-v5examples.tar.gz \
		interbase0.9-4src.tar.gz

MAINTAINER=	ge...@se...

WRKSRC=		${WRKDIR}/interbase
INSTALLS_SHLIB=	yes
LDCONFIG_DIRS=	%%PREFIX%%/firebird/lib

ONLY_FOR_ARCHS=	i386

do-extract:
	@${MKDIR} ${WRKDIR}
	@(								\
	cd ${WRKDIR}; tar zxf ${DISTDIR}/interbase0.9-4src.tar.gz;	\
	cd interbase; tar zxf ${DISTDIR}/firebird-boot-kit.tar.gz;	\
	${CP} msgs/msg.gbak misc/msg.gbak				\
	)

do-configure:
	@(								\
	cd ${WRKDIR}/interbase;						\
	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
	${SH} buildBootDatabases;					\
	${SH} setup_dirs.boot FREEBSD PROD ${WRKDIR}/refDatabases boot;	\
	)

do-build:
	@(								\
	cd ${WRKDIR}/interbase;						\
	INTERBASE=${WRKDIR}/interbase/interbase; export INTERBASE;	\
	REFDBPATH=${WRKDIR}/refDatabases; export REFDBPATH;		\
	${SH} boot.freebsd;						\
	)

do-install:
	@(								\
	cd ${WRKDIR}/interbase;						\
	${CP} -Rp interbase ${PREFIX}/firebird;				\
	${RM} ${PREFIX}/firebird/install;				\
	${RM} ${PREFIX}/firebird/lib/libgds.so.1.0;			\
	${LN} -fs gds.so ${PREFIX}/firebird/lib/libgds.so.1;		\
	cd ${PREFIX}/firebird/examples;					\
	tar zxf ${DISTDIR}/interbase0.9-4-v5examples.tar.gz;		\
	${CP} ${FILESDIR}/RELNOTES ${PREFIX}/firebird/			\
	)

.include <bsd.port.mk>

--- NEW FILE ---
MD5 (firebird-boot-kit.tar.gz) = 2e18d75539bc4c3d40a1a71509309f64
MD5 (interbase0.9-4-v5examples.tar.gz) = 17cba82bbf5066d515f2dee97bf8327a
MD5 (interbase0.9-4src.tar.gz) = d098277ed160e2b6a49d91e1fdb3a652

--- NEW FILE ---
The open-source InterBase(tm) 6.0 spin-off (Classic version)

--- NEW FILE ---
The open-source InterBase(tm) 6.0 spin-off (Classic server version)

InterBase is a world-class DBMS with a history too rich to detail
here.  Once selling for several thousands of dollars per license,
some very big players use it worldwide.  Inprise has open-sourced
InterBase 6.0, and a lively bunch of folks has charged themselves
with seeing that it lives on through the Firebird project.

Note that as of Firebird 0.9_4, the locksmith back door has
been closed.

For more information on Firebird and InterBase, see:

http://sourceforge.net/projects/firebird/
http://www.ibphoenix.com/
http://www.interbase2000.org/
http://www.interbase.com/

For more information on the locksmith back door, see:

https://www.kb.cert.org/vuls/id/247371

--- NEW FILE ---
#!/bin/sh

# Created in haste by smashing together various
# files from the port scripts.

if [ "$2" = "PRE-INSTALL" ]; then
if [ -d $PKG_PREFIX/firebird ]; then
	if [ -d $PKG_PREFIX/firebird.old ]; then
		rm -rf $PKG_PREFIX/firebird.old
	fi
	mv $PKG_PREFIX/firebird $PKG_PREFIX/firebird.old
fi

if [ -L /usr/interbase ]; then
	rm -f /usr/interbase
fi

if [ -d /usr/interbase ]; then
	mv /usr/interbase /usr/interbase.old
fi

ln -fs $PKG_PREFIX/firebird /usr/interbase

perl <<EOF
eval '(exit \$?0)' && eval 'exec /usr/bin/perl -S \$0 \${1+"\$@"}'
& eval 'exec /usr/bin/perl -S \$0 \$argv:q'
if 0;

if( \$> ) {
	print "\nYou must be root to run this step!\n\n";
	exit 1;
} 

if( getpwnam( "firebird" ) ) {
	( \$null, \$null, \$fbUID ) = getpwnam( "firebird" );
} else {
	\$fbUID = 90;
	while( getpwuid( \$fbUID ) ) {
		\$fbUID++;
	}
}

if( getgrnam( "firebird" ) ) {
	( \$null, \$null, \$fbGID ) = getgrnam( "firebird" );
} else {
	\$fbGID = 90;
	while( getgrgid( \$fbGID ) ) {
		\$fbGID++;
	}
	&append_file( "/etc/group", "firebird:*:\$fbGID:" );
}

print "firebird user using uid \$fbUID\n";
print "firebird user using gid \$fbGID\n";

system( "/usr/bin/chpass -a \"firebird:*:\$fbUID:\$fbGID\:\:0:0:Firebird pseudo-user:\$ENV{'PKG_PREFIX'}/firebird:/bin/sh\"" );

sub append_file {
	local(\$file,@list) = @_;
	local(\$LOCK_EX) = 2;
	local(\$LOCK_NB) = 4;
	local(\$LOCK_UN) = 8;

	open(F, ">> \$file") || die "\$file: \$!\n";
	while( ! flock( F, \$LOCK_EX | \$LOCK_NB ) ) {
		exit 1;
	}
	print F join( "\n", @list) . "\n";
	close F;
	flock( F, \$LOCK_UN );
}
EOF
elif [ "$2" = "POST-INSTALL" ]; then
chown -R firebird:firebird $PKG_PREFIX/firebird

# Turn everybody to read only.
chmod -R o=r $PKG_PREFIX/firebird

# Now fix up the mess.

# fix up directories 
for i in `find $PKG_PREFIX/firebird -print`
  do
    FileName=$i
    if [ -d $FileName ]
       then
         chmod o=rx $FileName
     fi
  done



cd $PKG_PREFIX/firebird/bin

# all users can run everything.
chmod o=rx * 

# SUID is needed for running server programs.

for i in gds_lock_mgr gds_drop gds_inet_server
  do
    chmod ug+s $i
  done


# Lock files

cd $PKG_PREFIX/firebird

for i in isc_init1 isc_lock1 isc_event1 
  do
    FileName=$i.`hostname`
    touch $FileName
    chmod uga=rw $FileName
    chown firebird:firebird $FileName
  done


touch interbase.log
chmod ugo=rw interbase.log

# make databases writable by all
chmod ugo=rw examples/v5/*.gdb
chmod ugo=rw help/*.gdb
chmod ugo=rw isc4.gdb

# remove any existing gds service
cp /etc/services /etc/services.old
cp /etc/inetd.conf /etc/inetd.conf.old
cat /etc/services |grep -v gds_db >/etc/services.new
cat /etc/inetd.conf |grep -v gds_db >/etc/inetd.conf.new
mv /etc/services.new /etc/services
mv /etc/inetd.conf.new /etc/inetd.conf

# add the gds service and restart inetd
cat >>/etc/services <<EOF
gds_db		 3050/tcp  #InterBase Database Remote Protocol
EOF
cat >>/etc/inetd.conf <<EOF
gds_db	stream	tcp	nowait	firebird	/usr/interbase/bin/gds_inet_server  gds_inet_server
EOF
kill -HUP `cat /var/run/inetd.pid`
kill -HUP `cat /var/run/inetd.pid`

fi

--- NEW FILE ---

---------------------------------------------------------
Firebird is now installed.  There is a symbolic link from
/usr/interbase -> %%PREFIX%%/firebird.  Firebird needs this
link for proper operation.

It is STRONGLY recommended that you change the SYSDBA
password with:

$ cd /usr/interbase
$ gsec -user SYSDBA -pass masterkey
GSEC> modify SYSDBA -pw newpassword
GSEC> quit

before doing anything serious with Firebird.

See %%PREFIX%%/firebird/RELNOTES for more.
---------------------------------------------------------


--- NEW FILE ---
firebird/intl/gdsintl
firebird/examples/v5/ib_udf.sql
firebird/examples/v5/README
firebird/examples/v5/align.h
firebird/examples/v5/api1.c
firebird/examples/v5/api10.c
firebird/examples/v5/api11.c
firebird/examples/v5/api12.c
firebird/examples/v5/api13.c
firebird/examples/v5/api14.e
firebird/examples/v5/api15.c
firebird/examples/v5/api16.c
firebird/examples/v5/api16t.c
firebird/examples/v5/api2.c
firebird/examples/v5/api3.c
firebird/examples/v5/api4.c
firebird/examples/v5/api5.c
firebird/examples/v5/api6.c
firebird/examples/v5/api7.c
firebird/examples/v5/api8.c
firebird/examples/v5/api9.c
firebird/examples/v5/api9f.c
firebird/examples/v5/apifull.c
firebird/examples/v5/employe2.sql
firebird/examples/v5/dyn1.e
firebird/examples/v5/dyn2.e
firebird/examples/v5/dyn3.e
firebird/examples/v5/dyn4.e
firebird/examples/v5/dyn5.e
firebird/examples/v5/dynfull.e
firebird/examples/v5/employee.gbk
firebird/examples/v5/employee.gdb
firebird/examples/v5/example.h
firebird/examples/v5/api9f.sql
firebird/examples/v5/intlemp.gbk
firebird/examples/v5/intlemp.gdb
firebird/examples/v5/stat1.e
firebird/examples/v5/stat10.e
firebird/examples/v5/stat11.e
firebird/examples/v5/stat12.e
firebird/examples/v5/stat12t.e
firebird/examples/v5/stat2.e
firebird/examples/v5/stat3.e
firebird/examples/v5/stat4.e
firebird/examples/v5/stat5.e
firebird/examples/v5/stat6.e
firebird/examples/v5/stat7.e
firebird/examples/v5/stat8.e
firebird/examples/v5/stat9.e
firebird/examples/v5/udf.sql
firebird/examples/v5/udflib.c
firebird/examples/v5/makefile
firebird/include/perf.h
firebird/include/ib_util.h
firebird/include/gds.hxx
firebird/include/gds.h
firebird/include/ibase.h
firebird/include/iberror.h
firebird/include/gds.f
firebird/UDF/ib_udf
firebird/lib/ib_util.so
firebird/lib/gds.a
firebird/lib/gds.so
firebird/lib/libgds.so
firebird/lib/libgds.so.1
firebird/lib/libgds_pyxis.a
firebird/lib/libgds.a
firebird/lib/gds_pyxis.a
firebird/help/help.gbak
firebird/help/help.gdb
firebird/bin/isc4.gbak
firebird/bin/gpre
firebird/bin/gds_pipe
firebird/bin/gds_drop
firebird/bin/gds_lock_mgr
firebird/bin/gfix
firebird/bin/gdef
firebird/bin/isql
firebird/bin/gds_lock_print
firebird/bin/qli
firebird/bin/gds_inet_server
firebird/bin/gsplit
firebird/bin/gstat
firebird/bin/gds_relay
firebird/bin/gsec
firebird/bin/gbak
firebird/services.isc
firebird/isc_config
firebird/isc4.gdb
firebird/interbase.msg
firebird/interbase.log
firebird/inetd.conf.isc
firebird/RELNOTES
@dirrm firebird
@dirrm firebird/intl
@dirrm firebird/examples/v3
@dirrm firebird/examples/v4
@dirrm firebird/examples/v5
@dirrm firebird/examples
@dirrm firebird/include
@dirrm firebird/UDF
@dirrm firebird/lib
@dirrm firebird/help
@dirrm firebird/bin

[Firebird-checkins] CVS: interbase/firebird/gspeicher README,NONE,1.1

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher
In directory usw-pr-cvs1:/tmp/cvs-serv5449/gspeicher

Added Files:
	README 
Log Message:
- Here's my own little directory to hold any work that I do that other
  people might want to see and/or should be under revision control with
  the rest of Firebird in case I get hit by a bus.  For now, it just
  holds the files from the FreeBSD 'port' (as in, the stuff that was
  submitted to the FreeBSD ports tree).


--- NEW FILE ---
Directory layout of interbase/firebird/gspeicher
------------------------------------------------

firebird/

	A directory that holds the files pertinent to the Firebird
FreeBSD port as submitted to the FreeBSD ports collection.

[Firebird-checkins] CVS: interbase/firebird/gspeicher/firebird/scripts - New directory

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher/firebird/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv4806/scripts

Log Message:
Directory /cvsroot/firebird/interbase/firebird/gspeicher/firebird/scripts added to the repository

[Firebird-checkins] CVS: interbase/firebird/gspeicher/firebird/files - New directory

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher/firebird/files
In directory usw-pr-cvs1:/tmp/cvs-serv4806/files

Log Message:
Directory /cvsroot/firebird/interbase/firebird/gspeicher/firebird/files added to the repository

[Firebird-checkins] CVS: interbase/firebird/gspeicher/firebird - New directory

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher/firebird
In directory usw-pr-cvs1:/tmp/cvs-serv4557/firebird

Log Message:
Directory /cvsroot/firebird/interbase/firebird/gspeicher/firebird added to the repository

[Firebird-checkins] CVS: interbase/firebird/gspeicher - New directory

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/firebird/gspeicher
In directory usw-pr-cvs1:/tmp/cvs-serv4373/gspeicher

Log Message:
Directory /cvsroot/firebird/interbase/firebird/gspeicher added to the repository

[Firebird-checkins] CVS: interbase/builds/original prefix.freebsd,1.2,1.3

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv18232/builds/original

Modified Files:
	prefix.freebsd 
Log Message:
- The original version of this file assumed Interbase was installed
  and running already.  This one doesn't, so that it works with the
  boot build.


Index: prefix.freebsd
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/prefix.freebsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** prefix.freebsd	2000/10/08 15:36:25	1.2
--- prefix.freebsd	2001/01/12 18:18:13	1.3
***************
*** 29,33 ****
  
  PROD_DEBUG_OBJECTS=	nodebug.o
! PROD_SHRLIB_DIR=	
  PROD_VERSION_FLAG=	-DPROD_BUILD
  PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
--- 29,33 ----
  
  PROD_DEBUG_OBJECTS=	nodebug.o
! PROD_SHRLIB_DIR=	-Lsource/jrd
  PROD_VERSION_FLAG=	-DPROD_BUILD
  PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
***************
*** 49,53 ****
  UDF_CFLAGS=         	-fPIC -mieee-fp
  UDF_LFLAGS=         	-shared
! UDF_SHRLIBS=        	-L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt
  
  #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
--- 49,53 ----
  UDF_CFLAGS=         	-fPIC -mieee-fp
  UDF_LFLAGS=         	-shared
! UDF_SHRLIBS=        	$(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt
  
  #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
***************
*** 70,74 ****
  FUNCSHR=		source/interbase/lib/gdsf.so
  GDS_LINK=		$(GDSSHR_LINK)
- #GDS_PYXIS=
  GDS_PYXIS=		gds_pyxis.a
  GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
--- 70,73 ----
***************
*** 77,83 ****
  GDSSHR=			source/interbase/lib/gds.so
  LINUX_GDSSHR=		$(GDSSHR)
! GDSSHR_LINK=		$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt
! PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis
! #PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
  HLPDIR=			source/qli/
  HOSTNAME=		`hostname | cut -d'.' -f1`
--- 76,81 ----
  GDSSHR=			source/interbase/lib/gds.so
  LINUX_GDSSHR=		$(GDSSHR)
! GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
! PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
  HLPDIR=			source/qli/
  HOSTNAME=		`hostname | cut -d'.' -f1`
***************
*** 107,115 ****
  PIC_FLAGS=		$(CFLAGS) -fPIC
  PIPE=			gds.a gds_pipe
- #PYXIS=
- #PYXIS_MISC_OBJS=
- #PYXIS_P_MISC_OBJS=
- #PYXIS_OBJECTS=
- #PYXIS_MISC_OBJECTS=
  PYXIS=			pyxis
  PYXIS_MISC_OBJS=	$(PYXIS_MISC)
--- 105,108 ----
***************
*** 168,171 ****
--- 161,167 ----
  
  V3PRINTER=		source/lock/printv3.o
+ 
+ # Forces library build for FreeBSD
+ PYXIS_LIBRARY= libpyxis.a
  
  #   End of file prefix.freebsd:	$(VERSION)	$(PLATFORM)

[Firebird-checkins] CVS: interbase/isql extra_proto.h,1.1.1.1,1.2 extract.e,1.4,1.5 isql.e,1.6,1.7 isql_proto.h,1.1.1.1,1.2 show.e,1.3,1.4

[Patrick J. P. G. <pat...@us...>]

Update of /cvsroot/firebird/interbase/isql
In directory usw-pr-cvs1:/tmp/cvs-serv21807/interbase/isql

Modified Files:
	extra_proto.h extract.e isql.e isql_proto.h show.e 
Log Message:
[ Bug #127473 ] ISQL Always ignores charset NONE in metadata extraction.

This patch will change ISQL Extract and Show commands to display
the character set definition for all fields:

1)  Not using the database default character set
2)  With an explicit definition for collation.

This patch also changes the ISQL COPY command (only available in
development builds) to list every character set definition.

...pat



Index: extra_proto.h
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/extra_proto.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** extra_proto.h	2000/08/03 20:49:18	1.1.1.1
--- extra_proto.h	2001/01/08 16:07:18	1.2
***************
*** 26,30 ****
  
  extern SSHORT	EXTRACT_ddl (int, SCHAR *);
! extern SSHORT	EXTRACT_list_table (SCHAR *, SCHAR *, SSHORT);
  extern void	EXTRACT_list_view (SCHAR *);
  
--- 26,30 ----
  
  extern SSHORT	EXTRACT_ddl (int, SCHAR *);
! extern SSHORT	EXTRACT_list_table (SCHAR *, SCHAR *, SSHORT, SSHORT);
  extern void	EXTRACT_list_view (SCHAR *);
  

Index: extract.e
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/extract.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** extract.e	2000/12/08 16:59:33	1.4
--- extract.e	2001/01/08 16:07:18	1.5
***************
*** 59,68 ****
  static void	list_all_grants (void);
  static void	list_all_procs (void);
! static void	list_all_tables (SSHORT);
  static void	list_all_triggers (void);
  static void	list_check (void);
  static void	list_create_db (void);
! static void	list_domain_table (SCHAR *);
! static void	list_domains (void);
  static void	list_exception (void);
  static void	list_filters (void);
--- 59,68 ----
  static void	list_all_grants (void);
  static void	list_all_procs (void);
! static void	list_all_tables (SSHORT,SSHORT);
  static void	list_all_triggers (void);
  static void	list_check (void);
  static void	list_create_db (void);
! static void	list_domain_table (SCHAR *,SSHORT);
! static void	list_domains (SSHORT);
  static void	list_exception (void);
  static void	list_filters (void);
***************
*** 121,124 ****
--- 121,125 ----
  USHORT	did_attach = FALSE;
  USHORT	did_start = FALSE;
+ SSHORT	default_char_set_id;
  
  if (!DB)
***************
*** 180,187 ****
      }
  
  /* If a table name was passed, extract only that table and domains */
  if (*tabname)
      {
!     if (EXTRACT_list_table (tabname, NULL, 1))
  	{
  	gds__msg_format (NULL_PTR, ISQL_MSG_FAC, NOT_FOUND, sizeof (errbuf), 
--- 181,190 ----
      }
  
+ default_char_set_id = ISQL_get_default_char_set_id ();
+ 
  /* If a table name was passed, extract only that table and domains */
  if (*tabname)
      {
!     if (EXTRACT_list_table (tabname, NULL, 1, default_char_set_id))
  	{
  	gds__msg_format (NULL_PTR, ISQL_MSG_FAC, NOT_FOUND, sizeof (errbuf), 
***************
*** 196,201 ****
      list_filters();
      list_functions();
!     list_domains();
!     list_all_tables (flag);
      list_index ();
      list_foreign ();
--- 199,204 ----
      list_filters();
      list_functions();
!     list_domains(default_char_set_id);
!     list_all_tables (flag,default_char_set_id);
      list_index ();
      list_foreign ();
***************
*** 232,236 ****
      SCHAR	*relation_name,
      SCHAR	*new_name,
!     SSHORT	domain_flag)
  {
  /**************************************
--- 235,240 ----
      SCHAR	*relation_name,
      SCHAR	*new_name,
!     SSHORT	domain_flag,
!     SSHORT      default_char_set_id)
  {
  /**************************************
***************
*** 249,254 ****
--- 253,301 ----
   *	new_name -- Name of a new name for a replacement table
   *	domain_flag -- extract needed domains before the table
+  *	default_char_set_id -- character set def to supress
+  *
+  **************************************/
+ /**************************************
+  *	default_char_set_id warrents special
+  *	consideration.  If the metadata for a
+  *	table is being extracted when there is
+  *	really no need to redundantly and repeatedly
+  *	list the databases default character set
+  *	for every field.
+  *
+  *	At the same time there is a need to list
+  *	the character set NONE when it is not
+  *	the default character set for the database.
+  *
+  *	EXCEPT!  If the metadata is being extracted
+  *	with the intention of coping that tables structure
+  *	into another database, and it is not possible
+  *	to know the default character set for the
+  *	target database, then list every fields
+  *	character set.  This includes the character
+  *	set NONE.
+  *
+  *	Fields with no character set definition will
+  *	not have any character set listed.
+  *
+  *	Use -1 as the default_char_set_id
+  *	in this case.
+  *
+  *	POTENTIAL TRAP!  Consider the following:
+  *	When copying a table from one database
+  *	to another how should fields using the
+  *	default character set be handled?
+  *
+  *	If both databases have the same default
+  *	character set, then there is no problem
+  *	or confusion.
+  *
+  *	If the databases have different default
+  *	character sets then should fields using
+  *	the default is the source database use
+  *	the default of the target database?
   *
   **************************************/
+ 
  USHORT		first; 
  SSHORT		collation, char_set_id;
***************
*** 277,281 ****
  	/* Do we need to print domains */
  	if (domain_flag)
! 	    list_domain_table (relation_name);
  
  	ISQL_blankterm (REL.RDB$OWNER_NAME);
--- 324,328 ----
  	/* Do we need to print domains */
  	if (domain_flag)
! 	    list_domain_table (relation_name,default_char_set_id);
  
  	ISQL_blankterm (REL.RDB$OWNER_NAME);
***************
*** 467,471 ****
  	if ((FLD.RDB$FIELD_TYPE == FCHAR || FLD.RDB$FIELD_TYPE == VARCHAR ||
  	     FLD.RDB$FIELD_TYPE == BLOB) &&
! 	    !FLD.RDB$CHARACTER_SET_ID.NULL && FLD.RDB$CHARACTER_SET_ID)
  	    {
  	    char_sets [0] = '\0';
--- 514,518 ----
  	if ((FLD.RDB$FIELD_TYPE == FCHAR || FLD.RDB$FIELD_TYPE == VARCHAR ||
  	     FLD.RDB$FIELD_TYPE == BLOB) &&
! 	    !FLD.RDB$CHARACTER_SET_ID.NULL)
  	    {
  	    char_sets [0] = '\0';
***************
*** 482,490 ****
  	    if (!FLD.RDB$CHARACTER_SET_ID.NULL)
  		char_set_id = FLD.RDB$CHARACTER_SET_ID;
! 
! 	    ISQL_get_character_sets (char_set_id, 0, FALSE, char_sets);
  	    if (char_sets [0])
  		ISQL_printf (Out, char_sets);
! 	    intchar = 1;
  	    }
  	}
--- 529,538 ----
  	    if (!FLD.RDB$CHARACTER_SET_ID.NULL)
  		char_set_id = FLD.RDB$CHARACTER_SET_ID;
! 	    if ((char_set_id != default_char_set_id) || collation)
! 		ISQL_get_character_sets (char_set_id, 0, FALSE, char_sets);
  	    if (char_sets [0])
  		ISQL_printf (Out, char_sets);
! 	    if (!char_set_id)
! 		intchar = 1;
  	    }
  	}
***************
*** 1185,1189 ****
  
  static void list_all_tables (
!     SSHORT	flag)
  {
  /**************************************
--- 1233,1238 ----
  
  static void list_all_tables (
!     SSHORT	flag,
!     SSHORT	default_char_set_id)
  {
  /**************************************
***************
*** 1217,1221 ****
  
      if (flag || !strncmp (REL.RDB$SECURITY_CLASS, "SQL$", 4))
! 	EXTRACT_list_table (REL.RDB$RELATION_NAME, NULL, 0);
  END_FOR
      ON_ERROR
--- 1266,1270 ----
  
      if (flag || !strncmp (REL.RDB$SECURITY_CLASS, "SQL$", 4))
! 	EXTRACT_list_table (REL.RDB$RELATION_NAME, NULL, 0,default_char_set_id);
  END_FOR
      ON_ERROR
***************
*** 1759,1763 ****
  
  static void list_domain_table (
!     SCHAR	*table_name)
  {
  /**************************************
--- 1808,1813 ----
  
  static void list_domain_table (
!     SCHAR	*table_name,
!     SSHORT	default_char_set_id)
  {
  /**************************************
***************
*** 1772,1775 ****
--- 1822,1826 ----
   *
   *	Parameters:  table_name == only extract domains for this table 
+  *	default_char_set_id -- character set def to supress
   *
   **************************************/
***************
*** 1898,1902 ****
  	{
  	char_sets[0] = 0;
! 	ISQL_get_character_sets (FLD.RDB$CHARACTER_SET_ID, FALSE, FALSE, char_sets);
  	if (char_sets[0])
  	    ISQL_printf (Out, char_sets);
--- 1949,1955 ----
  	{
  	char_sets[0] = 0;
! 	if ((FLD.RDB$CHARACTER_SET_ID != default_char_set_id) ||
! 	    (!FLD.RDB$COLLATION_ID.NULL && FLD.RDB$COLLATION_ID != 0))
! 	    ISQL_get_character_sets (FLD.RDB$CHARACTER_SET_ID, FALSE, FALSE, char_sets);
  	if (char_sets[0])
  	    ISQL_printf (Out, char_sets);
***************
*** 1946,1950 ****
  }
  
! static void list_domains (void)
  {
  /**************************************
--- 1999,2005 ----
  }
  
! static void list_domains (
!     SSHORT	default_char_set_id
! )
  {
  /**************************************
***************
*** 1957,1961 ****
   *	List domains 
   *
!  *	Parameters:  none
   *
   **************************************/
--- 2012,2017 ----
   *	List domains 
   *
!  *	Parameters:  
!  *	default_char_set_id -- character set def to supress
   *
   **************************************/
***************
*** 2085,2089 ****
  	{
  	char_sets[0] = 0;
! 	ISQL_get_character_sets (FLD.RDB$CHARACTER_SET_ID, FALSE, FALSE, char_sets);
  	if (char_sets[0])
  	    ISQL_printf (Out, char_sets);
--- 2141,2147 ----
  	{
  	char_sets[0] = 0;
! 	if ((FLD.RDB$CHARACTER_SET_ID != default_char_set_id) ||
!             (!FLD.RDB$COLLATION_ID.NULL && FLD.RDB$COLLATION_ID != 0))
! 	    ISQL_get_character_sets (FLD.RDB$CHARACTER_SET_ID, FALSE, FALSE, char_sets);
  	if (char_sets[0])
  	    ISQL_printf (Out, char_sets);

Index: isql.e
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/isql.e,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** isql.e	2000/12/08 16:59:33	1.6
--- isql.e	2001/01/08 16:07:18	1.7
***************
*** 974,977 ****
--- 974,1020 ----
  #endif
  
+ SSHORT ISQL_get_default_char_set_id ()
+ {
+ /************************************* 
+ *
+ *	I S Q L _ g e t _ d e f a u l t _ c h a r _ s e t _ i d
+ *
+ **************************************
+ *
+ * Functional description
+ *	Return the database default character set
+ *	id.
+ *
+ *	-1 if the value can not be determined.
+ *
+ **************************************/
+ SSHORT	default_char_set_id;
+ 
+ /* What is the default character set for this database?
+    There are three states:
+    1.	There is no entry available in RDB$DATABASE
+ 	Then - NONE
+    2.   The entry in RDB$DATABASE does not exist in 
+ 	RDB$CHARACTER_SETS
+ 	Then - -1 to cause all character set defs to show
+    3.	An entry in RDB$CHARACTER_SETS
+ 	Then - RDB$CHARACTER_SET_ID
+ */
+ default_char_set_id = 0;
+ FOR FIRST 1 EXT IN RDB$DATABASE
+     WITH EXT.RDB$CHARACTER_SET_NAME NOT MISSING;
+ 
+     default_char_set_id = -1;
+ 
+     FOR FIRST 1 CHI IN RDB$CHARACTER_SETS
+     WITH CHI.RDB$CHARACTER_SET_NAME = EXT.RDB$CHARACTER_SET_NAME
+ 
+ 	default_char_set_id = CHI.RDB$CHARACTER_SET_ID;
+ 
+     END_FOR;
+ END_FOR;
+ return (default_char_set_id);
+ }
+ 
  #ifdef GUI_TOOLS
  int ISQL_extract (
***************
*** 1071,1075 ****
  void ISQL_build_table_list (
      void        **tbl_list,
!     IB_FILE         *ipf,
      IB_FILE         *opf,
      IB_FILE         *sf)
--- 1114,1118 ----
  void ISQL_build_table_list (
      void        **tbl_list,
! IB_FILE         *ipf,
      IB_FILE         *opf,
      IB_FILE         *sf)
***************
*** 1441,1445 ****
  #endif
      }
! else if (!V33 && char_set_id)
      {
      FOR FIRST 1 CST IN RDB$CHARACTER_SETS WITH
--- 1484,1488 ----
  #endif
      }
! else if (!V33)
      {
      FOR FIRST 1 CST IN RDB$CHARACTER_SETS WITH
***************
*** 2957,2961 ****
  
  ISQL_make_upper (source);
! if (EXTRACT_list_table (source, destination, domain_flag))
      {
      gds__msg_format (NULL_PTR, ISQL_MSG_FAC, NOT_FOUND, sizeof (errbuf), 
--- 3000,3004 ----
  
  ISQL_make_upper (source);
! if (EXTRACT_list_table (source, destination, domain_flag,-1))
      {
      gds__msg_format (NULL_PTR, ISQL_MSG_FAC, NOT_FOUND, sizeof (errbuf), 

Index: isql_proto.h
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/isql_proto.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** isql_proto.h	2000/08/03 20:49:22	1.1.1.1
--- isql_proto.h	2001/01/08 16:07:18	1.2
***************
*** 68,71 ****
--- 68,72 ----
  						USHORT, 
  						TEXT *);
+ extern SSHORT	ISQL_get_default_char_set_id (void);
  extern void	ISQL_get_default_source (TEXT *, 
  						TEXT *, 

Index: show.e
===================================================================
RCS file: /cvsroot/firebird/interbase/isql/show.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** show.e	2000/12/08 16:59:33	1.3
--- show.e	2001/01/08 16:07:18	1.4
***************
*** 1837,1841 ****
--- 1837,1844 ----
  SSHORT	collation, char_set_id;
  TEXT	char_sets [86];	/* CHARACTER SET <name31> COLLATE <name31> */	
+ SSHORT	default_char_set_id;
  
+ default_char_set_id = ISQL_get_default_char_set_id ();
+ 
  /* If there is a relation_name, this is a real column, look up collation */
  /* in rdb$relation_fields */
***************
*** 1886,1890 ****
  
  char_sets [0] = 0;
! ISQL_get_character_sets (char_set_id, collation, FALSE, char_sets);
  if (char_sets [0])
      ISQL_printf(Out, char_sets);
--- 1889,1894 ----
  
  char_sets [0] = 0;
! if ((char_set_id != default_char_set_id) || collation)
!     ISQL_get_character_sets (char_set_id, collation, FALSE, char_sets);
  if (char_sets [0])
      ISQL_printf(Out, char_sets);

[Firebird-checkins] CVS: interbase/jrd evl.c,1.2,1.3

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv1810/jrd

Modified Files:
	evl.c 
Log Message:
Firebird Bug 127375 Grouping on derived fields processing NULL data kills IB

Test the null flag before trying to expand a value (via pointer) which does
not exist when it is a NULL.



Index: evl.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/evl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** evl.c	2000/11/30 14:23:44	1.2
--- evl.c	2001/01/07 18:18:12	1.3
***************
*** 20,23 ****
--- 20,24 ----
   * All Rights Reserved.
   * Contributor(s): ______________________________________.
+  * $Id$ 
   */
  
***************
*** 33,36 ****
--- 34,46 ----
   *            before the first fetch.
   */
+ /* 
+  * Modified by: Neil McCalden
+  * Date: 05 Jan 2001
+  * Problem:   Firebird bug: 127375
+  *            Group by on a calculated expression would cause segv
+  *            when it encountered a NULL value as the calculation
+  *            was trying reference a null pointer.
+  * Change:    Test the null flag before trying to expand the value.
+  */
  
  #include <string.h>
***************
*** 1373,1379 ****
  	impure = (VLUX) ((SCHAR*) request + from->nod_impure);
  	desc = EVL_expr (tdbb, from);
- 	EVL_make_value (tdbb, desc, impure);
  	if (request->req_flags & req_null)
  	    impure->vlu_desc.dsc_address = NULL;
  	}
  
--- 1383,1390 ----
  	impure = (VLUX) ((SCHAR*) request + from->nod_impure);
  	desc = EVL_expr (tdbb, from);
  	if (request->req_flags & req_null)
  	    impure->vlu_desc.dsc_address = NULL;
+ 	else 
+ 	    EVL_make_value (tdbb, desc, impure);
  	}
  
***************
*** 1397,1401 ****
  		vtemp.vlu_desc.dsc_address = NULL;
  	    desc = EVL_expr (tdbb, from);
- 	    EVL_make_value (tdbb, desc, impure);
  	    if (request->req_flags & req_null)
  		{
--- 1408,1411 ----
***************
*** 1406,1409 ****
--- 1416,1420 ----
  	    else
  		{
+ 		EVL_make_value (tdbb, desc, impure);
  		if (!vtemp.vlu_desc.dsc_address ||
  		    MOV_compare (&vtemp.vlu_desc, desc))

[Firebird-checkins] CVS: interbase/builds/original sfx.interbase,1.8,1.9

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv29087/builds/original

Modified Files:
	sfx.interbase 
Log Message:
Add explicit path to run check_messages script. Removes need to add . to path.


Index: sfx.interbase
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.interbase,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** sfx.interbase	2000/12/14 20:28:37	1.8
--- sfx.interbase	2001/01/07 17:24:24	1.9
***************
*** 388,392 ****
  	$(QUIET_ECHO) "Building message file(s)..."
  	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" check_messages'
! 	$(SH) '$(CD) source/msgs; check_messages -d $(MSGSDIR)master_msg_db -l'
  	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" interbase.msg'
  	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" includes.msg'
--- 388,392 ----
  	$(QUIET_ECHO) "Building message file(s)..."
  	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" check_messages'
! 	$(SH) '$(CD) source/msgs; ./check_messages -d $(MSGSDIR)master_msg_db -l'
  	$(SH) '$(CD) source/msgs; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" interbase.msg'
  	$(SH) '$(CD) source/jrd; $(MAKE) CFLAGS="$(CFLAGS)" SYSTEM="$(SYSTEM)" includes.msg'

[Firebird-checkins] CVS: interbase/builds/original install.unix,1.2,1.3

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv28572/builds/original

Modified Files:
	install.unix 
Log Message:
Fix problem of Solaris inetd.conf sym link broken on superserver install.


Index: install.unix
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/install.unix,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** install.unix	2000/12/14 20:07:46	1.2
--- install.unix	2001/01/07 17:17:44	1.3
***************
*** 176,182 ****
  if [ -f /etc/inetd.conf ]; then
      if [ "$SUPERSERVER" = "SUPERSERVER" ]; then
! 	# Remove gds_db service. We do not want gds_inet_server to be invoked
! 	cat /etc/inetd.conf | grep -v gds_db > inetd.conf
! 	mv inetd.conf /etc/inetd.conf
      else
  	grep -s gds_db /etc/inetd.conf  > /dev/null 2>&1
--- 176,186 ----
  if [ -f /etc/inetd.conf ]; then
      if [ "$SUPERSERVER" = "SUPERSERVER" ]; then
! 		# Remove gds_db service. We do not want gds_inet_server to be invoked
! 		cat /etc/inetd.conf | grep -v gds_db > inetd.conf
! 		if [ -f /etc/inet/inetd.conf ]; then 
! 			mv inetd.conf /etc/inet/inetd.conf
! 		else	
! 			mv inetd.conf /etc/inetd.conf
! 		fi
      else
  	grep -s gds_db /etc/inetd.conf  > /dev/null 2>&1

[Firebird-checkins] CVS: interbase/gpre cob.c,1.4,1.5

[Patrick J. P. G. <pat...@us...>]

Update of /cvsroot/firebird/interbase/gpre
In directory usw-pr-cvs1:/tmp/cvs-serv6414/interbase/gpre

Modified Files:
	cob.c 
Log Message:
COBOL programs randomly return a -901 request synchronization error. 

Alternate title: COBOL programs lose SQLCODE values during UPDATE. 

During 'UPDATE SET ... WHERE x=.. ' ('Mass Update') error codes returned by the update are not returned to the program, instead the program will see a -901 request synchronization error. 

It appears that the other language modules do not have this same problem.

...pat




Index: cob.c
===================================================================
RCS file: /cvsroot/firebird/interbase/gpre/cob.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** cob.c	2000/10/13 06:02:10	1.4
--- cob.c	2001/01/06 15:36:35	1.5
***************
*** 3612,3615 ****
--- 3612,3616 ----
  gen_s_start (action);
  request = action->act_request;
+ printa (names [COLUMN], FALSE, "IF SQLCODE = 0 THEN");
  port = request->req_primary;
  gen_receive (action, port);
***************
*** 3617,3620 ****
--- 3618,3622 ----
  printa (names [COLUMN], FALSE, "IF SQLCODE = 0 AND %s = 0 THEN ", name);
  printa (names [COLUMN], FALSE, "MOVE 100 TO SQLCODE");
+ printa (names [COLUMN], FALSE, "END-IF");
  printa (names [COLUMN], FALSE, "END-IF");
  }

[Firebird-checkins] CVS: interbase/jrd svc_undoc.h,1.1.1.1,1.2

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv8219/jrd

Modified Files:
	svc_undoc.h 
Log Message:
Fix broken comment syntax.


Index: svc_undoc.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/svc_undoc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** svc_undoc.h	2000/08/03 20:51:26	1.1.1.1
--- svc_undoc.h	2001/01/05 19:13:28	1.2
***************
*** 50,54 ****
   *                                          *
   *             UNDOCUMENTED                 *
! /********************************************/
  
  #define isc_spb_ibc_lock_mem_size     5
--- 50,54 ----
   *                                          *
   *             UNDOCUMENTED                 *
!  ********************************************/
  
  #define isc_spb_ibc_lock_mem_size     5

[Firebird-checkins] CVS: interbase/misc msg.gbak,1.2,1.3

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/interbase/misc
In directory usw-pr-cvs1:/tmp/cvs-serv29493

Modified Files:
	msg.gbak 
Log Message:
Somehow I committed a broken version of this file in the last commit
for T0.9-4 Test1 release. it wasn't obvious since I was using a set
of reference databases that were already built.  I've replaced it 
with the original 1.1 version.



Index: msg.gbak
===================================================================
RCS file: /cvsroot/firebird/interbase/misc/msg.gbak,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvss9uYC0 and /tmp/cvsMpAyS2 differ

[Firebird-checkins] CVS: interbase/jrd sort.c,1.7,1.8

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8918

Modified Files:
	sort.c 
Log Message:
Use the Firebird stdio definitions on Solaris.


Index: sort.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/sort.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** sort.c	2000/10/12 02:52:17	1.7
--- sort.c	2000/12/14 20:48:19	1.8
***************
*** 42,45 ****
--- 42,49 ----
  #include "../jrd/sch_proto.h"
  
+ #ifdef SOLARIS
+ #include "../jrd/ib_stdio.h"
+ #endif
+ 
  #if defined WIN_NT
  /* for SEEK_SET */

[Firebird-checkins] CVS: interbase/builds/original sfx.msgs,1.1.1.1,1.2

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6612

Modified Files:
	sfx.msgs 
Log Message:
Add explicit path to run script. Removes need to add . to path.


Index: sfx.msgs
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.msgs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** sfx.msgs	2000/08/03 20:42:51	1.1.1.1
--- sfx.msgs	2000/12/14 20:31:24	1.2
***************
*** 45,49 ****
  de_DE.msg:	build_file$(EXEC_EXT) indicator.msg indicator.loc
  	-$(RM) de_DE.msg source/interbase/intl/de_DE.msg
! 	build_file -d $(MSGSDIR)master_msg_db \
  	-l de_DE	\
  	-p source/interbase/intl
--- 45,49 ----
  de_DE.msg:	build_file$(EXEC_EXT) indicator.msg indicator.loc
  	-$(RM) de_DE.msg source/interbase/intl/de_DE.msg
! 	./build_file -d $(MSGSDIR)master_msg_db \
  	-l de_DE	\
  	-p source/interbase/intl
***************
*** 53,57 ****
  ja_JP_EUC.msg:	build_file$(EXEC_EXT) indicator.msg indicator.loc
  	-$(RM) ja_JP_EUC.msg source/interbase/intl/ja_JP_EUC.msg
! 	build_file -d $(MSGSDIR)master_msg_db \
  	-l ja_JP.EUC	\
  	-p source/interbase/intl
--- 53,57 ----
  ja_JP_EUC.msg:	build_file$(EXEC_EXT) indicator.msg indicator.loc
  	-$(RM) ja_JP_EUC.msg source/interbase/intl/ja_JP_EUC.msg
! 	./build_file -d $(MSGSDIR)master_msg_db \
  	-l ja_JP.EUC	\
  	-p source/interbase/intl
***************
*** 60,67 ****
  
  indicator.msg indicator.incl:	force
! 	check_messages -d $(MSGSDIR)master_msg_db
  
  indicator.loc:	force
! 	check_messages -d $(MSGSDIR)master_msg_db -l
  
  build_file:	build_file.o
--- 60,67 ----
  
  indicator.msg indicator.incl:	force
! 	./check_messages -d $(MSGSDIR)master_msg_db
  
  indicator.loc:	force
! 	./check_messages -d $(MSGSDIR)master_msg_db -l
  
  build_file:	build_file.o

[Firebird-checkins] CVS: interbase/builds/original sfx.interbase,1.7,1.8

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5582

Modified Files:
	sfx.interbase 
Log Message:
Add realclean target to remove object files etc. generated by the 
compiler and databases created by build process.



Index: sfx.interbase
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/sfx.interbase,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** sfx.interbase	2000/10/12 02:52:17	1.7
--- sfx.interbase	2000/12/14 20:28:37	1.8
***************
*** 21,24 ****
--- 21,27 ----
  INCLUDE_DEST=	source/interbase/include/
  
+ SRC_DIRS= alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \
+ 		  pyxis qli remote super/remote utilities wal 
+ 
  GPRE=		source/interbase/bin/gpre
  GBAK=		source/interbase/bin/gbak
***************
*** 589,592 ****
--- 592,614 ----
  	source/utilities/ibmgr source/utilities/ibguard \
  	source/wal/wal_writer
+ 
+ realclean: clean clean_obj clean_build_gdb
+ 	$(QUIET_ECHO) "Removed compiled binaries and build files."
+ 
+ clean_obj:
+ 	-for ND in ${SRC_DIRS} ; do \
+ 		rm $${ND}/*.o ; \
+ 		rm $${ND}/*.a ; \
+ 		rm $${ND}/*.j ; \
+ 		rm $${ND}/*.bin ; \
+ 	done 
+ 
+ clean_build_gdb:
+ 	-$(RM) \
+ 	source/example5/*.gdb \
+ 	jrd/isc.gdb \
+ 	jrd/yachts.gdb \
+ 	msgs/msg.gdb
+ 
  
  force:

[Firebird-checkins] CVS: interbase/builds/original set_prot,1.1.1.1,1.2

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4692

Modified Files:
	set_prot 
Log Message:
Set permissions on UDF directory and contents in build directory.


Index: set_prot
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/set_prot,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** set_prot	2000/08/03 20:42:48	1.1.1.1
--- set_prot	2000/12/14 20:16:38	1.2
***************
*** 45,48 ****
--- 45,50 ----
  	intl/*		\
  	lib/*		\
+ 	UDF			\
+ 	UDF/*		\
  	inetd.conf.isc	\
  	install		\
***************
*** 62,65 ****
--- 64,69 ----
  	intl/*		\
  	lib/*		\
+ 	UDF			\
+ 	UDF/*		\
  	inetd.conf.isc	\
  	install		\
***************
*** 78,81 ****
--- 82,86 ----
  	intl/*		\
  	lib/*		\
+ 	UDF/*		\
  	inetd.conf.isc	\
  	interbase.msg	\

[Firebird-checkins] CVS: interbase/builds/original run_edit,1.1.1.1,1.2

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4294

Modified Files:
	run_edit 
Log Message:
Add explicit path to run script. Removes need to add . to path.


Index: run_edit
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/run_edit,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** run_edit	2000/08/03 20:42:48	1.1.1.1
--- run_edit	2000/12/14 20:11:23	1.2
***************
*** 65,78 ****
  fi
  if [ $SYS_TYPE != 'NOLINK_OS' ]; then
!     edit_make $SYSTEM $VERSION refresh ../refresh
!     edit_make $SYSTEM $VERSION refresh.all ../refresh.all
      chmod +x ../refresh*
!     edit_make $SYSTEM $VERSION special_opt ../special_opt
      chmod +x ../special_opt
      if [ $SYSTEM = 'DELTA' ]; then
!         edit_make $SYSTEM $VERSION expand_dbs ../expand_dbs
!         edit_make $SYSTEM $VERSION compress_dbs ../compress_dbs
!         edit_make $SYSTEM $VERSION expand.sed ../expand.sed
!         edit_make $SYSTEM $VERSION compress.sed ../compress.sed
          chmod +x ../expand_dbs
          chmod +x ../compress_dbs
--- 65,78 ----
  fi
  if [ $SYS_TYPE != 'NOLINK_OS' ]; then
!     ./edit_make $SYSTEM $VERSION refresh ../refresh
!     ./edit_make $SYSTEM $VERSION refresh.all ../refresh.all
      chmod +x ../refresh*
!     ./edit_make $SYSTEM $VERSION special_opt ../special_opt
      chmod +x ../special_opt
      if [ $SYSTEM = 'DELTA' ]; then
!         ./edit_make $SYSTEM $VERSION expand_dbs ../expand_dbs
!         ./edit_make $SYSTEM $VERSION compress_dbs ../compress_dbs
!         ./edit_make $SYSTEM $VERSION expand.sed ../expand.sed
!         ./edit_make $SYSTEM $VERSION compress.sed ../compress.sed
          chmod +x ../expand_dbs
          chmod +x ../compress_dbs
***************
*** 96,125 ****
          edit_make $SYSTEM $VERSION special_opt ../../special_opt.ksh
      else
!         edit_make $SYSTEM $VERSION refresh ../../refresh
!         edit_make $SYSTEM $VERSION refresh.all ../../refresh.all
          chmod +x ../../refresh*
!         edit_make $SYSTEM $VERSION expand_dbs ../../expand_dbs
!         edit_make $SYSTEM $VERSION compress_dbs ../../compress_dbs
          chmod +x ../../expand_dbs
          chmod +x ../../compress_dbs
!         edit_make $SYSTEM $VERSION copy_makes ../../copy_makes
          chmod +x ../../copy_makes
!         edit_make $SYSTEM $VERSION fetch_comp ../../fetch_comp
          chmod +x ../../fetch_comp
!         edit_make $SYSTEM $VERSION build_kit ../../build_kit
          chmod +x ../../build_kit
!         edit_make $SYSTEM $VERSION special_opt ../../special_opt
          chmod +x ../../special_opt
!         edit_make $SYSTEM $VERSION set_prot ../../set_prot
          chmod +x ../../set_prot
!         edit_make $SYSTEM $VERSION unset_prot ../../unset_prot
          chmod +x ../../unset_prot
      fi
!     edit_make $SYSTEM $VERSION expand.sed ../expand.sed
!     edit_make $SYSTEM $VERSION compress.sed ../compress.sed
!     edit_make $SYSTEM $VERSION add_template ../../add_template
!     edit_make $SYSTEM $VERSION mpm_template ../../mpm_template
!     edit_make $SYSTEM $VERSION mpp_template ../../mpp_template
!     edit_make $SYSTEM $VERSION put_template ../../put_template
      chmod +x ../../add_template
      chmod +x ../../mpm_template
--- 96,125 ----
          edit_make $SYSTEM $VERSION special_opt ../../special_opt.ksh
      else
!         ./edit_make $SYSTEM $VERSION refresh ../../refresh
!         ./edit_make $SYSTEM $VERSION refresh.all ../../refresh.all
          chmod +x ../../refresh*
!         ./edit_make $SYSTEM $VERSION expand_dbs ../../expand_dbs
!         ./edit_make $SYSTEM $VERSION compress_dbs ../../compress_dbs
          chmod +x ../../expand_dbs
          chmod +x ../../compress_dbs
!         ./edit_make $SYSTEM $VERSION copy_makes ../../copy_makes
          chmod +x ../../copy_makes
!         ./edit_make $SYSTEM $VERSION fetch_comp ../../fetch_comp
          chmod +x ../../fetch_comp
!         ./edit_make $SYSTEM $VERSION build_kit ../../build_kit
          chmod +x ../../build_kit
!         ./edit_make $SYSTEM $VERSION special_opt ../../special_opt
          chmod +x ../../special_opt
!         ./edit_make $SYSTEM $VERSION set_prot ../../set_prot
          chmod +x ../../set_prot
!         ./edit_make $SYSTEM $VERSION unset_prot ../../unset_prot
          chmod +x ../../unset_prot
      fi
!     ./edit_make $SYSTEM $VERSION expand.sed ../expand.sed
!     ./edit_make $SYSTEM $VERSION compress.sed ../compress.sed
!     ./edit_make $SYSTEM $VERSION add_template ../../add_template
!     ./edit_make $SYSTEM $VERSION mpm_template ../../mpm_template
!     ./edit_make $SYSTEM $VERSION mpp_template ../../mpp_template
!     ./edit_make $SYSTEM $VERSION put_template ../../put_template
      chmod +x ../../add_template
      chmod +x ../../mpm_template

[Firebird-checkins] CVS: interbase/builds/original install.unix,1.1.1.1,1.2

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv3635

Modified Files:
	install.unix 
Log Message:
Remove license and interclient install. 
Fix problem of Solaris inetd.conf and services sym links being broken.



Index: install.unix
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/install.unix,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** install.unix	2000/08/03 20:42:43	1.1.1.1
--- install.unix	2000/12/14 20:07:46	1.2
***************
*** 17,20 ****
--- 17,25 ----
  # Contributor(s): ______________________________________.
  #
+ # 07-Nov-2000  nm...@us... - Firebird 0.9
+ #              Remove creation of license file and Interclient install.
+ #              Overwrite real services and inetd.conf files rather than
+ #              break the links on Solaris.
+ #                            
  # /usr/interbase/install	-- Install InterBase
  #
***************
*** 147,152 ****
  chmod uog=rw isc4.gdb
  chmod uog=rw help/help.gdb
! chmod uog=rw examples/employee.gdb
! chmod uog=rw examples/intlemp.gdb
  if [ "$SUPERSERVER" = "SUPERSERVER" ]; then
      chmod 4755 $INTERBASE/bin/gstat
--- 152,157 ----
  chmod uog=rw isc4.gdb
  chmod uog=rw help/help.gdb
! #chmod uog=rw examples/employee.gdb
! #chmod uog=rw examples/intlemp.gdb
  if [ "$SUPERSERVER" = "SUPERSERVER" ]; then
      chmod 4755 $INTERBASE/bin/gstat
***************
*** 159,166 ****
      grep -s gds_db /etc/services  > /dev/null 2>&1
      if test $? != 0 ; then
! 	HUPNEEDED='y'
          cat /etc/services services.isc > services
! 	mv services /etc/services
!     fi
  fi
  if [ -f /etc/inetd.conf ]; then
--- 164,176 ----
      grep -s gds_db /etc/services  > /dev/null 2>&1
      if test $? != 0 ; then
! 		HUPNEEDED='y'
          cat /etc/services services.isc > services
! 		if [ -f /etc/inet/services ]; then
! 			# /etc/services will be a link on Solaris
! 			mv services /etc/inet/services
! 		else 
! 			mv services /etc/services
!     	fi
! 	fi
  fi
  if [ -f /etc/inetd.conf ]; then
***************
*** 174,178 ****
  	    HUPNEEDED='y'
  	    cat /etc/inetd.conf inetd.conf.isc > inetd.conf
! 	    mv inetd.conf /etc/inetd.conf
  	fi
      fi
--- 184,193 ----
  	    HUPNEEDED='y'
  	    cat /etc/inetd.conf inetd.conf.isc > inetd.conf
! 		if [ -f /etc/inet/inetd.conf ]; then 
! 			# /etc/inetd.conf a link
! 	    	mv inetd.conf /etc/inet/inetd.conf
! 		else	
! 	    	mv inetd.conf /etc/inetd.conf
! 		fi
  	fi
      fi
***************
*** 194,200 ****
  
  # Currently SCO is the only classic for 5.5, add other platforms 
! # later as required
  OSNAME=`uname -s`
! if [ "$OSNAME" = "SCO_SV" ] 
  then
  	if [ "$HUPNEEDED" = 'y' ]
--- 209,216 ----
  
  # Currently SCO is the only classic for 5.5, add other platforms 
! # later as required 
! # 07-Nov-2000 Solaris as well
  OSNAME=`uname -s`
! if [ "$OSNAME" = "SCO_SV" -o "$OSNAME" = "SunOS" ] 
  then
  	if [ "$HUPNEEDED" = 'y' ]
***************
*** 221,314 ****
  fi
  
! #
! # Create the license file
! #
! print -n "Please enter the license certificate id: "
! read
! case "$REPLY" in
!   "eval" | "" )
!       print Creating a 90-day evaluation license.
!       $INTERBASE/bin/iblicense -eval
!       chmod uog=r $INTERBASE/ib_license.dat
!       ;;
!   * )
!       id=$REPLY
!       print -n "Please enter the license certificate key: "
!       read
!       if [ "$REPLY" = "" ] ; then
! 	print "We need the license key which matches your license id."
! 	print -n "Please enter the license certificate key: "
! 	read
!       fi
!       if [ "$REPLY" != "" ] ; then
! 	print Creating the license.
! 	$INTERBASE/bin/iblicense -add -id $id -key $REPLY
!         chmod uog=r $INTERBASE/ib_license.dat
!       else
! 	print \
! "No license created.  Please see the release notes to create a license file."
!       fi
!       ;;
! esac
  
- #
- # Install InterClient if the user chooses to do so.
- #
- 
- # Skip Interclient install altogether for SCO since Interclient
- # is a separate package to be installed through custom on SCO 
- if [ "$OSNAME" != "SCO_SV" ]
- then
- 
- 	ic="InterClient*.tar"
- 	ic_install=NO
- 	if [ `uname -s` = "HP-UX" ]; then
- 		ic_path="/SD_CDROM"
- 	else
- 		ic_path="/cdrom"
- 	fi
- 	ic_done=NO
- 	while [ $ic_install != YES ] ; do
- 		print -n "Do you wish to install InterClient[yn]? "
- 		read
- 		case $REPLY in
- 		  y|Y|yes|Yes|YES )
- 		  while [ $ic_done != YES ] ; do
- 			  if [ -f $ic_path/$ic ]; then
- 			  cd /tmp;
- 			  tar xpf $ic_path/$ic;
- 			  cd interclient_install_temp_dir;
- 			  ./install.sh;
- 			  ic_done=YES;
- 			  else
- 			  echo "\nWARNING: $ic_path/$ic not found\n"
- 			  ic_select=NO
- 			  while [ $ic_select != YES ] ; do
- 				  echo "Select \"Q\" to quit, or"
- 				  echo "       \"S\" to specify the new path."
- 				  echo "Enter selection : \c"
- 				  read selection
- 				  case $selection in
- 				  Q|q )
- 					  echo "We did NOT install InterClient."
- 					  ic_done=YES;
- 					  ic_select=YES;;
- 				  S|s )
- 					  echo "Please specify the path : \c"
- 					  read ic_path
- 					  ic_select=YES;;
- 				  * )
- 					  echo "\nWARNING: Selection \"$selection\" not understood\n";;
- 				  esac
- 			  done
- 			  fi
- 		  done
- 			  ic_install=YES;;
- 		  n|N|no|No|NO )
- 		  echo "We did NOT install InterClient."
- 		  ic_install=YES;;
- 		  * )
- 		  echo "Please reply y or n (in upper or lower case)"
- 		esac
- 	done
- fi
--- 237,240 ----
  fi
  
! echo "done."
  

[Firebird-checkins] CVS: interbase/builds/original edit_makes,1.1.1.1,1.2

[Neil M. <nm...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory slayer.i.sourceforge.net:/tmp/cvs-serv2750

Modified Files:
	edit_makes 
Log Message:
Add explicit path to run script. Removes need to add . to path.



Index: edit_makes
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/edit_makes,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** edit_makes	2000/08/03 20:42:42	1.1.1.1
--- edit_makes	2000/12/14 19:59:55	1.2
***************
*** 15,17 ****
  # All Rights Reserved.
  # Contributor(s): ______________________________________.
! ls make.* | awk '{print "edit_make $(SYSTEM) $(VERSION) " $1 " ../" $1}' | sh
--- 15,17 ----
  # All Rights Reserved.
  # Contributor(s): ______________________________________.
! ls make.* | awk '{print "./edit_make $(SYSTEM) $(VERSION) " $1 " ../" $1}' | sh