Commits

youngs  committed 5124f33

Sync with normal package tree.

Reverting Ben's last commit on the express request
of the EFS maintainer.

Also increment version in Makefile for md5 reasons

  • Participants
  • Parent commits e97278f

Comments (0)

Files changed (6)

-2001-05-10  Ben Wing  <ben@xemacs.org>
-
-	* LISTS:
-	* README (http):
-	* efs-report.el (efs-bug-address):
-	* efs-report.el (efs-report-bug):
-	Note that this version is modified from the original, and that
-	bugs related to this are not the maintainer's responsibility.
-	
-	* efs.el:
-	* efs.el (efs-version):
-	* efs.el (efs-null-device): New.
-	* efs.el (efs-tmp-name-template): Fix up problems with Cygwin
-	FTP client and Windows native XEmacs.
-	* efs.el (efs-expand-tilde): Use efs-null-device.
-	* efs.el (efs-guess-host-type): ditto.
-
-2001-03-01  Ben Wing  <ben@xemacs.org>
-
-	Undid recently checked-in changes of 2000-07-12 pending approval
-	from Mike Sperber.
-
-2000-07-12  Ben Wing  <ben@xemacs.org>
-
-	* efs.el:
-	* efs.el (efs-null-device): New.
-	* efs.el (efs-tmp-name-template): Fix up problems with Cygwin
-	FTP client and Windows native XEmacs.
-	* efs.el (efs-expand-tilde): Use efs-null-device.
-	* efs.el (efs-guess-host-type): ditto.
-
 2000-10-15  Martin Buchholz <martin@xemacs.org>
 
 	* *: spelling fixes.
-[NOTE: This version of EFS (as supplied with XEmacs) has been modified
-from the canonical version in order to fix problems under MS Windows.
-Please consider sending bug reports to xemacs-beta@xemacs.org instead
-of the lists below, especially under Windows.]
-
 There are several mailing lists relevant to efs.  If you wish to join
 a list, send e-mail to their -request address.
 
 
 include Makefile.efs
 
-VERSION = 1.23
+VERSION = 1.24
 AUTHOR_VERSION = 1.19
 MAINTAINER = Mike Sperber <sperber@informatik.uni-tuebingen.de>
 PACKAGE = efs
 PKG_TYPE = regular
 REQUIRES = xemacs-base dired
-CATEGORY = standard
+CATEGORY = libs
 
 ELCS = $(EFSOBJS) efs-x19.15.elc $(XEOBJS_EFS) $(MULEOBJS_EFS)
 
 Read the INSTALL file for installation instructions.  Refer to the
 manual in efs.texi for more information.
 
-This is a beta release.
-
-[NOTE: This version of EFS (as supplied with XEmacs) has been modified
-from the canonical version in order to fix problems under MS Windows.
-Please consider sending bug reports to xemacs-beta@xemacs.org instead
-of the EFS maintainers, especially under Windows.]
+This is a beta release.

File efs-report.el

    "Fellow efs'ers:"
    "Greetings earthlings:"])
 
-(defvar efs-bug-address "xemacs-beta@xemacs.org,efs-bugs@hplb.hpl.hp.com")
+(defvar efs-bug-address "efs-bugs@hplb.hpl.hp.com")
 
 (defconst efs-report-other-vars
   ;; List of variables needed for efs-report, that aren't generated below.
 	   vars
 	   (function efs-report-pre-hook)
 	   (function efs-report-post-hook)
-	   (concat
-	    (aref efs-report-salutations
-		  (% (+ (% (random) 1000) 1000)
-		     (length efs-report-salutations)))
-	    "\n\n[NOTE: This version of EFS (as supplied with XEmacs) has been modified
-from the canonical version in order to fix problems under MS Windows.
-The EFS maintainers are not responsible for bugs related to this
-change.]"
-	    ))))))
+	   (aref efs-report-salutations
+		 (% (+ (% (random) 1000) 1000)
+		    (length efs-report-salutations))))))))
 
 ;;; end of efs-report.el
 ;;;; ------------------------------------------------------------
 
 (defconst efs-version
-  (concat (substring "$efs release: 1.19 (modified for XEmacs) $" 14 -2)
+  (concat (substring "$efs release: 1.19 $" 14 -2)
 	  "/"
 	  (substring "#Revision: 1.63 $" 11 -2)))
 
 ;; List of gateway types for which we need to do explicit file handling on
 ;; the gateway machine.
 
-(defconst efs-null-device (cond ((boundp 'null-device) null-device)
-				((boundp 'grep-null-device) grep-null-device)
-				((eq system-type 'windows-nt) "nul")
-				(t "/dev/null"))
-  "Filename corresponding to the null device.")
-
 ;;;; ------------------------------------------------------------------
 ;;;; User customization variables. Please read through these carefully.
 ;;;; ------------------------------------------------------------------
 ;;; End of gateway config variables.
 
 (defcustom efs-tmp-name-template
-  (concat (if (fboundp 'temp-directory)
-	      ;; we may be calling the cygwin ftp client, regardless of
-	      ;; whether we're running a cygwin version of xemacs, and it
-	      ;; doesn't accept \'s in filenames.  the windows ftp client
-	      ;; accepts /'s, so use them.
-	      (if (eq system-type 'windows-nt)
-		  (replace-in-string (temp-directory) "\\\\" "/")
-		(temp-directory))
-	    "/tmp") "/efs")
+  (concat (if (fboundp 'temp-directory) (temp-directory) "/tmp") "/efs")
   "Template used to create temporary files.
 If you are worried about security, make this a directory in some
 bomb-proof cave somewhere. efs does clean up its temp files, but
 		  (memq host-type efs-unix-host-types)
 		  (let ((line (nth 1 (efs-send-cmd
 				      host user
-				      (list 'get tilde efs-null-device)
+				      (list 'get tilde "/dev/null")
 				      (format "expanding %s" tilde)))))
 		    (setq res
 			  (and (string-match efs-expand-dir-msgs line)
 	     ;; Try to get tilde.
 	     ((null dir)
 	      (let ((tilde (nth 1 (efs-send-cmd
-				   host user (list 'get "~"
-						   efs-null-device)))))
+				   host user (list 'get "~" "/dev/null")))))
 		(cond
 		 ;; super dumb unix
 		 ((string-match efs-super-dumb-unix-tilde-regexp tilde)