===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/arch.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/make/arch.c	1998/07/02 20:47:25	1.12
--- src/usr.bin/make/arch.c	1998/07/13 00:41:34	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: arch.c,v 1.12 1998/07/02 20:47:25 millert Exp $	*/
  /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: arch.c,v 1.13 1998/07/13 00:41:34 millert Exp $	*/
  /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
  #else
! static char rcsid[] = "$OpenBSD: arch.c,v 1.12 1998/07/02 20:47:25 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
  #else
! static char rcsid[] = "$OpenBSD: arch.c,v 1.13 1998/07/13 00:41:34 millert Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 616,622 ****
  		if (fread (memName, elen, 1, arch) != 1)
  			goto badarch;
  		memName[elen] = '\0';
! 		fseek (arch, -elen, 1);
  		if (DEBUG(ARCH) || DEBUG(MAKE)) {
  		    printf("ArchStat: Extended format entry for %s\n", memName);
  		}
--- 616,622 ----
  		if (fread (memName, elen, 1, arch) != 1)
  			goto badarch;
  		memName[elen] = '\0';
! 		fseek (arch, -elen, SEEK_CUR);
  		if (DEBUG(ARCH) || DEBUG(MAKE)) {
  		    printf("ArchStat: Extended format entry for %s\n", memName);
  		}
***************
*** 628,634 ****
  	    memcpy ((Address)Hash_GetValue (he), (Address)&arh,
  		sizeof (struct ar_hdr));
  	}
! 	fseek (arch, (size + 1) & ~1, 1);
      }
  
      fclose (arch);
--- 628,634 ----
  	    memcpy ((Address)Hash_GetValue (he), (Address)&arh,
  		sizeof (struct ar_hdr));
  	}
! 	fseek (arch, (size + 1) & ~1, SEEK_CUR);
      }
  
      fclose (arch);
***************
*** 848,854 ****
  		 * the file at the actual member, rather than its header, but
  		 * not here...
  		 */
! 		fseek (arch, -sizeof(struct ar_hdr), 1);
  		return (arch);
  	    }
  	} else
--- 848,854 ----
  		 * the file at the actual member, rather than its header, but
  		 * not here...
  		 */
! 		fseek (arch, -sizeof(struct ar_hdr), SEEK_CUR);
  		return (arch);
  	    }
  	} else
***************
*** 878,887 ****
  		}
  		if (strncmp(ename, member, len) == 0) {
  			/* Found as extended name */
! 			fseek (arch, -sizeof(struct ar_hdr) - elen, 1);
  			return (arch);
  		}
! 		fseek (arch, -elen, 1);
  		goto skip;
  	} else
  #endif
--- 878,887 ----
  		}
  		if (strncmp(ename, member, len) == 0) {
  			/* Found as extended name */
! 			fseek (arch, -sizeof(struct ar_hdr) - elen, SEEK_CUR);
  			return (arch);
  		}
! 		fseek (arch, -elen, SEEK_CUR);
  		goto skip;
  	} else
  #endif
***************
*** 896,902 ****
  	     */
  	    arhPtr->ar_size[sizeof(arhPtr->ar_size)-1] = '\0';
  	    size = (int) strtol(arhPtr->ar_size, NULL, 10);
! 	    fseek (arch, (size + 1) & ~1, 1);
  	}
      }
  
--- 896,902 ----
  	     */
  	    arhPtr->ar_size[sizeof(arhPtr->ar_size)-1] = '\0';
  	    size = (int) strtol(arhPtr->ar_size, NULL, 10);
! 	    fseek (arch, (size + 1) & ~1, SEEK_CUR);
  	}
      }