Merge pull request #1826 from pfnsec/master

head: add support for -z/--zero-terminated

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
@@ -203,8 +207,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) => {

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() {