fsck.c (execute): Use '&&' instead of '&'. (It didn't cause a

	problem because we got lucky, but let's do things right.
	Fix from Thomas Woerner at Red Hat.)

diff --git a/misc/ChangeLog b/misc/ChangeLog
index a7adc7e..de05ed0 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-21  Theodore Ts'o  <tytso@mit.edu>
+
+       * fsck.c (execute): Use '&&' instead of '&'.  (It didn't cause a
+               problem because we got lucky, but let's do things right.
+               Fix from Thomas Woerner at Red Hat.)
+
 2004-02-03  Theodore Ts'o  <tytso@mit.edu>
 
        * filefrag.c: Use #ifdef __linux__ instead of __LINUX__ so that it

diff --git a/misc/fsck.c b/misc/fsck.c
index bebf5ee..da85867 100644 (file)
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -439,7 +439,7 @@ static int execute(const char *type, const char *device, const char *mntpt,
        for (i=0; i <num_args; i++)
                argv[argc++] = string_copy(args[i]);
 
-       if (progress & !progress_active()) {
+       if (progress && !progress_active()) {
                if ((strcmp(type, "ext2") == 0) ||
                    (strcmp(type, "ext3") == 0)) {
                        argv[argc++] = string_copy("-C0");