Commit 39b20f56 authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'. Add

"NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".
parent d154c079
2011-02-05 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'. Add
"NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".
2011-02-05 Era Eriksson <era+tramp@iki.fi> (tiny change) 2011-02-05 Era Eriksson <era+tramp@iki.fi> (tiny change)
   
* net/tramp.el (tramp-postfix-method-format) * net/tramp.el (tramp-postfix-method-format)
......
...@@ -76,16 +76,16 @@ call, letting the SMB client use the default one." ...@@ -76,16 +76,16 @@ call, letting the SMB client use the default one."
"Regexp used as prompt in smbclient.") "Regexp used as prompt in smbclient.")
(defconst tramp-smb-errors (defconst tramp-smb-errors
;; `regexp-opt' not possible because of first string.
(mapconcat (mapconcat
'identity 'identity
'(;; Connection error / timeout / unknown command. `(;; Connection error / timeout / unknown command.
"Connection to \\S-+ failed" "Connection\\( to \\S-+\\)? failed"
"Read from server failed, maybe it closed the connection" "Read from server failed, maybe it closed the connection"
"Call timed out: server did not respond" "Call timed out: server did not respond"
"\\S-+: command not found" "\\S-+: command not found"
"Server doesn't support UNIX CIFS calls" "Server doesn't support UNIX CIFS calls"
;; Samba. ,(regexp-opt
'(;; Samba.
"ERRDOS" "ERRDOS"
"ERRHRD" "ERRHRD"
"ERRSRV" "ERRSRV"
...@@ -105,17 +105,19 @@ call, letting the SMB client use the default one." ...@@ -105,17 +105,19 @@ call, letting the SMB client use the default one."
"NT_STATUS_DIRECTORY_NOT_EMPTY" "NT_STATUS_DIRECTORY_NOT_EMPTY"
"NT_STATUS_DUPLICATE_NAME" "NT_STATUS_DUPLICATE_NAME"
"NT_STATUS_FILE_IS_A_DIRECTORY" "NT_STATUS_FILE_IS_A_DIRECTORY"
"NT_STATUS_IO_TIMEOUT"
"NT_STATUS_LOGON_FAILURE" "NT_STATUS_LOGON_FAILURE"
"NT_STATUS_NETWORK_ACCESS_DENIED" "NT_STATUS_NETWORK_ACCESS_DENIED"
"NT_STATUS_NOT_IMPLEMENTED" "NT_STATUS_NOT_IMPLEMENTED"
"NT_STATUS_NO_SUCH_FILE" "NT_STATUS_NO_SUCH_FILE"
"NT_STATUS_NO_SUCH_USER"
"NT_STATUS_OBJECT_NAME_COLLISION" "NT_STATUS_OBJECT_NAME_COLLISION"
"NT_STATUS_OBJECT_NAME_INVALID" "NT_STATUS_OBJECT_NAME_INVALID"
"NT_STATUS_OBJECT_NAME_NOT_FOUND" "NT_STATUS_OBJECT_NAME_NOT_FOUND"
"NT_STATUS_SHARING_VIOLATION" "NT_STATUS_SHARING_VIOLATION"
"NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE" "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
"NT_STATUS_UNSUCCESSFUL" "NT_STATUS_UNSUCCESSFUL"
"NT_STATUS_WRONG_PASSWORD") "NT_STATUS_WRONG_PASSWORD")))
"\\|") "\\|")
"Regexp for possible error strings of SMB servers. "Regexp for possible error strings of SMB servers.
Used instead of analyzing error codes of commands.") Used instead of analyzing error codes of commands.")
...@@ -1037,17 +1039,17 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)." ...@@ -1037,17 +1039,17 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
;; \s-\{2,2} - leading spaces ;; \s-\{2,2} - leading spaces
;; \S-\(.*\S-\)\s-* - file name, 30 chars, left bound ;; \S-\(.*\S-\)\s-* - file name, 30 chars, left bound
;; \s-+[ADHRSV]* - permissions, 7 chars, right bound ;; \s-+[ADHRSV]* - permissions, 7 chars, right bound
;; \s- - space delimeter ;; \s- - space delimiter
;; \s-+[0-9]+ - size, 8 chars, right bound ;; \s-+[0-9]+ - size, 8 chars, right bound
;; \s-\{2,2\} - space delimeter ;; \s-\{2,2\} - space delimiter
;; \w\{3,3\} - weekday ;; \w\{3,3\} - weekday
;; \s- - space delimeter ;; \s- - space delimiter
;; \w\{3,3\} - month ;; \w\{3,3\} - month
;; \s- - space delimeter ;; \s- - space delimiter
;; [ 12][0-9] - day ;; [ 12][0-9] - day
;; \s- - space delimeter ;; \s- - space delimiter
;; [0-9]\{2,2\}:[0-9]\{2,2\}:[0-9]\{2,2\} - time ;; [0-9]\{2,2\}:[0-9]\{2,2\}:[0-9]\{2,2\} - time
;; \s- - space delimeter ;; \s- - space delimiter
;; [0-9]\{4,4\} - year ;; [0-9]\{4,4\} - year
;; ;;
;; samba/src/client.c (http://samba.org/doxygen/samba/client_8c-source.html) ;; samba/src/client.c (http://samba.org/doxygen/samba/client_8c-source.html)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment