e2fsck: remove get_filename_hash() prototype

[thirdparty/e2fsprogs.git] / e2fsck / message.c

diff --git a/e2fsck/message.c b/e2fsck/message.c
index 980dc4b89bee018c4631dd1c1c83a129bd4a315a..30ce620aa123aecffcc0d73f7febfeaeeb31a5e6 100644 (file)
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -48,6 +48,9 @@
  *                     the containing directory.
  *     %r      <blkcount>              interpret blkcount as refcount
  *     %s      <str>                   miscellaneous string
+ *     %t      time (in <num>)
+ *     %T      current time
+ *     %U      quota type (in <num>)
  *     %S      backup superblock
  *     %X      <num> hexadecimal format
  *
@@ -92,9 +95,9 @@
 #include <string.h>
 #include <ctype.h>
 #include <termios.h>
+#include "support/quotaio.h"
 
 #include "e2fsck.h"
-
 #include "problem.h"
 
 #ifdef __GNUC__
@@ -116,17 +119,17 @@ static const char *abbrevs[] = {
        N_("Bbitmap"),
        N_("ccompress"),
        N_("Cconflicts with some other fs @b"),
-       N_("iinode"),
-       N_("Iillegal"),
-       N_("jjournal"),
-       N_("Ddeleted"),
        N_("ddirectory"),
+       N_("Ddeleted"),
        N_("eentry"),
        N_("E@e '%Dn' in %p (%i)"),
        N_("ffilesystem"),
        N_("Ffor @i %i (%Q) is"),
        N_("ggroup"),
        N_("hHTREE @d @i"),
+       N_("iinode"),
+       N_("Iillegal"),
+       N_("jjournal"),
        N_("llost+found"),
        N_("Lis a link"),
        N_("mmultiply-claimed"),
@@ -197,7 +200,7 @@ static void safe_print(FILE *f, const char *cp, int len)
 static void print_pathname(FILE *f, ext2_filsys fs, ext2_ino_t dir,
                           ext2_ino_t ino)
 {
-       errcode_t       retval;
+       errcode_t       retval = 0;
        char            *path;
 
        if (!dir && (ino < num_special_inodes)) {
@@ -221,12 +224,13 @@ static void print_time(FILE *f, time_t t)
        static int              do_gmt = -1;
 
 #ifdef __dietlibc__
-               /* The diet libc doesn't respect the TZ environemnt variable */
+               /* The diet libc doesn't respect the TZ environment variable */
                if (do_gmt == -1) {
                        time_str = getenv("TZ");
                        if (!time_str)
                                time_str = "";
-                       do_gmt = !strcmp(time_str, "GMT0");
+                       do_gmt = !strcmp(time_str, "GMT") ||
+                               !strcmp(time_str, "GMT0");
                }
 #endif
                time_str = asctime((do_gmt > 0) ? gmtime(&t) : localtime(&t));
@@ -295,8 +299,7 @@ static _INLINE_ void expand_inode_expression(FILE *f, ext2_filsys fs, char ch,
                fprintf(f, "%u", large_inode->i_extra_isize);
                break;
        case 'b':
-               if (fs->super->s_feature_ro_compat &
-                   EXT4_FEATURE_RO_COMPAT_HUGE_FILE) 
+               if (ext2fs_has_feature_huge_file(fs->super))
                        fprintf(f, "%llu", inode->i_blocks +
                                (((long long) inode->osd2.linux2.l_i_blocks_hi)
                                 << 32));
@@ -361,8 +364,7 @@ static _INLINE_ void expand_dirent_expression(FILE *f, ext2_filsys fs, char ch,
                                              struct problem_context *ctx)
 {
        struct ext2_dir_entry   *dirent;
-       unsigned int rec_len;
-       int     len;
+       unsigned int rec_len, len;
 
        if (!ctx || !ctx->dirent)
                goto no_dirent;
@@ -374,7 +376,7 @@ static _INLINE_ void expand_dirent_expression(FILE *f, ext2_filsys fs, char ch,
                fprintf(f, "%u", dirent->inode);
                break;
        case 'n':
-               len = dirent->name_len & 0xFF;
+               len = ext2fs_dirent_name_len(dirent);
                if ((ext2fs_get_rec_len(fs, dirent, &rec_len) == 0) &&
                    (len > rec_len))
                        len = rec_len;
@@ -385,10 +387,10 @@ static _INLINE_ void expand_dirent_expression(FILE *f, ext2_filsys fs, char ch,
                fprintf(f, "%u", rec_len);
                break;
        case 'l':
-               fprintf(f, "%u", dirent->name_len & 0xFF);
+               fprintf(f, "%u", ext2fs_dirent_name_len(dirent));
                break;
        case 't':
-               fprintf(f, "%u", dirent->name_len >> 8);
+               fprintf(f, "%u", ext2fs_dirent_file_type(dirent));
                break;
        default:
        no_dirent:
@@ -451,7 +453,7 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
                fprintf(f, "%*u", width, ctx->dir);
                break;
        case 'g':
-               fprintf(f, "%*d", width, ctx->group);
+               fprintf(f, "%*u", width, ctx->group);
                break;
        case 'i':
                fprintf(f, "%*u", width, ctx->ino);
@@ -490,7 +492,7 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
 #endif
                break;
        case 'S':
-               fprintf(f, "%u", get_backup_sb(NULL, fs, NULL, NULL));
+               fprintf(f, "%llu", get_backup_sb(NULL, fs, NULL, NULL));
                break;
        case 's':
                fprintf(f, "%*s", width, ctx->str ? ctx->str : "NULL");
@@ -501,6 +503,27 @@ static _INLINE_ void expand_percent_expression(FILE *f, ext2_filsys fs,
        case 'T':
                print_time(f, e2fsck_ctx ? e2fsck_ctx->now : time(0));
                break;
+       case 'U':
+               switch (ctx->num) {
+               case USRQUOTA:
+                       m = _("user");
+                       break;
+               case GRPQUOTA:
+                       m = _("group");
+                       break;
+               case PRJQUOTA:
+                       m = _("project");
+                       break;
+               default:
+                       m = _("unknown quota type");
+                       break;
+               }
+               if (*first && islower(m[0]))
+                       fputc(toupper(*m++), f);
+               fputs(m, f);
+               if (ctx->num > PRJQUOTA)
+                       fprintf(f, " %d", (int) ctx->num);
+               break;
        case 'x':
                fprintf(f, "0x%0*x", width, ctx->csum1);
                break;