From 295d432175292dbaef572093d784aab55f5c0b8f Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 15 Dec 2018 17:09:38 +0100
Subject: passfile: directly read file instead of invoking cat

Allows better error handling, gets rid of the call to an
external program, and fixes https://github.com/rfjakob/gocryptfs/issues/278 .
---
 internal/readpassword/passfile_test_files/empty.txt                     | 0
 internal/readpassword/passfile_test_files/empty_first_line.txt          | 2 ++
 internal/readpassword/passfile_test_files/mypassword.txt                | 1 +
 internal/readpassword/passfile_test_files/mypassword_garbage.txt        | 2 ++
 .../readpassword/passfile_test_files/mypassword_missing_newline.txt     | 1 +
 internal/readpassword/passfile_test_files/newline.txt                   | 1 +
 6 files changed, 7 insertions(+)
 create mode 100644 internal/readpassword/passfile_test_files/empty.txt
 create mode 100644 internal/readpassword/passfile_test_files/empty_first_line.txt
 create mode 100644 internal/readpassword/passfile_test_files/mypassword.txt
 create mode 100644 internal/readpassword/passfile_test_files/mypassword_garbage.txt
 create mode 100644 internal/readpassword/passfile_test_files/mypassword_missing_newline.txt
 create mode 100644 internal/readpassword/passfile_test_files/newline.txt

(limited to 'internal/readpassword/passfile_test_files')

diff --git a/internal/readpassword/passfile_test_files/empty.txt b/internal/readpassword/passfile_test_files/empty.txt
new file mode 100644
index 0000000..e69de29
diff --git a/internal/readpassword/passfile_test_files/empty_first_line.txt b/internal/readpassword/passfile_test_files/empty_first_line.txt
new file mode 100644
index 0000000..a607e80
--- /dev/null
+++ b/internal/readpassword/passfile_test_files/empty_first_line.txt
@@ -0,0 +1,2 @@
+
+garbage
diff --git a/internal/readpassword/passfile_test_files/mypassword.txt b/internal/readpassword/passfile_test_files/mypassword.txt
new file mode 100644
index 0000000..48d23cf
--- /dev/null
+++ b/internal/readpassword/passfile_test_files/mypassword.txt
@@ -0,0 +1 @@
+mypassword
diff --git a/internal/readpassword/passfile_test_files/mypassword_garbage.txt b/internal/readpassword/passfile_test_files/mypassword_garbage.txt
new file mode 100644
index 0000000..74ba741
--- /dev/null
+++ b/internal/readpassword/passfile_test_files/mypassword_garbage.txt
@@ -0,0 +1,2 @@
+mypassword
+garbage
diff --git a/internal/readpassword/passfile_test_files/mypassword_missing_newline.txt b/internal/readpassword/passfile_test_files/mypassword_missing_newline.txt
new file mode 100644
index 0000000..b3c42b5
--- /dev/null
+++ b/internal/readpassword/passfile_test_files/mypassword_missing_newline.txt
@@ -0,0 +1 @@
+mypassword
\ No newline at end of file
diff --git a/internal/readpassword/passfile_test_files/newline.txt b/internal/readpassword/passfile_test_files/newline.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/internal/readpassword/passfile_test_files/newline.txt
@@ -0,0 +1 @@
+
-- 
cgit v1.2.3