[pack/unpack] Get the functional tests working again.

There's some hard coded version numbers in the tests, but I'm
leaving for now since I'll rewrite in Rust to avoid too much
of a proliferation of languages.

src/bin/thin_metadata_pack.rs

@@ -2,7 +2,8 @@ extern crate clap;
 extern crate thinp;
 
 use clap::{App, Arg};
-use std::process;
+use std::process::exit;
+use thinp::file_utils;
 
 fn main() {
     let parser = App::new("thin_metadata_pack")
@@ -25,8 +26,13 @@ fn main() {
     let input_file = matches.value_of("INPUT").unwrap();
     let output_file = matches.value_of("OUTPUT").unwrap();
 
+    if !file_utils::file_exists(input_file) {
+        eprintln!("Couldn't find input file '{}'.", &input_file);
+        exit(1);
+    }
+    
     if let Err(reason) = thinp::pack::pack::pack(&input_file, &output_file) {
         println!("Application error: {}\n", reason);
-        process::exit(1);
+        exit(1);
     }
 }

src/bin/thin_metadata_unpack.rs

@@ -3,6 +3,9 @@ extern crate thinp;
 
 use clap::{App, Arg};
 use std::process;
+use thinp::file_utils;
+
+use std::process::exit;
 
 fn main() {
     let parser = App::new("thin_metadata_unpack")
@@ -21,11 +24,15 @@ fn main() {
             .value_name("FILE")
             .takes_value(true));
 
-
     let matches = parser.get_matches();
     let input_file = matches.value_of("INPUT").unwrap();
     let output_file = matches.value_of("OUTPUT").unwrap();
 
+    if !file_utils::file_exists(input_file) {
+        eprintln!("Couldn't find input file '{}'.", &input_file);
+        exit(1);
+    }
+    
     if let Err(reason) = thinp::pack::pack::unpack(&input_file, &output_file) {
         println!("Application error: {}", reason);
         process::exit(1);

src/lib.rs

@@ -13,5 +13,6 @@ extern crate quickcheck_macros;
 
 pub mod block_manager;
 pub mod check;
+pub mod file_utils;
 pub mod pack;
 pub mod version;

src/pack/pack.rs

@@ -168,12 +168,26 @@ fn read_header<R>(mut r: R) -> io::Result<u64>
 where
     R: byteorder::ReadBytesExt,
 {
+    use std::process::exit;
+    
     let magic = r.read_u64::<LittleEndian>()?;
-    assert_eq!(magic, MAGIC);
+    if magic != MAGIC {
+        eprintln!("Not a pack file.");
+        exit(1);
+    }
+    
     let version = r.read_u64::<LittleEndian>()?;
-    assert_eq!(version, PACK_VERSION);
+    if version != PACK_VERSION {
+        eprintln!("unsupported pack file version ({}).", PACK_VERSION);
+        exit(1);
+    }
+    
     let block_size = r.read_u64::<LittleEndian>()?;
-    assert_eq!(block_size, 4096);
+    if block_size != BLOCK_SIZE {
+        eprintln!("block size is not {}", BLOCK_SIZE);
+        exit(1);
+    }
+
     r.read_u64::<LittleEndian>()
 }