summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debugfs/ChangeLog5
-rw-r--r--debugfs/debugfs.c5
-rw-r--r--e2fsck/ChangeLog3
-rw-r--r--e2fsck/unix.c5
-rw-r--r--misc/ChangeLog9
-rw-r--r--misc/chattr.c5
-rw-r--r--misc/dumpe2fs.c5
-rw-r--r--misc/e2image.c5
-rw-r--r--misc/fsck.c3
-rw-r--r--misc/lsattr.c5
-rw-r--r--misc/mke2fs.c5
-rw-r--r--misc/mklost+found.c5
-rw-r--r--misc/tune2fs.c4
13 files changed, 35 insertions, 29 deletions
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index aae89e38..8ee0f755 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-27 Theodore Tso <tytso@valinux.com>
+
+ * debugfs.c (main): Remove EXT2FS_VERSION from the version
+ display, since it only confuses people.
+
2001-08-15 Theodore Tso <tytso@valinux.com>
* Release of E2fsprogs 1.23
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index dadf29fb..26b4e628 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -1537,9 +1537,8 @@ int main(int argc, char **argv)
char *tmp;
initialize_ext2_error_table();
- fprintf (stderr, "debugfs %s, %s for EXT2 FS %s, %s\n",
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "debugfs %s (%s)\n", E2FSPROGS_VERSION,
+ E2FSPROGS_DATE);
while ((c = getopt (argc, argv, "iwcR:f:b:s:V")) != EOF) {
switch (c) {
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 9c435627..18a142f9 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,5 +1,8 @@
2001-08-27 Theodore Tso <tytso@valinux.com>
+ * unix.c (main): Remove EXT2FS_VERSION from the version display,
+ since it only confuses people.
+
* pass1.c (strnlen): Provide strnlen if libc doesn't.
2001-08-15 Theodore Tso <tytso@valinux.com>
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 431d03c6..c15b1d35 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -701,9 +701,8 @@ int main (int argc, char *argv[])
#endif
if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
- fprintf (stderr, _("e2fsck %s, %s for EXT2 FS %s, %s\n"),
- my_ver_string, my_ver_date, EXT2FS_VERSION,
- EXT2FS_DATE);
+ fprintf (stderr, "e2fsck %s (%s)\n", my_ver_string,
+ my_ver_date);
if (show_version_only) {
fprintf(stderr, _("\tUsing %s, %s\n"),
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 44d4d10d..24caca23 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-27 Theodore Tso <tytso@valinux.com>
+
+ * fsck.c (main): Make version display consisstent with the other
+ e2fsprogs programs.
+
+ * lsattr.c, chattr.c, mke2fs.c, tune2fs.c, dumpe2fs.c, e2image.c,
+ mklost+found.c: Remove EXT2FS_VERSION from the version
+ display, since it only confuses people.
+
2001-08-18 Theodore Tso <tytso@valinux.com>
* tune2fs.c (remove_journal_device): Remove unused variable
diff --git a/misc/chattr.c b/misc/chattr.c
index 56fef2f4..730e7b8b 100644
--- a/misc/chattr.c
+++ b/misc/chattr.c
@@ -284,9 +284,8 @@ int main (int argc, char ** argv)
exit (1);
}
if (verbose)
- fprintf (stderr, _("chattr %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "chattr %s (%s)\n",
+ E2FSPROGS_VERSION, E2FSPROGS_DATE);
for (j = i; j < argc; j++)
change_attributes (argv[j]);
exit(0);
diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index e5caac2d..0f23ff16 100644
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -260,9 +260,8 @@ int main (int argc, char ** argv)
textdomain(NLS_CAT_NAME);
#endif
initialize_ext2_error_table();
- fprintf (stderr, _("dumpe2fs %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "dumpe2fs %s (%s)\n", E2FSPROGS_VERSION,
+ E2FSPROGS_DATE);
if (argc && *argv)
program_name = *argv;
diff --git a/misc/e2image.c b/misc/e2image.c
index 600cd7b4..fe2f2b26 100644
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -410,9 +410,8 @@ int main (int argc, char ** argv)
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
- fprintf (stderr, _("e2image %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "e2image %s (%s)\n", E2FSPROGS_VERSION,
+ E2FSPROGS_DATE);
if (argc && *argv)
program_name = *argv;
initialize_ext2_error_table();
diff --git a/misc/fsck.c b/misc/fsck.c
index 05c69cbc..10cf39f7 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -1074,8 +1074,7 @@ int main(int argc, char *argv[])
PRS(argc, argv);
if (!notitle)
- printf(_("Parallelizing fsck version %s (%s)\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE);
+ printf("fsck %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE);
fstab = getenv("FSTAB_FILE");
if (!fstab)
diff --git a/misc/lsattr.c b/misc/lsattr.c
index 2d8de697..9e1cc33f 100644
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -178,9 +178,8 @@ int main (int argc, char ** argv)
}
if (verbose)
- fprintf (stderr, _("lsattr %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "lsattr %s (%s)\n",
+ E2FSPROGS_VERSION, E2FSPROGS_DATE);
if (optind > argc - 1)
lsattr_args (".");
else
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index a09326a3..070f7a43 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -809,9 +809,8 @@ static void PRS(int argc, char *argv[])
param.s_feature_ro_compat = 0;
}
#endif
- fprintf (stderr, _("mke2fs %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "mke2fs %s (%s)\n", E2FSPROGS_VERSION,
+ E2FSPROGS_DATE);
if (argc && *argv)
program_name = *argv;
while ((c = getopt (argc, argv,
diff --git a/misc/mklost+found.c b/misc/mklost+found.c
index 7d5d7c02..0bc3239f 100644
--- a/misc/mklost+found.c
+++ b/misc/mklost+found.c
@@ -41,9 +41,8 @@ int main (int argc, char ** argv)
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
- fprintf (stderr, _("mklost+found %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ fprintf (stderr, "mklost+found %s (%s)\n", E2FSPROGS_VERSION,
+ E2FSPROGS_DATE);
if (argc != 1) {
fprintf (stderr, _("Usage: mklost+found\n"));
exit(1);
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index e68d1322..c53d20da 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -430,9 +430,7 @@ static void parse_tune2fs_options(int argc, char **argv)
struct group * gr;
struct passwd * pw;
- printf(_("tune2fs %s, %s for EXT2 FS %s, %s\n"),
- E2FSPROGS_VERSION, E2FSPROGS_DATE,
- EXT2FS_VERSION, EXT2FS_DATE);
+ printf("tune2fs %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE);
while ((c = getopt (argc, argv, "c:e:fg:i:jlm:r:s:u:C:J:L:M:O:U:")) != EOF)
switch (c)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 05:45:35 +0000