*** empty log message ***

[chaz/tar] / src / tar.c

diff --git a/src/tar.c b/src/tar.c
index 17a7f5fc02ab05aee3a9436ae9eb52110aeaa0a9..e508ce278e80f2e1d4f62ecf939e2d30b1b80d06 100644 (file)
--- a/src/tar.c
+++ b/src/tar.c
@@ -27,7 +27,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/types.h>         /* Needed for typedefs in tar.h */
 #include "getopt.h"
 #include "regex.h"
-#include "fnmatch.h"
 
 /*
  * The following causes "tar.h" to produce definitions of all the
@@ -37,28 +36,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "tar.h"
 
 #include "port.h"
-
-#if defined(_POSIX_VERSION) || defined(DIRENT)
-#include <dirent.h>
-#ifdef direct
-#undef direct
-#endif /* direct */
-#define direct dirent
-#define DP_NAMELEN(x) strlen((x)->d_name)
-#endif /* _POSIX_VERSION or DIRENT */
-#if !defined(_POSIX_VERSION) && !defined(DIRENT) && defined(BSD42)
-#include <sys/dir.h>
-#define DP_NAMELEN(x)  (x)->d_namlen
-#endif /* not _POSIX_VERSION and BSD42 */
-#ifdef __MSDOS__
-#include "msd_dir.h"
-#define DP_NAMELEN(x)  (x)->d_namlen
-#define direct dirent
-#endif
-#if defined(USG) && !defined(_POSIX_VERSION) && !defined(DIRENT)
-#include <ndir.h>
-#define DP_NAMELEN(x) strlen((x)->d_name)
-#endif /* USG and not _POSIX_VERSION and not DIRENT */
+#include "fnmatch.h"
 
 /*
  * We should use a conversion routine that does reasonable error
@@ -1018,7 +996,7 @@ addname (name)
       if (chdir_name[0] != '/')
        {
          char *path = ck_malloc (PATH_MAX);
-#if defined(__MSDOS__) || defined(USG) || defined(_POSIX_VERSION)
+#if defined(__MSDOS__) || defined(HAVE_GETCWD) || defined(_POSIX_VERSION)
          if (!getcwd (path, PATH_MAX))
            {
              msg ("Couldn't get current directory.");