Fix typo'ed version number in the release notes

[tools/e2fsprogs.git] / debugfs / lsdel.c

diff --git a/debugfs/lsdel.c b/debugfs/lsdel.c
index 3eb9037..3dc32a7 100644 (file)
--- a/debugfs/lsdel.c
+++ b/debugfs/lsdel.c
@@ -1,8 +1,9 @@
 /*
- * undelete.c --- routines to try to help a user recover a deleted file.
+ * lsdel.c --- routines to try to help a user recover a deleted file.
  * 
- * Copyright (C) 1994 Theodore Ts'o.  This file may be redistributed
- * under the terms of the GNU Public License.
+ * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ * Theodore Ts'o.  This file may be redistributed under the terms of
+ * the GNU Public License.
  */
 
 #include <stdio.h>
@@ -20,17 +21,17 @@
 #include "debugfs.h"
 
 struct deleted_info {
-       ino_t   ino;
-       unsigned short mode;
-       unsigned short uid;
-       __u64   size;
-       time_t  dtime;
-       int     num_blocks;
-       int     free_blocks;
+       ext2_ino_t      ino;
+       unsigned short  mode;
+       __u32           uid;
+       __u64           size;
+       time_t          dtime;
+       int             num_blocks;
+       int             free_blocks;
 };
 
 struct lsdel_struct {
-       ino_t                   inode;
+       ext2_ino_t              inode;
        int                     num_blocks;
        int                     free_blocks;
        int                     bad_blocks;
@@ -48,7 +49,7 @@ static int deleted_info_compare(const void *a, const void *b)
 
 static int lsdel_proc(ext2_filsys fs,
                      blk_t     *block_nr,
-                     int blockcnt,
+                     int blockcnt EXT2FS_ATTR((unused)),
                      void *private)
 {
        struct lsdel_struct *lsd = (struct lsdel_struct *) private;
@@ -73,19 +74,29 @@ void do_lsdel(int argc, char **argv)
        struct deleted_info     *delarray;
        int                     num_delarray, max_delarray;
        ext2_inode_scan         scan = 0;
-       ino_t                   ino;
+       ext2_ino_t              ino;
        struct ext2_inode       inode;
        errcode_t               retval;
        char                    *block_buf;
        int                     i;
+       long                    secs = 0;
+       char                    *tmp;
+       time_t                  now;
+       FILE                    *out;
        
-       if (argc > 1) {
-               com_err(argv[0], 0, "Usage: ls_deleted_inodes\n");
+       if (common_args_process(argc, argv, 1, 2, "ls_deleted_inodes",
+                               "[secs]", 0))
                return;
+
+       if (argc > 1) {
+               secs = strtol(argv[1],&tmp,0);
+               if (*tmp) {
+                       com_err(argv[0], 0, "Bad time - %s",argv[1]);
+                       return;
+               }
        }
-       if (check_fs_open(argv[0]))
-               return;
 
+       now = current_fs->now ? current_fs->now : time(0);
        max_delarray = 100;
        num_delarray = 0;
        delarray = malloc(max_delarray * sizeof(struct deleted_info));
@@ -118,7 +129,8 @@ void do_lsdel(int argc, char **argv)
        }
        
        while (ino) {
-               if (inode.i_dtime == 0)
+               if ((inode.i_dtime == 0) ||
+                   (secs && ((unsigned) abs(now - secs) > inode.i_dtime)))
                        goto next;
 
                lsd.inode = ino;
@@ -130,7 +142,7 @@ void do_lsdel(int argc, char **argv)
                                              lsdel_proc, &lsd);
                if (retval) {
                        com_err("ls_deleted_inodes", retval,
-                               "while calling ext2_block_iterate");
+                               "while calling ext2fs_block_iterate");
                        goto next;
                }
                if (lsd.free_blocks && !lsd.bad_blocks) {
@@ -148,7 +160,7 @@ void do_lsdel(int argc, char **argv)
                                
                        delarray[num_delarray].ino = ino;
                        delarray[num_delarray].mode = inode.i_mode;
-                       delarray[num_delarray].uid = inode.i_uid;
+                       delarray[num_delarray].uid = inode_uid(inode);
                        delarray[num_delarray].size = inode.i_size;
                        if (!LINUX_S_ISDIR(inode.i_mode))
                                delarray[num_delarray].size |= 
@@ -170,18 +182,21 @@ void do_lsdel(int argc, char **argv)
                }
        }
 
-       printf("%d deleted inodes found.\n", num_delarray);
-       printf(" Inode  Owner  Mode    Size    Blocks    Time deleted\n");
+       out = open_pager();
+       
+       fprintf(out, " Inode  Owner  Mode    Size    Blocks   Time deleted\n");
        
        qsort(delarray, num_delarray, sizeof(struct deleted_info),
              deleted_info_compare);
        
        for (i = 0; i < num_delarray; i++) {
-               printf("%6lu %6d %6o %6llu %4d/%4d %s", delarray[i].ino,
+               fprintf(out, "%6u %6d %6o %6llu %4d/%4d %s", delarray[i].ino,
                       delarray[i].uid, delarray[i].mode, delarray[i].size,
                       delarray[i].free_blocks, delarray[i].num_blocks, 
                       time_to_string(delarray[i].dtime));
        }
+       fprintf(out, "%d deleted inodes found.\n", num_delarray);
+       close_pager(out);
        
 error_out:
        free(block_buf);