2010-06-13 Ralf Corsépius <ralf.corsepius@rtems.org>

	* include/rtems/tar.h, libcsupport/include/tar.h: Remove.
	* configure.ac: Require toolchain to provide tar.h.
	* libfs/src/imfs/imfs_load_tar.c, libmisc/untar/untar.h:
	Use <tar.h> instead of <rtems/tar.h>.

7 files changed, 14 insertions, 112 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index d9479bce8d..c3167b16eb 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,12 @@
 2010-06-13	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* include/rtems/tar.h, libcsupport/include/tar.h: Remove.
+	* configure.ac: Require toolchain to provide tar.h.
+	* libfs/src/imfs/imfs_load_tar.c, libmisc/untar/untar.h:
+	Use <tar.h> instead of <rtems/tar.h>.
+
+2010-06-13	Ralf Corsépius <ralf.corsepius@rtems.org>
+
 	* libcsupport/include/rtems/libio.h: Fix typo in doxygen comment.
 
 2010-06-12	Joel Sherrill <joel.sherrilL@OARcorp.com>
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 492413806d..c684657793 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -70,7 +70,7 @@ endif
 
 include_rtems_HEADERS += include/rtems/bspIo.h include/rtems/userenv.h \
     include/rtems/fs.h include/rtems/pci.h \
-    include/rtems/concat.h include/rtems/tar.h \
+    include/rtems/concat.h \
     include/rtems/status-checks.h
 
 include_rtems_HEADERS += include/rtems/endian.h
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 18e5d21238..f7b59ecd2e 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -84,6 +84,10 @@ AS_IF([test x"${ac_cv_header_errno_h}" != xyes],
 AS_IF([test x"${ac_cv_header_sched_h}" != xyes],
 [AC_MSG_ERROR([Required header sched.h not found])])
 
+## error out if libc doesn't provide tar.h
+AS_IF([test x"${ac_cv_header_tar_h}" != xyes],
+[AC_MSG_ERROR([Required header tar.h not found])])
+
 AC_HEADER_STDBOOL
 AS_IF([test x"${ac_cv_header_stdbool_h}" != xyes],
 [AC_MSG_ERROR([No sufficient stdbool.h found])])
@@ -112,10 +116,6 @@ RTEMS_CHECK_POSIX_API
 RTEMS_CHECK_ITRON_API
 RTEMS_CHECK_NETWORKING
 
-AS_IF([test x"${RTEMS_USE_NEWLIB}" = xyes],
-[RTEMS_USES_TAR_H=yes],
-[RTEMS_USES_TAR_H=$ac_cv_header_tar_h])
-
 rtems_major=`echo _RTEMS_VERSION | sed "s/\..*//"`
 rtems_minor=`echo _RTEMS_VERSION | sed "s/[[0-9]][[0-9]]*\.//;s/\..*//"`
 rtems_revision=`echo _RTEMS_VERSION | sed "s/[[0-9]][[0-9]]*\.//;s/[[0-9]][[0-9]]*\.//;s/\..*//"`
@@ -152,11 +152,6 @@ RTEMS_CPUOPT([RTEMS_NETWORKING],
   [1],
   [if networking is enabled])
 
-RTEMS_CPUOPT([RTEMS_USES_TAR_H],
-  [test x"${RTEMS_USES_TAR_H}" = x"yes"],
-  [1],
-  [if RTEMS uses tar.h])
-
 RTEMS_CPUOPT([RTEMS_VERSION],
   [true],
   ["]_RTEMS_VERSION["],
diff --git a/cpukit/include/rtems/tar.h b/cpukit/include/rtems/tar.h
deleted file mode 100644
index 4be7b90f64..0000000000
--- a/cpukit/include/rtems/tar.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- *
- *  $Id$
- */
-
-/** @file  rtems/tar.h
- * Wrapper to <tar.h> to accomodate systems not providing <tar.h> (Cygwin).
- */
-
-#ifndef _RTEMS_TAR_H
-#define _RTEMS_TAR_H
-
-#include <rtems/score/cpuopts.h>
-
-#if RTEMS_USES_TAR_H
-#include <tar.h>
-#else
-/* General definitions */
-#define TMAGIC 		"ustar" /* ustar plus null byte. */
-#define TMAGLEN 	6 	/* Length of the above. */
-#define TVERSION 	"00"	/* 00 without a null byte. */
-#define TVERSLEN	2	/* Length of the above. */
-
-/* Typeflag field definitions */
-#define REGTYPE 	'0'	/* Regular file. */
-#define AREGTYPE	'\0'	/* Regular file. */
-#define LNKTYPE		'1'	/* Link. */
-#define SYMTYPE		'2'	/* Symbolic link. */
-#define CHRTYPE		'3'	/* Character special. */
-#define BLKTYPE		'4'	/* Block special. */
-#define DIRTYPE		'5'	/* Directory. */
-#define FIFOTYPE	'6'	/* FIFO special. */
-#define CONTTYPE	'7'	/* Reserved. */
-
-/* Mode field bit definitions (octal) */
-#define	TSUID		04000	/* Set UID on execution. */
-#define	TSGID		02000	/* Set GID on execution. */
-#define	TSVTX		01000	/* On directories, restricted deletion flag. */
-#define	TUREAD		00400	/* Read by owner. */
-#define	TUWRITE		00200	/* Write by owner. */
-#define	TUEXEC		00100	/* Execute/search by owner. */
-#define	TGREAD		00040	/* Read by group. */
-#define	TGWRITE		00020	/* Write by group. */
-#define	TGEXEC		00010	/* Execute/search by group. */
-#define	TOREAD		00004	/* Read by other. */
-#define	TOWRITE		00002	/* Write by other. */
-#define	TOEXEC		00001	/* Execute/search by other. */
-#endif /* RTEMS_USES_TAR_H */
-
-#endif /* _RTEMS_TAR_H */
diff --git a/cpukit/libcsupport/include/tar.h b/cpukit/libcsupport/include/tar.h
deleted file mode 100644
index a8e9938d6d..0000000000
--- a/cpukit/libcsupport/include/tar.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- *
- *  $Id$
- */
-
-/** @file  tar.h
- * Newlib specific tar.h
- */
-
-#ifndef _TAR_H
-#define _TAR_H
-
-/* General definitions */
-#define TMAGIC 		"ustar" /* ustar plus null byte. */
-#define TMAGLEN 	6 	/* Length of the above. */
-#define TVERSION 	"00"	/* 00 without a null byte. */
-#define TVERSLEN	2	/* Length of the above. */
-
-/* Typeflag field definitions */
-#define REGTYPE 	'0'	/* Regular file. */
-#define AREGTYPE	'\0'	/* Regular file. */
-#define LNKTYPE		'1'	/* Link. */
-#define SYMTYPE		'2'	/* Symbolic link. */
-#define CHRTYPE		'3'	/* Character special. */
-#define BLKTYPE		'4'	/* Block special. */
-#define DIRTYPE		'5'	/* Directory. */
-#define FIFOTYPE	'6'	/* FIFO special. */
-#define CONTTYPE	'7'	/* Reserved. */
-
-/* Mode field bit definitions (octal) */
-#define	TSUID		04000	/* Set UID on execution. */
-#define	TSGID		02000	/* Set GID on execution. */
-#define	TSVTX		01000	/* On directories, restricted deletion flag. */
-#define	TUREAD		00400	/* Read by owner. */
-#define	TUWRITE		00200	/* Write by owner. */
-#define	TUEXEC		00100	/* Execute/search by owner. */
-#define	TGREAD		00040	/* Read by group. */
-#define	TGWRITE		00020	/* Write by group. */
-#define	TGEXEC		00010	/* Execute/search by group. */
-#define	TOREAD		00004	/* Read by other. */
-#define	TOWRITE		00002	/* Write by other. */
-#define	TOEXEC		00001	/* Execute/search by other. */
-
-#endif
diff --git a/cpukit/libfs/src/imfs/imfs_load_tar.c b/cpukit/libfs/src/imfs/imfs_load_tar.c
index 5e53787437..e71ca9a982 100644
--- a/cpukit/libfs/src/imfs/imfs_load_tar.c
+++ b/cpukit/libfs/src/imfs/imfs_load_tar.c
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <tar.h>
 
 #include <string.h>
 
@@ -31,7 +32,6 @@
 #include <rtems/libio_.h>
 #include <rtems/imfs.h>
 #include <rtems/untar.h>
-#include <rtems/tar.h>
 
 /*
  * TAR file format:
diff --git a/cpukit/libmisc/untar/untar.h b/cpukit/libmisc/untar/untar.h
index 2e370f5add..264753f2f7 100644
--- a/cpukit/libmisc/untar/untar.h
+++ b/cpukit/libmisc/untar/untar.h
@@ -12,7 +12,7 @@
 #define _RTEMS_UNTAR_H
 
 #include <stddef.h>
-#include <rtems/tar.h>
+#include <tar.h>
 
 #ifdef __cplusplus
 extern "C" {