[Emacs-diffs] Changes to emacs/lisp/net/tramp.el

[Kai Großjohann]

Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.17 emacs/lisp/net/tramp.el:1.18
*** emacs/lisp/net/tramp.el:1.17        Sun Aug  4 07:41:38 2002
--- emacs/lisp/net/tramp.el     Sun Aug  4 09:58:44 2002
***************
*** 72,78 ****
  ;; In the Tramp CVS repository, the version numer is auto-frobbed from
  ;; the Makefile, so you should edit the top-level Makefile to change
  ;; the version number.
! (defconst tramp-version "2.0.9"
    "This version of tramp.")
  
  (defconst tramp-bug-report-address "address@hidden"
--- 72,78 ----
  ;; In the Tramp CVS repository, the version numer is auto-frobbed from
  ;; the Makefile, so you should edit the top-level Makefile to change
  ;; the version number.
! (defconst tramp-version "2.0.10"
    "This version of tramp.")
  
  (defconst tramp-bug-report-address "address@hidden"
***************
*** 1202,1210 ****
  This variable is automatically made buffer-local to each rsh process buffer
  upon opening the connection.")
  
! ;; Perl script to implement `file-attributes' in a Lisp `read'able output.
! ;; If you are hacking on this, note that you get *no* output unless this
! ;; spits out a complete line, including the '\n' at the end.
  (defconst tramp-perl-file-attributes (concat
   "$f = $ARGV[0];
  @s = lstat($f);
--- 1202,1221 ----
  This variable is automatically made buffer-local to each rsh process buffer
  upon opening the connection.")
  
! (defconst tramp-uudecode "\
! tramp_uudecode () {
! \(echo begin 600 /tmp/tramp.$$; tail +2) | uudecode
! cat /tmp/tramp.$$
! rm -f /tmp/tramp.$$
! }"
!   "Shell function to implement `uudecode' to standard output.
! Many systems support `uudecode -o -' for this or `uudecode -p', but
! some systems don't, and for them we have this shell function.")
! 
! ;; Perl script to implement `file-attributes' in a Lisp `read'able
! ;; output.  If you are hacking on this, note that you get *no* output
! ;; unless this spits out a complete line, including the '\n' at the
! ;; end.
  (defconst tramp-perl-file-attributes (concat
   "$f = $ARGV[0];
  @s = lstat($f);
***************
*** 4432,4439 ****
    ;; with buggy /bin/sh implementations will have a working bash or
    ;; ksh.  Whee...
    (tramp-find-shell multi-method method user host)
-   (tramp-find-file-exists-command multi-method method user host)
-   (sit-for 1)
    ;; Without (sit-for 0.1) at least, my machine will almost always blow
    ;; up on 'not numberp /root' - a race that causes the 'echo ~root'
    ;; output of (tramp-find-shell) to show up along with the output of
--- 4443,4448 ----
***************
*** 4446,4451 ****
--- 4455,4462 ----
    ;; of that function though. The workaround stays for me at least. :/
    ;;
    ;; Daniel Pittman <address@hidden>
+   (sleep-for 1)
+   (tramp-find-file-exists-command multi-method method user host)
    (make-local-variable 'tramp-ls-command)
    (setq tramp-ls-command (tramp-find-ls-command multi-method method user 
host))
    (unless tramp-ls-command
***************
*** 4500,4514 ****
               "test -n \"`find $1 -prune -newer $2 -print`\"" 
tramp-rsh-end-of-line
               "}")))
    (tramp-wait-for-output)
    ;; Find a `perl'.
    (erase-buffer)
    (let ((tramp-remote-perl
         (or (tramp-find-executable multi-method method user host
!                                 "perl5" tramp-remote-path nil)
             (tramp-find-executable multi-method method user host
!                                 "perl" tramp-remote-path nil))))
      (when tramp-remote-perl
!       (tramp-set-connection-property "perl" tramp-remote-perl multi-method 
method user host)
        ;; Set up stat in Perl if we can.
        (when tramp-remote-perl
        (tramp-message 5 "Sending the Perl `file-attributes' implementation.")
--- 4511,4530 ----
               "test -n \"`find $1 -prune -newer $2 -print`\"" 
tramp-rsh-end-of-line
               "}")))
    (tramp-wait-for-output)
+   ;; Send the fallback `uudecode' script.
+   (erase-buffer)
+   (tramp-send-linewise multi-method method user host tramp-uudecode)
+   (tramp-wait-for-output)
    ;; Find a `perl'.
    (erase-buffer)
    (let ((tramp-remote-perl
         (or (tramp-find-executable multi-method method user host
!                                   "perl5" tramp-remote-path nil)
             (tramp-find-executable multi-method method user host
!                                   "perl" tramp-remote-path nil))))
      (when tramp-remote-perl
!       (tramp-set-connection-property "perl" tramp-remote-perl
!                                    multi-method method user host)
        ;; Set up stat in Perl if we can.
        (when tramp-remote-perl
        (tramp-message 5 "Sending the Perl `file-attributes' implementation.")
***************
*** 4601,4606 ****
--- 4617,4624 ----
       nil uudecode-decode-region)
      ("uuencode xxx" "uudecode -p"
       nil uudecode-decode-region)
+     ("uuencode xxx" "tramp_uudecode"
+      nil uudecode-decode-region)
      ("tramp_encode_with_module" "tramp_decode_with_module"
       base64-encode-region base64-decode-region)
      ("tramp_encode" "tramp_decode"
***************
*** 5630,5635 ****
--- 5648,5654 ----
         tramp-login-prompt-regexp
         tramp-password-prompt-regexp
         tramp-wrong-passwd-regexp
+        tramp-yesno-prompt-regexp
         tramp-temp-name-prefix
         tramp-file-name-structure
         tramp-file-name-regexp
***************
*** 5639,5644 ****
--- 5658,5666 ----
         tramp-multi-connection-function-alist
         tramp-make-tramp-file-format
         tramp-end-of-output
+        tramp-coding-commands
+        tramp-actions-before-shell
+        tramp-multi-actions
  
         ;; Non-tramp variables of interest
         shell-prompt-pattern
***************
*** 5664,5670 ****
  of the *tramp/foo* buffer and the *debug tramp/foo* buffer in your bug
  report.
  
! --bug report follows this line--")))
  
  (defalias 'tramp-submit-bug 'tramp-bug)
  
--- 5686,5693 ----
  of the *tramp/foo* buffer and the *debug tramp/foo* buffer in your bug
  report.
  
! --bug report follows this line--
! ")))
  
  (defalias 'tramp-submit-bug 'tramp-bug)