aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>1999-11-09 01:47:36 +0000
committerEric Andersen <andersen@codepoet.org>1999-11-09 01:47:36 +0000
commit50d6360771be509737bb55b2cc5bc5e25f2a4fea (patch)
tree81d4cfe9ec9b5281924f678c28f61542616a3db7 /coreutils
parentfbb39c83b69d6c4de943c0b7374000339635d13d (diff)
downloadbusybox-50d6360771be509737bb55b2cc5bc5e25f2a4fea.tar.gz
Stuff
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/ls.c61
-rw-r--r--coreutils/rm.c2
2 files changed, 14 insertions, 49 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 4eb486f87..f09cbbc22 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -40,7 +40,7 @@
* 1. requires lstat (BSD) - how do you do it without?
*/
-//#define FEATURE_USERNAME /* show username/groupnames (libc6 uses NSS) */
+#define FEATURE_USERNAME /* show username/groupnames (bypasses libc6 NSS) */
#define FEATURE_TIMESTAMPS /* show file timestamps */
#define FEATURE_AUTOWIDTH /* calculate terminal & column widths */
#define FEATURE_FILETYPECHAR /* enable -p and -F */
@@ -64,10 +64,6 @@
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
-#ifdef FEATURE_USERNAME
-#include <pwd.h>
-#include <grp.h>
-#endif
#ifdef FEATURE_TIMESTAMPS
#include <time.h>
#endif
@@ -83,27 +79,6 @@
#define MINOR(dev) ((dev)&0xff)
#endif
-#define MODE1 "rwxrwxrwx"
-#define MODE0 "---------"
-#define SMODE1 "..s..s..t"
-#define SMODE0 "..S..S..T"
-
-/* The 9 mode bits to test */
-
-static const mode_t MBIT[] = {
- S_IRUSR, S_IWUSR, S_IXUSR,
- S_IRGRP, S_IWGRP, S_IXGRP,
- S_IROTH, S_IWOTH, S_IXOTH
-};
-
-/* The special bits. If set, display SMODE0/1 instead of MODE0/1 */
-
-static const mode_t SBIT[] = {
- 0, 0, S_ISUID,
- 0, 0, S_ISGID,
- 0, 0, S_ISVTX
-};
-
#define FMT_AUTO 0
#define FMT_LONG 1 /* one record per line, extended info */
#define FMT_SINGLE 2 /* one record per line */
@@ -216,45 +191,35 @@ static void list_single(const char *name, struct stat *info, const char *fullnam
if (display_fmt == FMT_LONG) {
mode_t mode = info->st_mode;
- int i;
-
- scratch[0] = TYPECHAR(mode);
- for (i=0; i<9; i++)
- if (mode & SBIT[i])
- scratch[i+1] = (mode & MBIT[i])
- ? SMODE1[i]
- : SMODE0[i];
- else
- scratch[i+1] = (mode & MBIT[i])
- ? MODE1[i]
- : MODE0[i];
newline();
- wr(scratch, 10);
+ wr(modeString(mode), 10);
column=10;
- writenum((long)info->st_nlink,(short)4);
+ writenum((long)info->st_nlink,(short)5);
fputs(" ", stdout);
#ifdef FEATURE_USERNAME
if (!(opts & DISP_NUMERIC)) {
- struct passwd *pw = getpwuid(info->st_uid);
- if (pw)
- fputs(pw->pw_name, stdout);
+ scratch[8]='\0';
+ my_getpwuid( scratch, info->st_uid);
+ if (*scratch)
+ fputs(scratch, stdout);
else
writenum((long)info->st_uid,(short)0);
} else
#endif
writenum((long)info->st_uid,(short)0);
- tab(24);
+ tab(16);
#ifdef FEATURE_USERNAME
if (!(opts & DISP_NUMERIC)) {
- struct group *gr = getgrgid(info->st_gid);
- if (gr)
- fputs(gr->gr_name, stdout);
+ scratch[8]='\0';
+ my_getgrgid( scratch, info->st_gid);
+ if (*scratch)
+ fputs(scratch, stdout);
else
writenum((long)info->st_gid,(short)0);
} else
#endif
writenum((long)info->st_gid,(short)0);
- tab(33);
+ tab(17);
if (S_ISBLK(mode) || S_ISCHR(mode)) {
writenum((long)MAJOR(info->st_rdev),(short)3);
fputs(", ", stdout);
diff --git a/coreutils/rm.c b/coreutils/rm.c
index f49ada5e1..077e792f9 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -84,7 +84,7 @@ extern int rm_main(int argc, char **argv)
while (argc-- > 0) {
srcName = *(argv++);
- if (recursiveAction( srcName, recursiveFlag, TRUE, TRUE,
+ if (recursiveAction( srcName, recursiveFlag, FALSE, TRUE,
fileAction, dirAction) == FALSE) {
exit( FALSE);
}