Simplify error handling in some places

1 files changed, 6 insertions, 17 deletions

diff --git a/src/tftpd.rs b/src/tftpd.rs
index a833998..d10287b 100644
--- a/src/tftpd.rs
+++ b/src/tftpd.rs
@@ -64,24 +64,13 @@ impl Tftpd {
 
     fn file_allowed(&self, filename: &Path) -> Option<PathBuf> {
         /* get parent to check dir where file should be read/written */
-        let path = self.conf.dir.join(filename);
-        let path = match path.parent() {
-            Some(p) => p,
-            None => return None,
-        };
-        let path = match path.canonicalize() {
-            Ok(p) => p,
-            Err(_) => return None,
-        };
-
-        /* get last component to append to canonicalized path */
-        let filename = match filename.file_name() {
-            Some(f) => f,
-            None => return None,
-        };
-        let path = path.join(filename);
+        let path = self.conf.dir.join(filename)
+                                .parent()?
+                                .canonicalize()
+                                .ok()?;
 
-        match path.strip_prefix(&self.conf.dir) {
+        /* check last component of given filename appended to canonicalized path */
+        match path.join(filename.file_name()?).strip_prefix(&self.conf.dir) {
             Ok(p) if p != PathBuf::new() => Some(p.to_path_buf()),
             _ => None,
         }