summaryrefslogtreecommitdiff
path: root/ls.c
diff options
context:
space:
mode:
authorMatt Kraai2000-09-22 03:11:47 +0000
committerMatt Kraai2000-09-22 03:11:47 +0000
commita2f2a8f8c0c2c9881f9548c045c19b2b5fb11b5d (patch)
treea13729cc01ffdf98749c1a7e6d830607bfcd40dd /ls.c
parent810d38f8508fc4c9a7677dfa938a48f0de3fbb19 (diff)
downloadbusybox-a2f2a8f8c0c2c9881f9548c045c19b2b5fb11b5d.zip
busybox-a2f2a8f8c0c2c9881f9548c045c19b2b5fb11b5d.tar.gz
Add support for the -L option to ls.
Diffstat (limited to 'ls.c')
-rw-r--r--ls.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/ls.c b/ls.c
index b818003..0e08f76 100644
--- a/ls.c
+++ b/ls.c
@@ -159,6 +159,9 @@ static unsigned int sort_order= SORT_FORWARD;
#ifdef BB_FEATURE_LS_TIMESTAMPS
static unsigned int time_fmt= TIME_MOD;
#endif
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+static unsigned int follow_links=FALSE;
+#endif
static unsigned short column = 0;
#ifdef BB_FEATURE_AUTOWIDTH
@@ -474,6 +477,16 @@ struct dnode **list_dir(char *path)
cur= (struct dnode *)xmalloc(sizeof(struct dnode));
cur->fullname= xstrdup(fullname);
cur->name= cur->fullname + (int)(fnend - fullname) ;
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+ if (follow_links == TRUE) {
+ if (stat(fullname, &cur->dstat)) {
+ errorMsg("%s: %s\n", fullname, strerror(errno));
+ free(cur->fullname);
+ free(cur);
+ continue;
+ }
+ } else
+#endif
if (lstat(fullname, &cur->dstat)) { /* get file stat info into node */
errorMsg("%s: %s\n", fullname, strerror(errno));
free(cur->fullname);
@@ -682,6 +695,9 @@ extern int ls_main(int argc, char **argv)
#ifdef BB_FEATURE_LS_TIMESTAMPS
"cetu"
#endif
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+"L"
+#endif
)) > 0) {
switch (opt) {
case '1': style_fmt = STYLE_SINGLE; break;
@@ -714,6 +730,9 @@ extern int ls_main(int argc, char **argv)
case 't': sort_opts= SORT_MTIME; break;
case 'u': time_fmt = TIME_ACCESS; sort_opts= SORT_ATIME; break;
#endif
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+ case 'L': follow_links= TRUE; break;
+#endif
#ifdef BB_FEATURE_AUTOWIDTH
case 'T': tabstops= atoi(optarg); break;
case 'w': terminal_width= atoi(optarg); break;