From e8582d0edb47aa1eda2d668c0a085d069a815c99 Mon Sep 17 00:00:00 2001 From: ksherlock Date: Wed, 19 May 2010 17:50:43 +0000 Subject: [PATCH] git-svn-id: https://profuse.googlecode.com/svn/branches/v2@226 aa027e90-d47c-11dd-86d7-074df07e0730 --- apfm.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apfm.cpp b/apfm.cpp index eb9d9f4..c21d049 100644 --- a/apfm.cpp +++ b/apfm.cpp @@ -153,11 +153,12 @@ int action_ls(int argc, char **argv, Pascal::VolumeEntry *volume) used += e->blocks(); } - if (extended && (lastBlock != volumeSize)) + if (lastBlock != volumeSize) { unsigned size = volumeSize - lastBlock; max = std::max(max, size); - printUnusedEntry(lastBlock, size); + if (extended) + printUnusedEntry(lastBlock, size); } @@ -269,7 +270,7 @@ void usage() } -int main(int argc, char **argv) +int main(/* int argc, char **argv */) { std::auto_ptr volume; std::auto_ptr device; @@ -279,6 +280,8 @@ int main(int argc, char **argv) int c; + + // getop stops at first non '-' arg so it will not affect action flags. while ((c = ::getopt(argc, argv, "f:h")) != -1) { @@ -308,7 +311,7 @@ int main(int argc, char **argv) optreset = 1; optind = 1; - if (argc != 2) + if (argc < 2) { usage(); return 0;