[GUILT] [PATCH] Fix fatal "guilt graph" error in sha1sum invocation.
- From
Per Cederqvist <cederp@opera.com>
- Date
- Mar 14, 2012, 13:34 UTC
- Message-ID
- <87399bpaq9.fsf@opera.com>
Fix the compatibility function sha1 so that it reads from stdin (and not a file with a zero-length file name) when no argument is supplied.
Signed-off-by: Per Cederqvist <cederp@opera.com> --- os.Darwin | 7 ++++++- os.Linux | 7 ++++++- os.SunOS | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-)
Note: I have tested both versions of the sha1 function, but only on Linux as I don't have access to a Mac.
/ceder
diff --git a/os.Darwin b/os.Darwin index 470f5fb..acf6b68 100644 --- a/os.Darwin +++ b/os.Darwin @@ -27,7 +27,12 @@ head_n() # usage: sha1 [file] sha1() { - openssl dgst -sha1 "$1" | sed "s,SHA1.\(.*\).= \(.*\),\2 \1," + if [ $# = 1 ] + then + openssl dgst -sha1 "$1" | sed "s,SHA1.\(.*\).= \(.*\),\2 \1," + else + openssl dgst -sha1 | sed 's,$, -,' + fi } # usage: cp_a <src> <dst> diff --git a/os.Linux b/os.Linux index 30b9cb0..aaebf88 100644 --- a/os.Linux +++ b/os.Linux @@ -30,7 +30,12 @@ head_n() # usage: sha1 [file] sha1() { - sha1sum "$1" + if [ $# = 1 ] + then + sha1sum "$1" + else + sha1sum + fi } # usage: cp_a <src> <dst> diff --git a/os.SunOS b/os.SunOS index 30b9cb0..aaebf88 100644 --- a/os.SunOS +++ b/os.SunOS @@ -30,7 +30,12 @@ head_n() # usage: sha1 [file] sha1() { - sha1sum "$1" + if [ $# = 1 ] + then + sha1sum "$1" + else + sha1sum + fi } # usage: cp_a <src> <dst>
-- 1.7.9