*** infile.c.orig	Sat Apr 21 14:59:49 2001
--- infile.c	Sat Apr 13 21:51:38 2002
***************
*** 807,830 ****
  
  static void ProcessPDBBond( void )
  {
!     register int srcatm;
!     register int dstatm;
!     register int i, len;
  
      len = strlen(Record);
!     if( len < 16 ) return;
!     srcatm = (int)ReadValue(6,5);
      if( !srcatm ) return;
  
      for( i=11; i<=26 && Record[i]; i+=5 )
!     { if( len < i+5 ) return;
!       dstatm = (int)ReadValue(i,5);
        if( dstatm )
        CreateNewBond(srcatm,dstatm);
      }
  
      for( i=31; i<=56 && Record[i]; i+=5 )
!     { if( len < i+5 ) return;
        dstatm = (int)ReadValue(i,5);
        if( i < 41 || (i > 45 && i < 56)) {
          if( dstatm && srcatm < dstatm )
--- 807,831 ----
  
  static void ProcessPDBBond( void )
  {
!     register Long srcatm;
!     register Long dstatm;
!     register int i;
!     register size_t len;
  
      len = strlen(Record);
!     if( len < (size_t)16 ) return;
!     srcatm = (Long)ReadValue(6,5);
      if( !srcatm ) return;
  
      for( i=11; i<=26 && Record[i]; i+=5 )
!     { if( len < (size_t)(i+5) ) return;
!       dstatm = (Long)ReadValue(i,5);
        if( dstatm )
        CreateNewBond(srcatm,dstatm);
      }
  
      for( i=31; i<=56 && Record[i]; i+=5 )
!     { if( len < (size_t)(i+5) ) return;
        dstatm = (int)ReadValue(i,5);
        if( i < 41 || (i > 45 && i < 56)) {
          if( dstatm && srcatm < dstatm )
***************
*** 1302,1308 ****
      double xpos, ypos, zpos;
      long features, sets, serno;
      long atoms, bonds, structs;
!     long srcatm, dstatm;
   
      char name[20];
      char type[8];
--- 1303,1309 ----
      double xpos, ypos, zpos;
      long features, sets, serno;
      long atoms, bonds, structs;
!     Long srcatm, dstatm;
   
      char name[20];
      char type[8];
***************
*** 1343,1349 ****
   
                   ptr = CreateAtom(); 
                   ptr->refno = FindSybylRefNo( type );
!                  ptr->serno = serno;
                   /* ptr->serno = i; */
   
                   ptr->xorg =  (Long)(250.0*xpos);
--- 1344,1350 ----
   
                   ptr = CreateAtom(); 
                   ptr->refno = FindSybylRefNo( type );
!                  ptr->serno = (Long)serno;
                   /* ptr->serno = i; */
   
                   ptr->xorg =  (Long)(250.0*xpos);
***************
*** 1401,1407 ****
  
  int LoadAlchemyMolecule( FILE *fp )
  {
!     auto long serno,srcatm,dstatm;
      register RAtom __far *ptr;
      register Long atoms, bonds;
      register char *chptr;
--- 1402,1408 ----
  
  int LoadAlchemyMolecule( FILE *fp )
  {
!     auto Long serno,srcatm,dstatm;
      register RAtom __far *ptr;
      register Long atoms, bonds;
      register char *chptr;
***************
*** 1841,1847 ****
  {
      register int lstr, ii;
  
!     lstr = strlen(str);
      for (ii = lstr; ii > 0; ii--)
      {
        if (str[ii-1] != ' ' && str[ii-1] != '\t') {
--- 1842,1848 ----
  {
      register int lstr, ii;
  
!     lstr = (int)strlen(str);
      for (ii = lstr; ii > 0; ii--)
      {
        if (str[ii-1] != ' ' && str[ii-1] != '\t') {
***************
*** 1865,1871 ****
    if (!cif_findtag(cif, tag)
       || (alttag && (!cif_findtag(cif, alttag)))) {
      cif_get_value(cif, (char __far * __far *) &value);
!     return cif_ctonum(value, strlen(value), dvalue, 
        NULL, NULL, NULL, NULL, NULL, NULL, NULL);
    }
    return 1;
--- 1866,1872 ----
    if (!cif_findtag(cif, tag)
       || (alttag && (!cif_findtag(cif, alttag)))) {
      cif_get_value(cif, (char __far * __far *) &value);
!     return cif_ctonum(value, (int)strlen(value), dvalue, 
        NULL, NULL, NULL, NULL, NULL, NULL, NULL);
    }
    return 1;
***************
*** 1878,1884 ****
    if (column == -1) return 1;
    if (!cif_select_column(cif,column)){
      cif_get_value(cif, (char __far * __far *) &value);
!     if (cif_ctonum(value, strlen(value), dvalue, 
        NULL, NULL, NULL, NULL, NULL, NULL, NULL)) return 1;
      return 0;
    }
--- 1879,1885 ----
    if (column == -1) return 1;
    if (!cif_select_column(cif,column)){
      cif_get_value(cif, (char __far * __far *) &value);
!     if (cif_ctonum(value, (int)strlen(value), dvalue, 
        NULL, NULL, NULL, NULL, NULL, NULL, NULL)) return 1;
      return 0;
    }
***************
*** 1918,1925 ****
      char __far tmparg[5];
      char symbol[5]="  ";
  
!     laid = strlen(label_atom_id);
!     lat = type_symbol?strlen(type_symbol):0;
      if (lat > 1) {
        if ((type_symbol[lat-1] =='+') || (type_symbol[lat-1] == '-')) {
          if (strchr("0123456789",type_symbol[lat-2])) {
--- 1919,1926 ----
      char __far tmparg[5];
      char symbol[5]="  ";
  
!     laid = (int)strlen(label_atom_id);
!     lat = type_symbol?(int)strlen(type_symbol):0;
      if (lat > 1) {
        if ((type_symbol[lat-1] =='+') || (type_symbol[lat-1] == '-')) {
          if (strchr("0123456789",type_symbol[lat-2])) {
***************
*** 2258,2264 ****
          ReadCIFstr(cif,col_label_alt_id,label_alt_id,1);
          if (label_alt_id[0] == '\0') strcpy(label_alt_id," ");
          ReadCIFstr(cif,col_label_comp_id,label_comp_id,3);
!         if (strlen(label_comp_id)<3) RightJustify(label_comp_id,3);
          ReadCIFstr(cif,col_label_asym_id,label_asym_id,1);
          if (label_asym_id[0] == '\0') {
            strcpy(label_asym_id," ");
--- 2259,2265 ----
          ReadCIFstr(cif,col_label_alt_id,label_alt_id,1);
          if (label_alt_id[0] == '\0') strcpy(label_alt_id," ");
          ReadCIFstr(cif,col_label_comp_id,label_comp_id,3);
!         if (strlen(label_comp_id)<(size_t)3) RightJustify(label_comp_id,3);
          ReadCIFstr(cif,col_label_asym_id,label_asym_id,1);
          if (label_asym_id[0] == '\0') {
            strcpy(label_asym_id," ");
***************
*** 2278,2284 ****
            ReadCIFstr(cif,col_model_id,modelstr,5);
            NMRModel = 0;
            if (modelstr[0]) {
!             NMRModel = strtol(modelstr,
                (char __far * __far *)&endptr, 10);
              if (! (NMRModel == oNMRModel) ) {
                 ConnectAtom = (void __far*)0;
--- 2279,2285 ----
            ReadCIFstr(cif,col_model_id,modelstr,5);
            NMRModel = 0;
            if (modelstr[0]) {
!             NMRModel = (int)strtol(modelstr,
                (char __far * __far *)&endptr, 10);
              if (! (NMRModel == oNMRModel) ) {
                 ConnectAtom = (void __far*)0;
***************
*** 2291,2297 ****
            icode = sicode = ' ';
            if((auth_seq=!ReadCIFstr(cif,col_auth_seq_id,label_seq_id,5))||
  	    (!ReadCIFstr(cif,col_label_seq_id,label_seq_id,5))){
!             seqnum = strtol(label_seq_id, 
                (char __far * __far *)&endptr, 10);
              icode = ' ';
              if (*endptr != '\0') icode = *endptr;
--- 2292,2298 ----
            icode = sicode = ' ';
            if((auth_seq=!ReadCIFstr(cif,col_auth_seq_id,label_seq_id,5))||
  	    (!ReadCIFstr(cif,col_label_seq_id,label_seq_id,5))){
!             seqnum = (int)strtol(label_seq_id, 
                (char __far * __far *)&endptr, 10);
              icode = ' ';
              if (*endptr != '\0') icode = *endptr;
***************
*** 2298,2304 ****
            }
            if (auth_seq &&
  	    (!ReadCIFstr(cif,col_label_seq_id,label_seq_id,5))){
!             sseqnum = strtol(label_seq_id, 
                (char __far * __far *)&endptr, 10);
              sicode = ' ';
              if (*endptr != '\0') sicode = *endptr;
--- 2299,2305 ----
            }
            if (auth_seq &&
  	    (!ReadCIFstr(cif,col_label_seq_id,label_seq_id,5))){
!             sseqnum = (int)strtol(label_seq_id, 
                (char __far * __far *)&endptr, 10);
              sicode = ' ';
              if (*endptr != '\0') sicode = *endptr;
***************
*** 2323,2329 ****
          ptr = CreateAtom();
          {
            char __far * endptr;
!           ptr->serno = strtol(idstr, (char __far * __far *)&endptr,10);
            if (*endptr != '\0') ptr->serno = rownum+1;
  	} 
          ptr->altl = label_alt_id[0];
--- 2324,2330 ----
          ptr = CreateAtom();
          {
            char __far * endptr;
!           ptr->serno = (int)strtol(idstr, (char __far * __far *)&endptr,10);
            if (*endptr != '\0') ptr->serno = rownum+1;
  	} 
          ptr->altl = label_alt_id[0];
***************
*** 2371,2377 ****
            int i, laid, lat;
            char __far tmparg[5];
  
!           lat = strlen(type_symbol);
            if (lat > 1) {
              if ((type_symbol[lat-1] =='+') || (type_symbol[lat-1] == '-')) {
                if (strchr("0123456789",type_symbol[lat-2])) {
--- 2372,2378 ----
            int i, laid, lat;
            char __far tmparg[5];
  
!           lat = (int)strlen(type_symbol);
            if (lat > 1) {
              if ((type_symbol[lat-1] =='+') || (type_symbol[lat-1] == '-')) {
                if (strchr("0123456789",type_symbol[lat-2])) {
***************
*** 2381,2387 ****
                }
              }
            }
!           laid = strlen(label_atom_id);
            for (i = laid; i < 5; i++) label_atom_id[i] = '\0';
            strcpy(tmparg,label_atom_id);
            if ((label_atom_id[0] < '0') || (label_atom_id[0] > '9') ){
--- 2382,2388 ----
                }
              }
            }
!           laid = (int)strlen(label_atom_id);
            for (i = laid; i < 5; i++) label_atom_id[i] = '\0';
            strcpy(tmparg,label_atom_id);
            if ((label_atom_id[0] < '0') || (label_atom_id[0] > '9') ){
***************
*** 2564,2570 ****
          if (ReadCIFstr(cif,col_ptnr1_label_comp_id,CompId1,3))
            ReadCIFstr(cif,col_ptnr1_auth_comp_id,CompId1,3);
          if (CompId1[0] &&strlen(CompId1)<3) RightJustify(CompId1,3);
!         ReadCIFstr(cif,col_ptnr1_auth_seq_id,SeqId1,5);
          ReadCIFstr(cif,col_ptnr1_label_model_id,ModelId1,5);
          ReadCIFstr(cif,col_ptnr1_atom_site_id,SiteId1,6);
          ReadCIFstr(cif,col_ptnr1_symmetry,Symm1,7);
--- 2565,2571 ----
          if (ReadCIFstr(cif,col_ptnr1_label_comp_id,CompId1,3))
            ReadCIFstr(cif,col_ptnr1_auth_comp_id,CompId1,3);
          if (CompId1[0] &&strlen(CompId1)<3) RightJustify(CompId1,3);
!         if (CompId1[0] &&strlen(CompId1)<(size_t)3) RightJustify(CompId1,3);
          ReadCIFstr(cif,col_ptnr1_label_model_id,ModelId1,5);
          ReadCIFstr(cif,col_ptnr1_atom_site_id,SiteId1,6);
          ReadCIFstr(cif,col_ptnr1_symmetry,Symm1,7);
***************
*** 2579,2585 ****
          if (ReadCIFstr(cif,col_ptnr2_label_comp_id,CompId2,3))
            ReadCIFstr(cif,col_ptnr2_auth_comp_id,CompId2,3);
          if (CompId2[0] &&strlen(CompId2)<3) RightJustify(CompId2,3);
!         ReadCIFstr(cif,col_ptnr2_auth_seq_id,SeqId2,5);
          ReadCIFstr(cif,col_ptnr2_label_model_id,ModelId2,5);
          ReadCIFstr(cif,col_ptnr2_atom_site_id,SiteId2,6);
          ReadCIFstr(cif,col_ptnr2_symmetry,Symm2,7);
--- 2580,2586 ----
          if (ReadCIFstr(cif,col_ptnr2_label_comp_id,CompId2,3))
            ReadCIFstr(cif,col_ptnr2_auth_comp_id,CompId2,3);
          if (CompId2[0] &&strlen(CompId2)<3) RightJustify(CompId2,3);
!         if (CompId2[0] &&strlen(CompId2)<(size_t)3) RightJustify(CompId2,3);
          ReadCIFstr(cif,col_ptnr2_label_model_id,ModelId2,5);
          ReadCIFstr(cif,col_ptnr2_atom_site_id,SiteId2,6);
          ReadCIFstr(cif,col_ptnr2_symmetry,Symm2,7);
***************
*** 2587,2599 ****
          Icode1 = Icode2 = '\0';
          ResNum1 = ResNum2 = -9999;
          if (SeqId1[0]){
!             ResNum1 = strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              Icode1 = ' ';
              if (*endptr != '\0') Icode1 = *endptr;
          }
          if (SeqId2[0]){
!             ResNum2 = strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              Icode2 = ' ';
              if (*endptr != '\0') Icode2 = *endptr;
--- 2588,2600 ----
          Icode1 = Icode2 = '\0';
          ResNum1 = ResNum2 = -9999;
          if (SeqId1[0]){
!             ResNum1 = (int)strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              Icode1 = ' ';
              if (*endptr != '\0') Icode1 = *endptr;
          }
          if (SeqId2[0]){
!             ResNum2 = (int)strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              Icode2 = ' ';
              if (*endptr != '\0') Icode2 = *endptr;
***************
*** 2603,2609 ****
          sResNum1 = sResNum2 = -9999;
          if(!ReadCIFstr(cif,col_ptnr1_label_seq_id,SeqId1,5))
          if (SeqId1[0]){
!             sResNum1 = strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              sIcode1 = ' ';
              if (*endptr != '\0') sIcode1 = *endptr;
--- 2604,2610 ----
          sResNum1 = sResNum2 = -9999;
          if(!ReadCIFstr(cif,col_ptnr1_label_seq_id,SeqId1,5))
          if (SeqId1[0]){
!             sResNum1 = (int)strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              sIcode1 = ' ';
              if (*endptr != '\0') sIcode1 = *endptr;
***************
*** 2610,2616 ****
          }
          if(!ReadCIFstr(cif,col_ptnr2_label_seq_id,SeqId2,5))
          if (SeqId2[0]){
!             sResNum2 = strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              sIcode2 = ' ';
              if (*endptr != '\0') sIcode2 = *endptr;
--- 2611,2617 ----
          }
          if(!ReadCIFstr(cif,col_ptnr2_label_seq_id,SeqId2,5))
          if (SeqId2[0]){
!             sResNum2 = (int)strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              sIcode2 = ' ';
              if (*endptr != '\0') sIcode2 = *endptr;
***************
*** 2618,2628 ****
  
          Sitenum1 = Sitenum2 =0;
          if (SiteId1[0]) {
!             Sitenum1 = strtol(SiteId1, 
                (char __far * __far *)&endptr, 10);
          }
          if (SiteId2[0]) {
!             Sitenum2 = strtol(SiteId2, 
                (char __far * __far *)&endptr, 10);
          }
  
--- 2619,2629 ----
  
          Sitenum1 = Sitenum2 =0;
          if (SiteId1[0]) {
!             Sitenum1 = (int)strtol(SiteId1, 
                (char __far * __far *)&endptr, 10);
          }
          if (SiteId2[0]) {
!             Sitenum2 = (int)strtol(SiteId2, 
                (char __far * __far *)&endptr, 10);
          }
  
***************
*** 2759,2765 ****
          if (ReadCIFstr(cif,col_label_comp_id_1,CompId1,3))
            ReadCIFstr(cif,col_auth_comp_id_1,CompId1,3);
          if (CompId1[0] &&strlen(CompId1)<3) RightJustify(CompId1,3);
!         ReadCIFstr(cif,col_auth_seq_id_1,SeqId1,5);
          ReadCIFstr(cif,col_atom_site_id_1,SiteId1,6);
          strncpy(oidstr1,SiteId1,5);
          ReadCIFstr(cif,col_symmetry_1,Symm1,7);
--- 2760,2766 ----
          if (ReadCIFstr(cif,col_label_comp_id_1,CompId1,3))
            ReadCIFstr(cif,col_auth_comp_id_1,CompId1,3);
          if (CompId1[0] &&strlen(CompId1)<3) RightJustify(CompId1,3);
!         if (CompId1[0] &&strlen(CompId1)<(size_t)3) RightJustify(CompId1,3);
          ReadCIFstr(cif,col_atom_site_id_1,SiteId1,6);
          strncpy(oidstr1,SiteId1,5);
          ReadCIFstr(cif,col_symmetry_1,Symm1,7);
***************
*** 2774,2780 ****
          if (ReadCIFstr(cif,col_label_comp_id_2,CompId2,3))
            ReadCIFstr(cif,col_auth_comp_id_2,CompId2,3);
          if (CompId1[0] &&strlen(CompId2)<3) RightJustify(CompId2,3);
!         ReadCIFstr(cif,col_auth_seq_id_1,SeqId2,5);
          ReadCIFstr(cif,col_atom_site_id_2,SiteId2,6);
          strncpy(oidstr2,SiteId2,5);
          ReadCIFstr(cif,col_symmetry_2,Symm2,7);
--- 2775,2781 ----
          if (ReadCIFstr(cif,col_label_comp_id_2,CompId2,3))
            ReadCIFstr(cif,col_auth_comp_id_2,CompId2,3);
          if (CompId1[0] &&strlen(CompId2)<3) RightJustify(CompId2,3);
!         if (CompId1[0] &&strlen(CompId2)<(size_t)3) RightJustify(CompId2,3);
          ReadCIFstr(cif,col_atom_site_id_2,SiteId2,6);
          strncpy(oidstr2,SiteId2,5);
          ReadCIFstr(cif,col_symmetry_2,Symm2,7);
***************
*** 2785,2797 ****
          Icode1 = Icode2 = '\0';
          ResNum1 = ResNum2 = -9999;
          if (SeqId1[0]){
!             ResNum1 = strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              Icode1 = ' ';
              if (*endptr != '\0') Icode1 = *endptr;
          }
          if (SeqId2[0]){
!             ResNum2 = strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              Icode2 = ' ';
              if (*endptr != '\0') Icode2 = *endptr;
--- 2786,2798 ----
          Icode1 = Icode2 = '\0';
          ResNum1 = ResNum2 = -9999;
          if (SeqId1[0]){
!             ResNum1 = (int)strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              Icode1 = ' ';
              if (*endptr != '\0') Icode1 = *endptr;
          }
          if (SeqId2[0]){
!             ResNum2 = (int)strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              Icode2 = ' ';
              if (*endptr != '\0') Icode2 = *endptr;
***************
*** 2801,2807 ****
          sResNum1 = sResNum2 = -9999;
          if(!ReadCIFstr(cif,col_label_seq_id_1,SeqId1,5))
          if (SeqId1[0]){
!             sResNum1 = strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              sIcode1 = ' ';
              if (*endptr != '\0') sIcode1 = *endptr;
--- 2802,2808 ----
          sResNum1 = sResNum2 = -9999;
          if(!ReadCIFstr(cif,col_label_seq_id_1,SeqId1,5))
          if (SeqId1[0]){
!             sResNum1 = (int)strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              sIcode1 = ' ';
              if (*endptr != '\0') sIcode1 = *endptr;
***************
*** 2808,2814 ****
          }
          if(!ReadCIFstr(cif,col_label_seq_id_1,SeqId2,5))
          if (SeqId2[0]){
!             sResNum2 = strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              sIcode2 = ' ';
              if (*endptr != '\0') sIcode2 = *endptr;
--- 2809,2815 ----
          }
          if(!ReadCIFstr(cif,col_label_seq_id_1,SeqId2,5))
          if (SeqId2[0]){
!             sResNum2 = (int)strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              sIcode2 = ' ';
              if (*endptr != '\0') sIcode2 = *endptr;
***************
*** 2816,2826 ****
  
          Sitenum1 = Sitenum2 =0;
          if (SiteId1[0]) {
!             Sitenum1 = strtol(SiteId1, 
                (char __far * __far *)&endptr, 10);
          }
          if (SiteId2[0]) {
!             Sitenum2 = strtol(SiteId2, 
                (char __far * __far *)&endptr, 10);
          }
  
--- 2817,2827 ----
  
          Sitenum1 = Sitenum2 =0;
          if (SiteId1[0]) {
!             Sitenum1 = (int)strtol(SiteId1, 
                (char __far * __far *)&endptr, 10);
          }
          if (SiteId2[0]) {
!             Sitenum2 = (int)strtol(SiteId2, 
                (char __far * __far *)&endptr, 10);
          }
  
***************
*** 2934,2940 ****
            ReadCIFstr(cif,col_beg_auth_asym_id,Asym1,1);
          if (ReadCIFstr(cif,col_beg_label_comp_id,CompId1,3))
            ReadCIFstr(cif,col_beg_auth_comp_id,CompId1,3);
!         if (CompId1[0] &&(i=strlen(CompId1))<3) RightJustify(CompId1,3);
          ReadCIFstr(cif,col_beg_auth_seq_id,SeqId1,5);
  
          if (ReadCIFstr(cif,col_end_label_asym_id,Asym2,1))
--- 2935,2941 ----
            ReadCIFstr(cif,col_beg_auth_asym_id,Asym1,1);
          if (ReadCIFstr(cif,col_beg_label_comp_id,CompId1,3))
            ReadCIFstr(cif,col_beg_auth_comp_id,CompId1,3);
!         if (CompId1[0] &&(i=(int)strlen(CompId1))<3) RightJustify(CompId1,3);
          ReadCIFstr(cif,col_beg_auth_seq_id,SeqId1,5);
  
          if (ReadCIFstr(cif,col_end_label_asym_id,Asym2,1))
***************
*** 2941,2959 ****
            ReadCIFstr(cif,col_end_auth_asym_id,Asym2,1);
          if (ReadCIFstr(cif,col_end_label_comp_id,CompId2,3))
            ReadCIFstr(cif,col_end_auth_comp_id,CompId2,3);
!         if (CompId2[0] &&(i=strlen(CompId2))<3) RightJustify(CompId2,3);
          ReadCIFstr(cif,col_end_auth_seq_id,SeqId2,5);
  
          Icode1 = Icode2 = '\0';
          ResNum1 = ResNum2 = -9999;
          if (SeqId1[0]){
!             ResNum1 = strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              Icode1 = ' ';
              if (*endptr != '\0') Icode1 = *endptr;
          }
          if (SeqId2[0]){
!             ResNum2 = strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              Icode2 = ' ';
              if (*endptr != '\0') Icode2 = *endptr;
--- 2942,2960 ----
            ReadCIFstr(cif,col_end_auth_asym_id,Asym2,1);
          if (ReadCIFstr(cif,col_end_label_comp_id,CompId2,3))
            ReadCIFstr(cif,col_end_auth_comp_id,CompId2,3);
!         if (CompId2[0] &&(i=(int)strlen(CompId2))<3) RightJustify(CompId2,3);
          ReadCIFstr(cif,col_end_auth_seq_id,SeqId2,5);
  
          Icode1 = Icode2 = '\0';
          ResNum1 = ResNum2 = -9999;
          if (SeqId1[0]){
!             ResNum1 = (int)strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              Icode1 = ' ';
              if (*endptr != '\0') Icode1 = *endptr;
          }
          if (SeqId2[0]){
!             ResNum2 = (int)strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              Icode2 = ' ';
              if (*endptr != '\0') Icode2 = *endptr;
***************
*** 2963,2969 ****
          sResNum1 = sResNum2 = -9999;
          if(!ReadCIFstr(cif,col_beg_label_seq_id,SeqId1,5))
          if (SeqId1[0]){
!             sResNum1 = strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              sIcode1 = ' ';
              if (*endptr != '\0') sIcode1 = *endptr;
--- 2964,2970 ----
          sResNum1 = sResNum2 = -9999;
          if(!ReadCIFstr(cif,col_beg_label_seq_id,SeqId1,5))
          if (SeqId1[0]){
!             sResNum1 = (int)strtol(SeqId1, 
                (char __far * __far *)&endptr, 10);
              sIcode1 = ' ';
              if (*endptr != '\0') sIcode1 = *endptr;
***************
*** 2970,2976 ****
          }
          if(!ReadCIFstr(cif,col_end_label_seq_id,SeqId2,5))
          if (SeqId2[0]){
!             sResNum2 = strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              sIcode2 = ' ';
              if (*endptr != '\0') sIcode2 = *endptr;
--- 2971,2977 ----
          }
          if(!ReadCIFstr(cif,col_end_label_seq_id,SeqId2,5))
          if (SeqId2[0]){
!             sResNum2 = (int)strtol(SeqId2, 
                (char __far * __far *)&endptr, 10);
              sIcode2 = ' ';
              if (*endptr != '\0') sIcode2 = *endptr;