Dump accepts ext3 filesystems. Checking the superblock features.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index 1dc780d210ef662256706cd492000de71578082d..1ccbf367840438179d24dcca53c7ae5d86a22126 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -3,7 +3,6 @@
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
  *     Stelian Pop <pop@cybercable.fr>, 1999 
- *
  */
 
 /*-
@@ -37,10 +36,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id: main.c,v 1.5 1999/10/11 13:31:11 stelian Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+       "$Id: main.c,v 1.7 1999/11/21 02:24:47 tiniou Exp $";
+#endif /* not lint */
+
 #include <sys/param.h>
 #include <sys/time.h>
 #ifdef __linux__
@@ -412,7 +414,7 @@ main(int argc, char *argv[])
        msg("Label: %s\n", labelstr);
 
 #ifdef __linux__
-       retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, &fs);
+       retval = dump_fs_open(disk, &fs);
        if (retval) {
                com_err(disk, retval, "while opening filesystem");
                if (retval == EXT2_ET_REV_TOO_HIGH)
@@ -639,14 +641,24 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
+       char white[MAXPATHLEN];
+       int i;
+       
+       strncpy(white, __progname, MAXPATHLEN-1);
+       white[MAXPATHLEN-1] = '\0';
+       for (i=0; i<MAXPATHLEN; ++i)
+               if (white[i] != '\0') white[i] = ' ';
+
+       fprintf(stderr,
+               "%s %s\n", __progname, _DUMP_VERSION);
        fprintf(stderr,
-               "usage: %s [-0123456789ac"
+               "usage:\t%s [-0123456789ac"
 #ifdef KERBEROS
                "k"
 #endif
-               "nu] [-B records] [-b blocksize] [-d density] [-f file]\n"
-               "            [-h level] [-s feet] [-T date] filesystem\n"
-               "       %s [-W | -w]\n", __progname, __progname);
+               "nu] [-B records] [-b blocksize] [-d density]\n"
+               "\t%s [-f file] [-h level] [-s feet] [-T date] filesystem\n"
+               "\t%s [-W | -w]\n", __progname, white, __progname);
        exit(X_STARTUP);
 }