- add and use bb_opendir(), bb_xopendir().
text data bss dec hex filename
889445 9392 1035784 1934621 1d851d busybox.gcc-4.2.orig
889297 9392 1035784 1934473 1d8489 busybox.gcc-4.2
889009 9820 1037860 1936689 1d8d31 busybox.gcc-4.1.orig
888817 9820 1037860 1936497 1d8c71 busybox.gcc-4.1
diff --git a/coreutils/diff.c b/coreutils/diff.c
index 2c89a66..12c61ca 100644
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -1114,8 +1114,8 @@
else {
DIR *dp;
struct dirent *ep;
- if ((dp = opendir(path)) == NULL)
- bb_error_msg("Error reading directory");
+
+ dp = bb_opendir(path);
while ((ep = readdir(dp))) {
if ((!strcmp(ep->d_name, "..")) || (!strcmp(ep->d_name, ".")))
continue;
diff --git a/coreutils/du.c b/coreutils/du.c
index d453ba4..38790f8 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -6,20 +6,7 @@
* Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
* Copyright (C) 2002 Edward Betts <edward@debian.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
/* BB_AUDIT SUSv3 compliant (unless default blocksize set to 1k) */
@@ -134,9 +121,8 @@
struct dirent *entry;
char *newfile;
- dir = opendir(filename);
+ dir = bb_opendir(filename);
if (!dir) {
- bb_perror_msg("%s", filename);
status = EXIT_FAILURE;
return sum;
}
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 964e7c9..c9d24ff 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -3,19 +3,7 @@
* tiny-ls.c version 0.1.0: A minimalist 'ls'
* Copyright (C) 1996 Brian Candler <B.Candler@pobox.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
/*
@@ -592,9 +580,8 @@
dn = NULL;
nfiles = 0;
- dir = opendir(path);
+ dir = bb_opendir(path);
if (dir == NULL) {
- bb_perror_msg("%s", path);
status = EXIT_FAILURE;
return (NULL); /* could not open the dir */
}