ChangeLog, message.c, problem.c:

  Whoops, @d was already taken by "directory".  Use @v for device, and
  re-order the listing of at-expansions to avoid this problem in the
  future.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 58a0838..46d6254 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -9,7 +9,7 @@
 
        * problem.c: Modified problem table to use a new abbreviations.
 
-       * message.c: Add @j abbreviation for journal, and @d abbreviation
+       * message.c: Add @j abbreviation for journal, and @v abbreviation
                for device.
 
        * jfs_user.h: Moved contents of jfs_e2fsck.h into jfs_user.h.

diff --git a/e2fsck/message.c b/e2fsck/message.c
index 210c659..00956e2 100644 (file)
--- a/e2fsck/message.c
+++ b/e2fsck/message.c
@@ -55,10 +55,6 @@
  *     @B      bitmap
  *     @c      compress
  *     @C      conflicts with some other fs block
- *     @d      device
- *     @i      inode
- *     @I      illegal
- *     @j      journal
  *     @D      deleted
  *     @d      directory
  *     @e      entry
@@ -66,6 +62,9 @@
  *     @f      filesystem
  *     @F      for @i %i (%Q) is
  *     @g      group
+ *     @i      inode
+ *     @I      illegal
+ *     @j      journal
  *     @l      lost+found
  *     @L      is a link
  *     @o      orphaned
@@ -73,6 +72,7 @@
  *     @s      should be 
  *     @S      superblock
  *     @u      unattached
+ *     @v      device
  *     @z      zero-length
  */
 
@@ -104,7 +104,6 @@ static const char *abbrevs[] = {
        N_("Bbitmap"),
        N_("ccompress"),
        N_("Cconflicts with some other fs @b"),
-       N_("ddevice"),
        N_("iinode"),
        N_("Iillegal"),
        N_("jjournal"),
@@ -122,6 +121,7 @@ static const char *abbrevs[] = {
        N_("sshould be"),
        N_("Ssuper@b"),
        N_("uunattached"),
+       N_("vdevice"),
        N_("zzero-length"),
        "@@",
        0

diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 9eafd06..c8efab9 100644 (file)
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -110,16 +110,16 @@ static const struct e2fsck_problem problem_table[] = {
        /* Superblock corrupt */
        { PR_0_SB_CORRUPT,
          N_("\nThe @S could not be read or does not describe a correct ext2\n"
-         "@f.  If the @d is valid and it really contains an ext2\n"
+         "@f.  If the @v is valid and it really contains an ext2\n"
          "@f (and not swap or ufs or something else), then the @S\n"
   "is corrupt, and you might try running e2fsck with an alternate @S:\n"
-         "    e2fsck -b %S <@d>\n\n"),
+         "    e2fsck -b %S <@v>\n\n"),
          PROMPT_NONE, PR_FATAL },
 
        /* Filesystem size is wrong */
        { PR_0_FS_SIZE_WRONG,
          N_("The @f size (according to the @S) is %b @bs\n"
-         "The physical size of the @d is %c @bs\n"
+         "The physical size of the @v is %c @bs\n"
          "Either the @S or the partition table is likely to be corrupt!\n"),
          PROMPT_ABORT, 0 },
 
@@ -162,7 +162,7 @@ static const struct e2fsck_problem problem_table[] = {
 
        /* Error determing physical device size of filesystem */
        { PR_0_GETSIZE_ERROR,     
-         N_("Error determining size of the physical @d: %m\n"),
+         N_("Error determining size of the physical @v: %m\n"),
          PROMPT_NONE, PR_FATAL },
 
        /* Inode count in superblock is incorrect */
@@ -181,12 +181,12 @@ static const struct e2fsck_problem problem_table[] = {
 
        /* Superblock has a journal device (which we can't handle yet) */
        { PR_0_JOURNAL_UNSUPP_DEV,
-         N_("@S has external ext3 @j @d (unsupported).\n"),
+         N_("@S has external ext3 @j @v (unsupported).\n"),
          PROMPT_ABORT, PR_NO_OK | PR_AFTER_CODE, PR_0_JOURNAL_BAD_DEV },
 
        /* Superblock has a bad journal device */
        { PR_0_JOURNAL_BAD_DEV,
-         N_("@S has a bad ext3 @j (@d %X).\n"),
+         N_("@S has a bad ext3 @j (@v %X).\n"),
          PROMPT_CLEAR, PR_PREEN_OK },
 
        /* Superblock has a journal UUID (which we can't handle yet) */
@@ -509,7 +509,7 @@ static const struct e2fsck_problem problem_table[] = {
 
        /* Immutable flag set on a device or socket inode */
        { PR_1_SET_IMMUTABLE,
-         N_("Special (@d/socket/fifo) @i %i has immutable or "
+         N_("Special (@v/socket/fifo) @i %i has immutable or "
             "append-only flag set.\n"),
          PROMPT_CLEAR, PR_PREEN_OK | PR_PREEN_NO | PR_NO_OK },
 
@@ -520,7 +520,7 @@ static const struct e2fsck_problem problem_table[] = {
 
        /* Non-zero size for device, fifo or socket inode */
        { PR_1_SET_NONZSIZE,
-         "Special (@d/socket/fifo) @i %i has non-zero size.  ",
+         "Special (@v/socket/fifo) @i %i has non-zero size.  ",
          PROMPT_FIX, PR_PREEN_OK },
 
        /* Filesystem revision is 0, but feature flags are set */
@@ -744,12 +744,12 @@ static const struct e2fsck_problem problem_table[] = {
 
        /* Illegal character device inode */
        { PR_2_BAD_CHAR_DEV,
-         N_("@i %i (%Q) is an @I character @d.\n"),
+         N_("@i %i (%Q) is an @I character @v.\n"),
          PROMPT_CLEAR, 0 },
 
        /* Illegal block device inode */
        { PR_2_BAD_BLOCK_DEV,
-         N_("@i %i (%Q) is an @I @b @d.\n"),
+         N_("@i %i (%Q) is an @I @b @v.\n"),
          PROMPT_CLEAR, 0 },
 
        /* Duplicate '.' entry */