emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trim out useless defines and use some busybox funcs

Browse Source
This commit is contained in:
Mike Frysinger 2005-05-09 21:57:44 +00:00
parent 507d1f76e5
commit a88d52237b
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
e2fsprogs/e2p/iod.c
View File

@ -15,9 +15,7 @@
*/ */
#include "e2p.h" #include "e2p.h"
#if HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -27,27 +25,10 @@ int iterate_on_dir (const char * dir_name,
{ {
DIR * dir; DIR * dir;
struct dirent *de, *dep; struct dirent *de, *dep;
int max_len = -1, len; int max_len, len;
#if HAVE_PATHCONF && defined(_PC_NAME_MAX) max_len = PATH_MAX + sizeof(struct dirent);
max_len = pathconf(dir_name, _PC_NAME_MAX); de = (struct dirent *)xmalloc(max_len+1);
#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;
memset(de, 0, max_len+1); memset(de, 0, max_len+1);
dir = opendir (dir_name); dir = opendir (dir_name);
@ -57,12 +38,10 @@ int iterate_on_dir (const char * dir_name,
} }
while ((dep = readdir (dir))) { while ((dep = readdir (dir))) {
len = sizeof(struct dirent); len = sizeof(struct dirent);
#ifdef HAVE_RECLEN_DIRENT
if (len < dep->d_reclen) if (len < dep->d_reclen)
len = dep->d_reclen; len = dep->d_reclen;
if (len > max_len) if (len > max_len)
len = max_len; len = max_len;
#endif
memcpy(de, dep, len); memcpy(de, dep, len);
(*func) (dir_name, de, private); (*func) (dir_name, de, private);
} }