* net/tramp*.el: Sync with upstream version 2.0.28. Bugfixes.

* net/tramp-ftp.el: Glue code with Ange-FTP, broken out of
tramp.el.  From Michael Albinus.
* net/tramp-smb.el: New file for using smbclient to access
Windows shares with Tramp.  From Michael Albinus.

lisp/ChangeLog

+2002-12-26  Kai Gro,A_(Bjohann  <kai.grossjohann@uni-duisburg.de>
+
+	* net/tramp*.el: Sync with upstream version 2.0.28.  Bugfixes.
+	* net/tramp-ftp.el: Glue code with Ange-FTP, broken out of
+	tramp.el.  From Michael Albinus.
+	* net/tramp-smb.el: New file for using smbclient to access
+	Windows shares with Tramp.  From Michael Albinus.
+
 2002-12-26  Andreas Schwab  <schwab@suse.de>
 
 	* international/mule-cmds.el (select-safe-coding-system): Fix

lisp/net/tramp-ftp.el

+;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP and EFS -*- coding: iso-8859-1; -*-
+
+;; Copyright (C) 2002 Free Software Foundation, Inc.
+
+;; Author: Michael Albinus <Michael.Albinus@alcatel.de>
+;; Keywords: comm, processes
+
+;; This file is part of GNU Emacs.
+
+;; 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 2, 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
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Convenience functions for calling Ange-FTP (and maybe EFS, later on)
+;; from Tramp. Most of them are displaced from tramp.el
+
+;;; Code:
+
+(require 'tramp)
+
+(eval-when-compile
+  (require 'cl)
+  (require 'custom)
+  ;; Emacs 19.34 compatibility hack -- is this needed?
+  (or (>= emacs-major-version 20)
+      (load "cl-seq")))
+
+;; Disable Ange-FTP from file-name-handler-alist.
+;; To handle EFS, the following functions need to be dealt with:
+;;
+;; * dired-before-readin-hook contains efs-dired-before-readin
+;; * file-name-handler-alist contains efs-file-handler-function
+;;   and efs-root-handler-function and efs-sifn-handler-function
+;; * find-file-hooks contains efs-set-buffer-mode
+;;
+;; But it won't happen for EFS since the XEmacs maintainers
+;; don't want to use a unified filename syntax.
+(defun tramp-disable-ange-ftp ()
+  "Turn Ange-FTP off.
+This is useful for unified remoting.  See
+`tramp-file-name-structure-unified' and
+`tramp-file-name-structure-separate' for details.  Requests suitable
+for Ange-FTP will be forwarded to Ange-FTP.  Also see the variables
+`tramp-ftp-method', `tramp-default-method', and
+`tramp-default-method-alist'.
+
+This function is not needed in Emacsen which include Tramp, but is
+present for backward compatibility."
+  (let ((a1 (rassq 'ange-ftp-hook-function file-name-handler-alist))
+	(a2 (rassq 'ange-ftp-completion-hook-function file-name-handler-alist)))
+    (setq file-name-handler-alist
+	  (delete a1 (delete a2 file-name-handler-alist)))))
+(tramp-disable-ange-ftp)
+
+;; Define FTP method ...
+(defcustom tramp-ftp-method "ftp"
+  "*When this method name is used, forward all calls to Ange-FTP."
+  :group 'tramp
+  :type 'string)
+
+;; ... and add it to the method list.
+(add-to-list 'tramp-methods (cons tramp-ftp-method nil))
+
+;; Add some defaults for `tramp-default-method-alist'
+(add-to-list 'tramp-default-method-alist
+	     '("\\`ftp\\." "" tramp-ftp-method))
+(add-to-list 'tramp-default-method-alist
+	     '("" "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method))
+
+;; Add completion function for FTP method.
+(unless (memq system-type '(windows-nt))
+  (tramp-set-completion-function
+   tramp-ftp-method
+   '((tramp-parse-netrc "~/.netrc"))))
+
+(defun tramp-ftp-file-name-handler (operation &rest args)
+  "Invoke the Ange-FTP handler for OPERATION.
+First arg specifies the OPERATION, second arg is a list of arguments to
+pass to the OPERATION."
+  (save-match-data
+    (or (boundp 'ange-ftp-name-format)
+	(and (require 'ange-ftp)
+	     (tramp-disable-ange-ftp)))
+    (let* ((ange-ftp-name-format
+	    (list (nth 0 tramp-file-name-structure)
+		  (nth 3 tramp-file-name-structure)
+		  (nth 2 tramp-file-name-structure)
+		  (nth 4 tramp-file-name-structure)))
+	   (inhibit-file-name-handlers
+	    (list 'tramp-file-name-handler
+		  'tramp-completion-file-name-handler
+		  (and (eq inhibit-file-name-operation operation)
+		       inhibit-file-name-handlers)))
+	   (inhibit-file-name-operation operation))
+      (apply 'ange-ftp-hook-function operation args))))
+
+(defun tramp-ftp-file-name-p (filename)
+  "Check if it's a filename that should be forwarded to Ange-FTP."
+  (let ((v (tramp-dissect-file-name filename)))
+    (string=
+     (tramp-find-method
+      (tramp-file-name-multi-method v)
+      (tramp-file-name-method v)
+      (tramp-file-name-user v)
+      (tramp-file-name-host v))
+     tramp-ftp-method)))
+
+(add-to-list 'tramp-foreign-file-name-handler-alist
+	     (cons 'tramp-ftp-file-name-p 'tramp-ftp-file-name-handler))
+
+(provide 'tramp-ftp)
+
+;;; TODO:
+
+;; * In case of "/ftp:host:file" this works only for functions which
+;;   are defined in `tramp-file-name-handler-alist'.  Call has to be
+;;   pretended in `tramp-file-name-handler' otherwise.  Looks like
+;;   `ange-ftp-completion-hook-function' and `ange-ftp-hook-function'
+;;   are active temporarily in `file-name-handler-alist'.
+;;   Furthermore, there are no backup files on FTP hosts this case.
+;;   Worth further investigations.
+
+;;; tramp-ftp.el ends here

lisp/net/tramp-util.el

+;;; tramp-util.el --- Misc utility functions to use with Tramp
+
+;; Copyright (C) 2001  Free Software Foundation, Inc.
+
+;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+;; Keywords: comm, extensions, processes
+
+;; This file 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 2, or (at your option)
+;; any later version.
+
+;; This file is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; 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., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Some misc. utility functions that might go nicely with Tramp.
+;; Mostly, these are kluges awaiting real solutions later on.
+
+;;; Code:
+
+(eval-when-compile (require 'cl))
+(require 'compile)
+(require 'tramp)
+
+(defun tramp-compile (command)
+  "Compile on remote host."
+  (interactive
+   (if (or compilation-read-command current-prefix-arg)
+       (list (read-from-minibuffer "Compile command: "
+                                   compile-command nil nil
+                                   '(compile-history . 1)))
+     (list compile-command)))
+  (setq compile-command command)
+  (save-some-buffers (not compilation-ask-about-save) nil)
+  (let ((d default-directory))
+    (save-excursion
+      (pop-to-buffer (get-buffer-create "*Compilation*") t)
+      (erase-buffer)
+      (setq default-directory d)))
+  (tramp-handle-shell-command command (get-buffer "*Compilation*"))
+  (pop-to-buffer (get-buffer "*Compilation*"))
+  (compilation-minor-mode 1))
+
+(provide 'tramp-util)
+;;; tramp-util.el ends here

lisp/net/tramp-uu.el

@@ -36,7 +36,7 @@
     (mapcar (lambda (c)
 	      (prog1
 		  (cons c i)
-		(incf i)))
+		(setq i (1+ i))))
 	    tramp-uu-b64-alphabet))
   "Alist of mapping from base64 character to its byte.")
 
@@ -65,7 +65,7 @@
 	    ;; "=" means padding.  Insert "`" instead.
 	    (insert "`")
 	  (insert (tramp-uu-byte-to-uu-char (tramp-uu-b64-char-to-byte c))))
-	(incf i)
+	(setq i (1+ i))
 	;; Every 60 characters, add "M" at beginning of line (as
 	;; length byte) and insert a newline.
 	(when (zerop (% i 60))

lisp/net/tramp-vc.el

@@ -136,7 +136,8 @@ See `vc-do-command' for more information."
 	(goto-char (point-max))
 	(set-buffer-modified-p nil)
 	(forward-line -1)
-	(if (or (not (integerp status)) (and okstatus (< okstatus status)))
+	(if (or (not (integerp status))
+		(and (integerp okstatus) (< okstatus status)))
 	    (progn
 	      (pop-to-buffer buffer)
 	      (goto-char (point-min))
@@ -174,14 +175,16 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
              (path (when file (tramp-file-name-path v))))
       (setq squeezed (delq nil (copy-sequence flags)))
       (when file
-	(setq squeezed (append squeezed (list path))))
+	(setq squeezed (append squeezed (list (file-relative-name
+					       file default-directory)))))
       (let ((w32-quote-process-args t))
         (when (eq okstatus 'async)
           (message "Tramp doesn't do async commands, running synchronously."))
         (setq status (tramp-handle-shell-command
                       (mapconcat 'tramp-shell-quote-argument
                                  (cons command squeezed) " ") t))
-        (when (or (not (integerp status)) (and okstatus (< okstatus status)))
+        (when (or (not (integerp status))
+		  (and (integerp okstatus) (< okstatus status)))
           (pop-to-buffer (current-buffer))
           (goto-char (point-min))
           (shrink-window-if-larger-than-buffer)
@@ -281,6 +284,9 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
 	    (setq exec-status (read (current-buffer)))
 	    (message "Command %s returned status %d." command exec-status)))
       
+	;; Maybe okstatus can be `async' here.  But then, maybe the
+	;; async thing is new in Emacs 21, but this function is only
+	;; used in Emacs 20.
 	(cond ((> exec-status okstatus)
 	       (switch-to-buffer (get-file-buffer file))
 	       (shrink-window-if-larger-than-buffer