Fix handling of permission addition and removal (e.g., o-r).
[oweals/busybox.git] / coreutils / du.c
index 4dc7ea13ad3703f2910b4d1b0f634e082d1b2270..3f7621b3de2ac1972cb8502bd183a0e7b64fa526 100644 (file)
@@ -3,7 +3,7 @@
  * Mini du implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by John Beppu <beppu@lineo.com>
  *
  * This program is free software; you can redistribute it and/or modify
  *
  */
 
-#include "internal.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_name_too_long
-#include "messages.c"
-
 #include <sys/types.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <string.h>
 #include <errno.h>
-#include <sys/param.h>                 /* for PATH_MAX */
-
-typedef void (Display) (long, char *);
-
-typedef struct inode_type {
-       struct inode_type *next;
-       ino_t ino;
-} INODETYPE;
+#include "busybox.h"
 
-#define HASH_SIZE      311             /* Should be prime */
-#define hash_inode(i)  ((i) % HASH_SIZE)
 
-static INODETYPE *inode_hash_list[HASH_SIZE];
+#ifdef BB_FEATURE_HUMAN_READABLE
+static unsigned long disp_hr = KILOBYTE;
+#endif
 
-static const char du_usage[] =
-       "du [OPTION]... [FILE]...\n\n"
-       "Summarize disk space used for each FILE and/or directory.\n"
-       "Disk space is printed in units of 1024 bytes.\n\n"
-       "Options:\n"
-       "\t-l\tcount sizes many times if hard linked\n"
-       "\t-s\tdisplay only a total for each argument\n";
+typedef void (Display) (long, char *);
 
 static int du_depth = 0;
 static int count_hardlinks = 0;
@@ -61,62 +46,32 @@ static Display *print;
 
 static void print_normal(long size, char *filename)
 {
-       fprintf(stdout, "%ld\t%s\n", size, filename);
+       unsigned long base;
+#ifdef BB_FEATURE_HUMAN_READABLE
+       switch (disp_hr) {
+               case MEGABYTE:
+                       base = KILOBYTE;
+                       break;
+               case KILOBYTE:
+                       base = 1;
+                       break;
+               default:
+                       base = 0;
+       }
+       printf("%s\t%s\n", make_human_readable_str(size, base), filename);
+#else
+       printf("%ld\t%s\n", size, filename);
+#endif
 }
 
 static void print_summary(long size, char *filename)
 {
        if (du_depth == 1) {
+               printf("summary\n");
                print_normal(size, filename);
        }
 }
 
-/* Return 1 if inode is in inode hash list, else return 0 */
-static int is_in_list(const ino_t ino)
-{
-       INODETYPE *inode;
-
-       inode = inode_hash_list[hash_inode(ino)];
-       while (inode != NULL) {
-               if (inode->ino == ino)
-                       return 1;
-               inode = inode->next;
-       }
-
-       return 0;
-}
-
-/* Add inode to inode hash list */
-static void add_inode(const ino_t ino)
-{
-       int i;
-       INODETYPE *inode;
-    
-       i = hash_inode(ino);
-       inode = malloc(sizeof(INODETYPE));
-       if (inode == NULL)
-               fatalError("du: Not enough memory.");
-
-       inode->ino = ino;
-       inode->next = inode_hash_list[i];
-       inode_hash_list[i] = inode;
-}
-
-/* Clear inode hash list */
-static void reset_inode_list(void)
-{
-       int i;
-       INODETYPE *inode;
-
-       for (i = 0; i < HASH_SIZE; i++) {
-               while (inode_hash_list[i] != NULL) {
-                       inode = inode_hash_list[i]->next;
-                       free(inode_hash_list[i]);
-                       inode_hash_list[i] = inode;
-               }
-       }
-}
-
 /* tiny recursive du */
 static long du(char *filename)
 {
@@ -125,7 +80,7 @@ static long du(char *filename)
        int len;
 
        if ((lstat(filename, &statbuf)) != 0) {
-               printf("du: %s: %s\n", filename, strerror(errno));
+               perror_msg("%s", filename);
                return 0;
        }
 
@@ -153,35 +108,29 @@ static long du(char *filename)
                        filename[--len] = '\0';
 
                while ((entry = readdir(dir))) {
-                       char newfile[PATH_MAX + 1];
+                       char *newfile;
                        char *name = entry->d_name;
 
                        if ((strcmp(name, "..") == 0)
                                || (strcmp(name, ".") == 0)) {
                                continue;
                        }
-
-                       if (len + strlen(name) + 1 > PATH_MAX) {
-                               fprintf(stderr, name_too_long, "du");
-                               du_depth--;
-                               return 0;
-                       }
-                       sprintf(newfile, "%s/%s", filename, name);
-
+                       newfile = concat_path_file(filename, name);
                        sum += du(newfile);
+                       free(newfile);
                }
                closedir(dir);
                print(sum, filename);
        }
        else if (statbuf.st_nlink > 1 && !count_hardlinks) {
                /* Add files with hard links only once */
-               if (is_in_list(statbuf.st_ino)) {
+               if (is_in_ino_dev_hashtable(&statbuf, NULL)) {
                        sum = 0L;
                        if (du_depth == 1)
                                print(sum, filename);
                }
                else {
-                       add_inode(statbuf.st_ino);
+                       add_to_ino_dev_hashtable(&statbuf, NULL);
                }
        }
        du_depth--;
@@ -190,52 +139,61 @@ static long du(char *filename)
 
 int du_main(int argc, char **argv)
 {
+       int status = EXIT_SUCCESS;
        int i;
-       char opt;
+       int c;
 
        /* default behaviour */
        print = print_normal;
 
        /* parse argv[] */
-       for (i = 1; i < argc; i++) {
-               if (argv[i][0] == '-') {
-                       opt = argv[i][1];
-                       switch (opt) {
+       while ((c = getopt(argc, argv, "sl"
+#ifdef BB_FEATURE_HUMAN_READABLE
+"hm"
+#endif
+"k")) != EOF) {
+                       switch (c) {
                        case 's':
-                               print = print_summary;
-                               break;
+                                       print = print_summary;
+                                       break;
                        case 'l':
-                               count_hardlinks = 1;
-                               break;
-                       case 'h':
-                       case '-':
-                               usage(du_usage);
-                               break;
+                                       count_hardlinks = 1;
+                                       break;
+#ifdef BB_FEATURE_HUMAN_READABLE
+                       case 'h': disp_hr = 0;        break;
+                       case 'm': disp_hr = MEGABYTE; break;
+#endif
+                       case 'k': break;
                        default:
-                               fprintf(stderr, "du: invalid option -- %c\n", opt);
-                               usage(du_usage);
+                                       show_usage();
                        }
-               } else {
-                       break;
-               }
        }
 
        /* go through remaining args (if any) */
-       if (i >= argc) {
-               du(".");
+       if (optind >= argc) {
+               if (du(".") == 0)
+                       status = EXIT_FAILURE;
        } else {
                long sum;
 
-               for (; i < argc; i++) {
-                       sum = du(argv[i]);
-                       if (sum && isDirectory(argv[i], FALSE, NULL)) {
+               for (i=optind; i < argc; i++) {
+                       if ((sum = du(argv[i])) == 0)
+                               status = EXIT_FAILURE;
+                       if(is_directory(argv[i], FALSE, NULL)==FALSE) {
                                print_normal(sum, argv[i]);
                        }
-                       reset_inode_list();
+                       reset_ino_dev_hashtable();
                }
        }
 
-       exit(0);
+       return status;
 }
 
-/* $Id: du.c,v 1.15 2000/02/21 17:27:17 erik Exp $ */
+/* $Id: du.c,v 1.45 2001/04/25 05:39:18 andersen Exp $ */
+/*
+Local Variables:
+c-file-style: "linux"
+c-basic-offset: 4
+tab-width: 4
+End:
+*/