X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/8dd59f01de203f3f02c3f898a7015bb522a0e4bc..49f70d46ea38ceb7a501594db7f6ea35e19681aa:/lisp/sha1.el

diff --git a/lisp/sha1.el b/lisp/sha1.el
index c70b99c10b..4350d309a3 100644
--- a/lisp/sha1.el
+++ b/lisp/sha1.el
@@ -1,17 +1,17 @@
 ;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: SHA1, FIPS 180-1
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -65,7 +63,7 @@
   :group 'extensions)
 
 (defcustom sha1-maximum-internal-length 500
-  "*Maximum length of message to use Lisp version of SHA1 function.
+  "Maximum length of message to use Lisp version of SHA1 function.
 If message is longer than this, `sha1-program' is used instead.
 
 If this variable is set to 0, use external program only.
@@ -74,7 +72,7 @@ If this variable is set to nil, use internal function only."
   :group 'sha1)
 
 (defcustom sha1-program '("sha1sum")
-  "*Name of program to compute SHA1.
+  "Name of program to compute SHA1.
 It must be a string \(program name\) or list of strings \(name and its args\)."
   :type '(repeat string)
   :group 'sha1)
@@ -82,22 +80,25 @@ It must be a string \(program name\) or list of strings \(name and its args\)."
 (defcustom sha1-use-external (condition-case ()
 				 (executable-find (car sha1-program))
 			       (error))
-  "*Use external SHA1 program.
+  "Use external SHA1 program.
 If this variable is set to nil, use internal function only."
   :type 'boolean
   :group 'sha1)
 
 (defun sha1-string-external (string &optional binary)
-  (let (prog args digest default-enable-multibyte-characters)
+  (let ((default-directory "/") ;; in case otherwise non-existent
+        (process-connection-type nil) ;; pipe
+        prog args digest)
     (if (consp sha1-program)
 	(setq prog (car sha1-program)
 	      args (cdr sha1-program))
       (setq prog sha1-program
 	    args nil))
     (with-temp-buffer
+      (set-buffer-multibyte nil)
       (insert string)
       (apply (function call-process-region)
-	     (point-min)(point-max)
+	     (point-min) (point-max)
 	     prog t t nil args)
       ;; SHA1 is 40 bytes long in hexadecimal form.
       (setq digest (buffer-substring (point-min)(+ (point-min) 40))))