From 665120f0639d367d8f254a1df407bfaf65f5ef47 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Fri, 13 Jan 2017 10:44:11 -0700
Subject: [PATCH] Better error messages

---
 Cargo.toml    |  2 +-
 mkfs/main.rs  | 19 +++++++++++++------
 mount/main.rs |  6 ++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4fd1864767..c5d069994f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "redoxfs"
 description = "The Redox Filesystem"
 repository = "https://github.com/redox-os/redoxfs"
-version = "0.1.1"
+version = "0.1.2"
 license-file = "LICENSE"
 readme = "README.md"
 authors = ["Jeremy Soller <jackpot51@gmail.com>"]
diff --git a/mkfs/main.rs b/mkfs/main.rs
index 1a02b536a3..738a07edf2 100644
--- a/mkfs/main.rs
+++ b/mkfs/main.rs
@@ -3,8 +3,7 @@
 extern crate redoxfs;
 extern crate syscall;
 
-use std::env;
-use std::str;
+use std::{env, process, str};
 
 use redoxfs::FileSystem;
 
@@ -19,13 +18,21 @@ fn main() {
         match Image::open(&path) {
             Ok(disk) => match FileSystem::create(Box::new(disk)) {
                 Ok(filesystem) => {
-                    println!("redoxfs: created filesystem on {}, size {} MB", path, filesystem.header.1.size/1024/1024);
+                    println!("redoxfs-mkfs: created filesystem on {}, size {} MB", path, filesystem.header.1.size/1024/1024);
                 },
-                Err(err) => println!("redoxfs: failed to create filesystem on {}: {}", path, err)
+                Err(err) => {
+                    println!("redoxfs-mkfs: failed to create filesystem on {}: {}", path, err);
+                    process::exit(1);
+                }
             },
-            Err(err) => println!("redoxfs: failed to open image {}: {}", path, err)
+            Err(err) => {
+                println!("redoxfs-mkfs: failed to open image {}: {}", path, err);
+                process::exit(1);
+            }
         }
     } else {
-        println!("redoxfs: no disk image provided");
+        println!("redoxfs-mkfs: no disk image provided");
+        println!("redoxfs-mkfs [disk]");
+        process::exit(1);
     }
 }
diff --git a/mount/main.rs b/mount/main.rs
index 8bb7546f93..d687ee4463 100644
--- a/mount/main.rs
+++ b/mount/main.rs
@@ -82,6 +82,10 @@ fn mount<P: AsRef<Path>>(filesystem: redoxfs::FileSystem, mountpoint: &P, write:
     redox::mount(filesystem, mountpoint, write);
 }
 
+fn usage() {
+    println!("redoxfs [disk] [mountpoint]");
+}
+
 fn main() {
     use std::io::{Read, Write};
 
@@ -106,6 +110,7 @@ fn main() {
                                 process::exit(0);
                             } else {
                                 println!("redoxfs: no mount point provided");
+                                usage();
                             }
                         },
                         Err(err) => println!("redoxfs: failed to open filesystem {}: {}", path, err)
@@ -118,6 +123,7 @@ fn main() {
                 process::exit(1);
             } else {
                 println!("redoxfs: no disk image provided");
+                usage();
             }
         } else if pid > 0 {
             drop(write);