From 23bab3df6988ea8afba34ea149b3b808a99bbdc2 Mon Sep 17 00:00:00 2001
From: Martin Kysel <mkysel@nuodb.com>
Date: Tue, 23 Aug 2016 11:40:09 +0100
Subject: [PATCH] moved more to unix utils, minor review updates

---
 Cargo.toml       |  2 +-
 src/more/more.rs | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3ce10523b..95ea8df4c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,6 +21,7 @@ unix = [
   "logname",
   "mkfifo",
   "mknod",
+  "more",
   "mv",
   "nice",
   "nohup",
@@ -63,7 +64,6 @@ generic = [
   "ls",
   "mkdir",
   "mktemp",
-  "more",
   "nl",
   "nproc",
   "od",
diff --git a/src/more/more.rs b/src/more/more.rs
index 39a87cc35..094894cbf 100644
--- a/src/more/more.rs
+++ b/src/more/more.rs
@@ -15,7 +15,7 @@ extern crate getopts;
 extern crate uucore;
 
 use getopts::Options;
-use std::io::{stdout, stdin, stderr, Write, Read, Result};
+use std::io::{stdout, Write, Read};
 use std::fs::File;
 
 extern crate nix;
@@ -75,12 +75,11 @@ fn help(usage: &str) {
 }
 
 fn more(matches: getopts::Matches) {
-    let mut files = matches.free;
+    let files = matches.free;
     let mut f = File::open(files.first().unwrap()).unwrap();
     let mut buffer = [0; 1024];
 
-    let saved_term = termios::tcgetattr(0).unwrap();
-    let mut term = saved_term;
+    let mut term = termios::tcgetattr(0).unwrap();
     // Unset canonical mode, so we get characters immediately
     term.c_lflag.remove(termios::ICANON);
     // Disable local echo
@@ -92,8 +91,7 @@ fn more(matches: getopts::Matches) {
         if sz == 0 { break; }
         stdout().write(&buffer[0..sz]).unwrap();
         for byte in std::io::stdin().bytes() {
-            let byte = byte.unwrap();
-            match byte {
+            match byte.unwrap() {
                 b' ' => break,
                 b'q' | 27 => {
                     end = true;