===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/Attic/is_tar.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/file/Attic/is_tar.c	2004/05/19 02:32:35	1.7
--- src/usr.bin/file/Attic/is_tar.c	2008/05/08 01:40:56	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: is_tar.c,v 1.7 2004/05/19 02:32:35 tedu Exp $ */
  /*
   * Copyright (c) Ian F. Darwin 1986-1995.
   * Software written by Ian F. Darwin and others;
--- 1,4 ----
! /*	$OpenBSD: is_tar.c,v 1.8 2008/05/08 01:40:56 chl Exp $ */
  /*
   * Copyright (c) Ian F. Darwin 1986-1995.
   * Software written by Ian F. Darwin and others;
***************
*** 46,52 ****
  #include "tar.h"
  
  #ifndef lint
! FILE_RCSID("@(#)$Id: is_tar.c,v 1.7 2004/05/19 02:32:35 tedu Exp $")
  #endif
  
  #define	isodigit(c)	( ((c) >= '0') && ((c) <= '7') )
--- 46,52 ----
  #include "tar.h"
  
  #ifndef lint
! FILE_RCSID("@(#)$Id: is_tar.c,v 1.8 2008/05/08 01:40:56 chl Exp $")
  #endif
  
  #define	isodigit(c)	( ((c) >= '0') && ((c) <= '7') )
***************
*** 72,77 ****
--- 72,83 ----
  		    "application/x-tar, POSIX" : "POSIX tar archive") == -1)
  			return -1;
  		return 1;
+ 	case 3:
+ 		if (file_printf(ms, (ms->flags & MAGIC_MIME) ?
+ 		    "application/x-tar, POSIX (GNU)" :
+ 		    "POSIX tar archive (GNU)") == -1)
+ 			return -1;
+ 		return 1;
  	default:
  		return 0;
  	}
***************
*** 114,120 ****
  	if (sum != recsum)
  		return 0;	/* Not a tar archive */
  	
! 	if (0==strcmp(header->header.magic, TMAGIC)) 
  		return 2;		/* Unix Standard tar archive */
  
  	return 1;			/* Old fashioned tar archive */
--- 120,128 ----
  	if (sum != recsum)
  		return 0;	/* Not a tar archive */
  	
! 	if (strcmp(header->header.magic, GNUTMAGIC) == 0) 
! 		return 3;		/* GNU Unix Standard tar archive */
! 	if (strcmp(header->header.magic, TMAGIC) == 0) 
  		return 2;		/* Unix Standard tar archive */
  
  	return 1;			/* Old fashioned tar archive */