summaryrefslogtreecommitdiff
path: root/coreutils/ls.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
committerRob Landley <rob@landley.net>2006-08-03 15:41:12 +0000
commitd921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch)
treee4a2769349867c441cf2983d83097bb66701a733 /coreutils/ls.c
parent6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff)
downloadbusybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.bz2
busybox-w32-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip
Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.)
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r--coreutils/ls.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index de8405dab..6b9fbbfc9 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -37,15 +37,7 @@ enum {
37/************************************************************************/ 37/************************************************************************/
38 38
39#include "busybox.h" 39#include "busybox.h"
40#include <unistd.h> 40#include <getopt.h>
41#include <errno.h>
42#include <string.h>
43#include <fcntl.h>
44#include <signal.h>
45#include <getopt.h> /* struct option */
46#include <sys/ioctl.h>
47#include <sys/sysmacros.h> /* major() and minor() */
48#include <time.h>
49 41
50/* what is the overall style of the listing */ 42/* what is the overall style of the listing */
51#define STYLE_COLUMNS (1U<<21) /* fill columns */ 43#define STYLE_COLUMNS (1U<<21) /* fill columns */
@@ -535,7 +527,7 @@ static struct dnode **list_dir(const char *path)
535 527
536 dn = NULL; 528 dn = NULL;
537 nfiles = 0; 529 nfiles = 0;
538 dir = bb_opendir(path); 530 dir = warn_opendir(path);
539 if (dir == NULL) { 531 if (dir == NULL) {
540 status = EXIT_FAILURE; 532 status = EXIT_FAILURE;
541 return (NULL); /* could not open the dir */ 533 return (NULL); /* could not open the dir */