From 13e61c3234234a2614d172a3236bf0e691548c68 Mon Sep 17 00:00:00 2001
From: Peter Sherman <pfnsec@gmail.com>
Date: Mon, 15 Mar 2021 15:56:11 +0000
Subject: [PATCH 1/2] head: add support for -z/--zero-terminated

---
 src/uu/head/src/head.rs                      |  15 +++++++++++++--
 tests/by-util/test_head.rs                   |   8 ++++++++
 tests/fixtures/head/zero_terminated.expected | Bin 0 -> 182 bytes
 tests/fixtures/head/zero_terminated.txt      | Bin 0 -> 7605 bytes
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/head/zero_terminated.expected
 create mode 100644 tests/fixtures/head/zero_terminated.txt

diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs
index 56d7e8452..9e92dd8c7 100644
--- a/src/uu/head/src/head.rs
+++ b/src/uu/head/src/head.rs
@@ -29,6 +29,7 @@ enum FilterMode {
 struct Settings {
     mode: FilterMode,
     verbose: bool,
+    zero_terminated: bool,
 }
 
 impl Default for Settings {
@@ -36,6 +37,7 @@ impl Default for Settings {
         Settings {
             mode: FilterMode::Lines(10),
             verbose: false,
+            zero_terminated: false,
         }
     }
 }
@@ -69,6 +71,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         )
         .optflag("q", "quiet", "never print headers giving file names")
         .optflag("v", "verbose", "always print headers giving file names")
+        .optflag("z", "zero-terminated", "line delimiter is NUL, not newline")
         .optflag("h", "help", "display this help and exit")
         .optflag("V", "version", "output version information and exit")
         .parse(new_args);
@@ -113,6 +116,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     let quiet = matches.opt_present("q");
     let verbose = matches.opt_present("v");
+    settings.zero_terminated = matches.opt_present("z");
     let files = matches.free;
 
     // GNU implementation allows multiple declarations of "-q" and "-v" with the
@@ -129,6 +133,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         settings.verbose = true;
     }
 
+
     if files.is_empty() {
         let mut buffer = BufReader::new(stdin());
         head(&mut buffer, &settings);
@@ -203,8 +208,14 @@ fn head<T: Read>(reader: &mut BufReader<T>, settings: &Settings) -> bool {
             }
         }
         FilterMode::Lines(count) => {
-            for line in reader.lines().take(count) {
-                println!("{}", line.unwrap());
+            if settings.zero_terminated {
+                for line in reader.split(0).take(count) {
+                    print!("{}\0", String::from_utf8(line.unwrap()).unwrap())
+                }
+            } else {
+                for line in reader.lines().take(count) {
+                    println!("{}", line.unwrap());
+                }
             }
         }
         FilterMode::NLines(count) => {
diff --git a/tests/by-util/test_head.rs b/tests/by-util/test_head.rs
index 4324290cb..eec82b51f 100644
--- a/tests/by-util/test_head.rs
+++ b/tests/by-util/test_head.rs
@@ -86,6 +86,14 @@ fn test_verbose() {
         .stdout_is_fixture("lorem_ipsum_verbose.expected");
 }
 
+#[test]
+fn test_zero_terminated() {
+    new_ucmd!()
+        .args(&["-z", "zero_terminated.txt"])
+        .run()
+        .stdout_is_fixture("zero_terminated.expected");
+}
+
 #[test]
 #[ignore]
 fn test_spams_newline() {
diff --git a/tests/fixtures/head/zero_terminated.expected b/tests/fixtures/head/zero_terminated.expected
new file mode 100644
index 0000000000000000000000000000000000000000..3c4cc058c3e55c81d16ec3ab18981d16fdb67cf1
GIT binary patch
literal 182
zcmY+5Q4Yc|3`2LKR6>I5RG~Exk)~CfX*)h_LKFM4{cID3i73!hoZY+JXUEt`V*g3F
zTyNy-5n0=d|AAG*qGCAUd(35jZzixxLKKTjwT!N8`LqmLJ4%%H9iNLbt4mYFhbRVN
JZAgwheE{GdJ+S})

literal 0
HcmV?d00001

diff --git a/tests/fixtures/head/zero_terminated.txt b/tests/fixtures/head/zero_terminated.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6c7968122e22adf98694d530a1e23750b288616c
GIT binary patch
literal 7605
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
M`G5x+?XQdf1Dc4iZ~y=R

literal 0
HcmV?d00001


From e3e5bf0178432234c4cc2d8d03ec7df6bee5bc64 Mon Sep 17 00:00:00 2001
From: Peter Sherman <pfnsec@gmail.com>
Date: Mon, 15 Mar 2021 20:48:49 +0000
Subject: [PATCH 2/2] Format head.rs

---
 src/uu/head/src/head.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs
index 9e92dd8c7..ae5807c22 100644
--- a/src/uu/head/src/head.rs
+++ b/src/uu/head/src/head.rs
@@ -133,7 +133,6 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         settings.verbose = true;
     }
 
-
     if files.is_empty() {
         let mut buffer = BufReader::new(stdin());
         head(&mut buffer, &settings);