[BusyBox-cvs] svn commit: trunk/busybox/e2fsprogs/e2p

[vapier at busybox.net]

Author: vapier
Date: 2005-05-09 15:57:44 -0600 (Mon, 09 May 2005)
New Revision: 10276

Log:
trim out useless defines and use some busybox funcs

Modified:
   trunk/busybox/e2fsprogs/e2p/iod.c


Changeset:
Modified: trunk/busybox/e2fsprogs/e2p/iod.c
===================================================================
--- trunk/busybox/e2fsprogs/e2p/iod.c	2005-05-09 21:53:25 UTC (rev 10275)
+++ trunk/busybox/e2fsprogs/e2p/iod.c	2005-05-09 21:57:44 UTC (rev 10276)
@@ -15,9 +15,7 @@
  */
 
 #include "e2p.h"
-#if HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 
@@ -27,27 +25,10 @@
 {
 	DIR * dir;
 	struct dirent *de, *dep;
-	int	max_len = -1, len;
+	int	max_len, len;
 
-#if HAVE_PATHCONF && defined(_PC_NAME_MAX) 
-	max_len = pathconf(dir_name, _PC_NAME_MAX);
-#endif
-	if (max_len == -1) {
-#ifdef _POSIX_NAME_MAX
-		max_len = _POSIX_NAME_MAX;
-#else
-#ifdef NAME_MAX
-		max_len = NAME_MAX;
-#else
-		max_len = 256;
-#endif /* NAME_MAX */
-#endif /* _POSIX_NAME_MAX */
-	}
-	max_len += sizeof(struct dirent);
-
-	de = malloc(max_len+1);
-	if (!de)
-		return -1;
+	max_len = PATH_MAX + sizeof(struct dirent);
+	de = (struct dirent *)xmalloc(max_len+1);
 	memset(de, 0, max_len+1);
 
 	dir = opendir (dir_name);
@@ -57,12 +38,10 @@
 	}
 	while ((dep = readdir (dir))) {
 		len = sizeof(struct dirent);
-#ifdef HAVE_RECLEN_DIRENT
 		if (len < dep->d_reclen)
 			len = dep->d_reclen;
 		if (len > max_len)
 			len = max_len;
-#endif
 		memcpy(de, dep, len);
 		(*func) (dir_name, de, private);
 	}