aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-06-17 02:13:57 +0000
committervapier <vapier@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-06-17 02:13:57 +0000
commit443847e93444c2556f880ba21595411f47dc1e47 (patch)
treed691add343ce0c7917ace4bb47ffa104edd03b35
parent809452148f8b5fce198e07072358a151197a0f34 (diff)
downloadbusybox-w32-443847e93444c2556f880ba21595411f47dc1e47.tar.gz
busybox-w32-443847e93444c2556f880ba21595411f47dc1e47.tar.bz2
busybox-w32-443847e93444c2556f880ba21595411f47dc1e47.zip
Tito says: unify verbose/quiet flags
git-svn-id: svn://busybox.net/trunk/busybox@10546 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--e2fsprogs/mke2fs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index 88b469a25..8d4ee7378 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -46,7 +46,6 @@ static const char * device_name /* = NULL */;
46 46
47/* Command line options */ 47/* Command line options */
48static int cflag; 48static int cflag;
49static int verbose;
50static int quiet; 49static int quiet;
51static int super_only; 50static int super_only;
52static int force; 51static int force;
@@ -223,7 +222,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list)
223 sprintf(buf, "badblocks -b %d %s%s%s %d", fs->blocksize, 222 sprintf(buf, "badblocks -b %d %s%s%s %d", fs->blocksize,
224 quiet ? "" : "-s ", (cflag > 1) ? "-w " : "", 223 quiet ? "" : "-s ", (cflag > 1) ? "-w " : "",
225 fs->device_name, fs->super->s_blocks_count); 224 fs->device_name, fs->super->s_blocks_count);
226 if (verbose) 225 if (!quiet)
227 printf(_("Running command: %s\n"), buf); 226 printf(_("Running command: %s\n"), buf);
228 f = popen(buf, "r"); 227 f = popen(buf, "r");
229 if (!f) { 228 if (!f) {
@@ -981,7 +980,7 @@ static void PRS(int argc, char *argv[])
981 num_inodes = atoi(optarg); 980 num_inodes = atoi(optarg);
982 break; 981 break;
983 case 'v': 982 case 'v':
984 verbose = 1; 983 quiet = 0;
985 break; 984 break;
986 case 'q': 985 case 'q':
987 quiet = 1; 986 quiet = 1;