Merge branch 'master' into update-deps

ogham · web-flow · commit 22b593d159dc · 2017-04-02T02:31:36.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Vagrantfile b/Vagrantfile
@@ -9,7 +9,7 @@ Vagrant.configure("2") do |config|
 
     # Install the dependencies needed for exa to build.
     config.vm.provision :shell, privileged: true, inline:
-        %[apt-get install -y git cmake libgit2-dev libssh2-1-dev curl attr]
+        %[apt-get install -y git cmake libgit2-dev libssh2-1-dev curl attr pkg-config]
 
     # Guarantee that the timezone is UTC -- some of the tests
     # depend on this (for now).
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -10,13 +10,18 @@ fn main() {
     let mut stdout = stdout();
 
     match Exa::new(&args, &mut stdout) {
-        Ok(mut exa) => if let Err(e) = exa.run() {
-            match e.kind() {
-                ErrorKind::BrokenPipe => exit(0),
-                _ => {
-                    writeln!(stderr(), "{}", e).unwrap();
-                    exit(1);
-                },
+        Ok(mut exa) => {
+            match exa.run() {
+                Ok(exit_status) => exit(exit_status),
+                Err(e) => {
+                    match e.kind() {
+                        ErrorKind::BrokenPipe => exit(0),
+                        _ => {
+                            writeln!(stderr(), "{}", e).unwrap();
+                            exit(1);
+                        },
+                    };
+                }
             };
         },
         Err(e) => {
diff --git a/src/exa.rs b/src/exa.rs
@@ -60,9 +60,10 @@ impl<'w, W: Write + 'w> Exa<'w, W> {
         })
     }
 
-    pub fn run(&mut self) -> IOResult<()> {
+    pub fn run(&mut self) -> IOResult<i32> {
         let mut files = Vec::new();
         let mut dirs = Vec::new();
+        let mut exit_status = 0;
 
         // List the current directory by default, like ls.
         if self.args.is_empty() {
@@ -72,6 +73,7 @@ impl<'w, W: Write + 'w> Exa<'w, W> {
         for file_name in self.args.iter() {
             match File::from_path(Path::new(&file_name), None) {
                 Err(e) => {
+                    exit_status = 2;
                     writeln!(stderr(), "{}: {}", file_name, e)?;
                 },
                 Ok(f) => {
@@ -98,10 +100,10 @@ impl<'w, W: Write + 'w> Exa<'w, W> {
         self.options.filter.filter_argument_files(&mut files);
         self.print_files(None, files)?;
 
-        self.print_dirs(dirs, no_files, is_only_dir)
+        self.print_dirs(dirs, no_files, is_only_dir, exit_status)
     }
 
-    fn print_dirs(&mut self, dir_files: Vec<Dir>, mut first: bool, is_only_dir: bool) -> IOResult<()> {
+    fn print_dirs(&mut self, dir_files: Vec<Dir>, mut first: bool, is_only_dir: bool, exit_status: i32) -> IOResult<i32> {
         for dir in dir_files {
 
             // Put a gap between directories, or between the list of files and
@@ -141,15 +143,18 @@ impl<'w, W: Write + 'w> Exa<'w, W> {
                     }
 
                     self.print_files(Some(&dir), children)?;
-                    self.print_dirs(child_dirs, false, false)?;
+                    match self.print_dirs(child_dirs, false, false, exit_status) {
+                        Ok(_) => (),
+                        Err(e) => return Err(e),
+                    }
                     continue;
                 }
             }
 
             self.print_files(Some(&dir), children)?;
         }
 
-        Ok(())
+        Ok(exit_status)
     }
 
     /// Prints the list of files using whichever view is selected.
