aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2011-02-05 11:03:29 +0100
committerMichael Albinus2011-02-05 11:03:29 +0100
commit39b20f56c070c5282ddd1a34dff8c68a420c4d9f (patch)
tree94f8a23a8f6180f6c754bf6caf1aecd183da2e41
parentd154c079dd429eb5b641139152e7714bfddca519 (diff)
downloademacs-39b20f56c070c5282ddd1a34dff8c68a420c4d9f.tar.gz
emacs-39b20f56c070c5282ddd1a34dff8c68a420c4d9f.zip
* net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'. Add
"NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".
Diffstat
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-smb.el82
2 files changed, 47 insertions, 40 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8af836b8164..cdf994dc4ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-02-05 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-smb.el (tramp-smb-errors): Use `regexp-opt'. Add
4 "NT_STATUS_IO_TIMEOUT" and "NT_STATUS_NO_SUCH_USER".
5
12011-02-05 Era Eriksson <era+tramp@iki.fi> (tiny change) 62011-02-05 Era Eriksson <era+tramp@iki.fi> (tiny change)
2 7
3 * net/tramp.el (tramp-postfix-method-format) 8 * net/tramp.el (tramp-postfix-method-format)
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 052ef68170d..7e1b0f5b8e9 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -76,46 +76,48 @@ call, letting the SMB client use the default one."
76 "Regexp used as prompt in smbclient.") 76 "Regexp used as prompt in smbclient.")
77 77
78(defconst tramp-smb-errors 78(defconst tramp-smb-errors
79 ;; `regexp-opt' not possible because of first string.
80 (mapconcat 79 (mapconcat
81 'identity 80 'identity
82 '(;; Connection error / timeout / unknown command. 81 `(;; Connection error / timeout / unknown command.
83 "Connection to \\S-+ failed" 82 "Connection\\( to \\S-+\\)? failed"
84 "Read from server failed, maybe it closed the connection" 83 "Read from server failed, maybe it closed the connection"
85 "Call timed out: server did not respond" 84 "Call timed out: server did not respond"
86 "\\S-+: command not found" 85 "\\S-+: command not found"
87 "Server doesn't support UNIX CIFS calls" 86 "Server doesn't support UNIX CIFS calls"
88 ;; Samba. 87 ,(regexp-opt
89 "ERRDOS" 88 '(;; Samba.
90 "ERRHRD" 89 "ERRDOS"
91 "ERRSRV" 90 "ERRHRD"
92 "ERRbadfile" 91 "ERRSRV"
93 "ERRbadpw" 92 "ERRbadfile"
94 "ERRfilexists" 93 "ERRbadpw"
95 "ERRnoaccess" 94 "ERRfilexists"
96 "ERRnomem" 95 "ERRnoaccess"
97 "ERRnosuchshare" 96 "ERRnomem"
98 ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000), 97 "ERRnosuchshare"
99 ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003). 98 ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000),
100 "NT_STATUS_ACCESS_DENIED" 99 ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003).
101 "NT_STATUS_ACCOUNT_LOCKED_OUT" 100 "NT_STATUS_ACCESS_DENIED"
102 "NT_STATUS_BAD_NETWORK_NAME" 101 "NT_STATUS_ACCOUNT_LOCKED_OUT"
103 "NT_STATUS_CANNOT_DELETE" 102 "NT_STATUS_BAD_NETWORK_NAME"
104 "NT_STATUS_CONNECTION_REFUSED" 103 "NT_STATUS_CANNOT_DELETE"
105 "NT_STATUS_DIRECTORY_NOT_EMPTY" 104 "NT_STATUS_CONNECTION_REFUSED"
106 "NT_STATUS_DUPLICATE_NAME" 105 "NT_STATUS_DIRECTORY_NOT_EMPTY"
107 "NT_STATUS_FILE_IS_A_DIRECTORY" 106 "NT_STATUS_DUPLICATE_NAME"
108 "NT_STATUS_LOGON_FAILURE" 107 "NT_STATUS_FILE_IS_A_DIRECTORY"
109 "NT_STATUS_NETWORK_ACCESS_DENIED" 108 "NT_STATUS_IO_TIMEOUT"
110 "NT_STATUS_NOT_IMPLEMENTED" 109 "NT_STATUS_LOGON_FAILURE"
111 "NT_STATUS_NO_SUCH_FILE" 110 "NT_STATUS_NETWORK_ACCESS_DENIED"
112 "NT_STATUS_OBJECT_NAME_COLLISION" 111 "NT_STATUS_NOT_IMPLEMENTED"
113 "NT_STATUS_OBJECT_NAME_INVALID" 112 "NT_STATUS_NO_SUCH_FILE"
114 "NT_STATUS_OBJECT_NAME_NOT_FOUND" 113 "NT_STATUS_NO_SUCH_USER"
115 "NT_STATUS_SHARING_VIOLATION" 114 "NT_STATUS_OBJECT_NAME_COLLISION"
116 "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE" 115 "NT_STATUS_OBJECT_NAME_INVALID"
117 "NT_STATUS_UNSUCCESSFUL" 116 "NT_STATUS_OBJECT_NAME_NOT_FOUND"
118 "NT_STATUS_WRONG_PASSWORD") 117 "NT_STATUS_SHARING_VIOLATION"
118 "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
119 "NT_STATUS_UNSUCCESSFUL"
120 "NT_STATUS_WRONG_PASSWORD")))
119 "\\|") 121 "\\|")
120 "Regexp for possible error strings of SMB servers. 122 "Regexp for possible error strings of SMB servers.
121Used instead of analyzing error codes of commands.") 123Used instead of analyzing error codes of commands.")
@@ -1037,17 +1039,17 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
1037;; \s-\{2,2} - leading spaces 1039;; \s-\{2,2} - leading spaces
1038;; \S-\(.*\S-\)\s-* - file name, 30 chars, left bound 1040;; \S-\(.*\S-\)\s-* - file name, 30 chars, left bound
1039;; \s-+[ADHRSV]* - permissions, 7 chars, right bound 1041;; \s-+[ADHRSV]* - permissions, 7 chars, right bound
1040;; \s- - space delimeter 1042;; \s- - space delimiter
1041;; \s-+[0-9]+ - size, 8 chars, right bound 1043;; \s-+[0-9]+ - size, 8 chars, right bound
1042;; \s-\{2,2\} - space delimeter 1044;; \s-\{2,2\} - space delimiter
1043;; \w\{3,3\} - weekday 1045;; \w\{3,3\} - weekday
1044;; \s- - space delimeter 1046;; \s- - space delimiter
1045;; \w\{3,3\} - month 1047;; \w\{3,3\} - month
1046;; \s- - space delimeter 1048;; \s- - space delimiter
1047;; [ 12][0-9] - day 1049;; [ 12][0-9] - day
1048;; \s- - space delimeter 1050;; \s- - space delimiter
1049;; [0-9]\{2,2\}:[0-9]\{2,2\}:[0-9]\{2,2\} - time 1051;; [0-9]\{2,2\}:[0-9]\{2,2\}:[0-9]\{2,2\} - time
1050;; \s- - space delimeter 1052;; \s- - space delimiter
1051;; [0-9]\{4,4\} - year 1053;; [0-9]\{4,4\} - year
1052;; 1054;;
1053;; samba/src/client.c (http://samba.org/doxygen/samba/client_8c-source.html) 1055;; samba/src/client.c (http://samba.org/doxygen/samba/client_8c-source.html)
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-21 18:12:14 +0000