=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/Attic/tar.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- src/usr.bin/file/Attic/tar.h 2008/05/08 01:40:56 1.6 +++ src/usr.bin/file/Attic/tar.h 2009/04/24 18:54:34 1.7 @@ -1,4 +1,4 @@ -/* $OpenBSD: tar.h,v 1.6 2008/05/08 01:40:56 chl Exp $ */ +/* $OpenBSD: tar.h,v 1.7 2009/04/24 18:54:34 chl Exp $ */ /* * Copyright (c) Ian F. Darwin 1986-1995. * Software written by Ian F. Darwin and others; @@ -33,20 +33,10 @@ * * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu. * - * $Id: tar.h,v 1.6 2008/05/08 01:40:56 chl Exp $ # checkin only + * $Id: tar.h,v 1.7 2009/04/24 18:54:34 chl Exp $ # checkin only */ /* - * Kludge for handling systems that cannot cope with multiple - * external definitions of a variable. In ONE routine (tar.c), - * we #define TAR_EXTERN to null; here, we set it to "extern" if - * it is not already set. - */ -#ifndef TAR_EXTERN -#define TAR_EXTERN extern -#endif - -/* * Header block on tape. * * I'm going to use traditional DP naming conventions here. @@ -79,58 +69,6 @@ } header; }; -/* The checksum field is filled with this while the checksum is computed. */ -#define CHKBLANKS " " /* 8 blanks, no null */ - /* The magic field is filled with this if uname and gname are valid. */ #define TMAGIC "ustar" /* 5 chars and a null */ #define GNUTMAGIC "ustar " /* 7 chars and a null */ - -/* The linkflag defines the type of file */ -#define LF_OLDNORMAL '\0' /* Normal disk file, Unix compat */ -#define LF_NORMAL '0' /* Normal disk file */ -#define LF_LINK '1' /* Link to previously dumped file */ -#define LF_SYMLINK '2' /* Symbolic link */ -#define LF_CHR '3' /* Character special file */ -#define LF_BLK '4' /* Block special file */ -#define LF_DIR '5' /* Directory */ -#define LF_FIFO '6' /* FIFO special file */ -#define LF_CONTIG '7' /* Contiguous file */ -/* Further link types may be defined later. */ - -/* - * Exit codes from the "tar" program - */ -#define EX_SUCCESS 0 /* success! */ -#define EX_ARGSBAD 1 /* invalid args */ -#define EX_BADFILE 2 /* invalid filename */ -#define EX_BADARCH 3 /* bad archive */ -#define EX_SYSTEM 4 /* system gave unexpected error */ - -/* - * Structure for keeping track of filenames and lists thereof. - */ -struct name { - struct name *next; - short length; - char found; - char name[NAMSIZ+1]; -}; - -/* - * - * Due to the next struct declaration, each routine that includes - * "tar.h" must also include . I tried to make it automatic, - * but System V has no defines in , so there is no way of - * knowing when it has been included. In addition, it cannot be included - * twice, but must be included exactly once. Argghh! - * - * Thanks, typedef. Thanks, USG. - */ -struct link { - struct link *next; - dev_t dev; - ino_t ino; - short linkcount; - char name[NAMSIZ+1]; -};