comparison lisp/net/net-utils.el @ 92360:4054054dd212

Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090
author Miles Bader <miles@gnu.org>
date Sat, 01 Mar 2008 01:28:31 +0000
parents a68825f42cef e2cf0e9f1f88
children 9f968e893cca
comparison
equal deleted inserted replaced
92359:1af6d6eab2e9 92360:4054054dd212
103 103
104 (defcustom ifconfig-program-options 104 (defcustom ifconfig-program-options
105 (list 105 (list
106 (if (eq system-type 'windows-nt) 106 (if (eq system-type 'windows-nt)
107 "/all" "-a")) 107 "/all" "-a"))
108 "Options for `ifconfig-program'." 108 "Options for the ifconfig program."
109 :group 'net-utils 109 :group 'net-utils
110 :type '(repeat string)) 110 :type '(repeat string))
111 111
112 (defcustom iwconfig-program "iwconfig" 112 (defcustom iwconfig-program "iwconfig"
113 "Program to print wireless network configuration information." 113 "Program to print wireless network configuration information."
122 :version "23.1") 122 :version "23.1")
123 123
124 (define-obsolete-variable-alias 'ipconfig-program-options 124 (define-obsolete-variable-alias 'ipconfig-program-options
125 'ifconfig-program-options "22.2") 125 'ifconfig-program-options "22.2")
126 126
127 (defcustom netstat-program "netstat" 127 (defcustom netstat-program "netstat"
128 "Program to print network statistics." 128 "Program to print network statistics."
129 :group 'net-utils 129 :group 'net-utils
130 :type 'string) 130 :type 'string)
131 131
132 (defcustom netstat-program-options 132 (defcustom netstat-program-options
133 (list "-a") 133 (list "-a")
134 "Options for netstat-program." 134 "Options for the netstat program."
135 :group 'net-utils 135 :group 'net-utils
136 :type '(repeat string)) 136 :type '(repeat string))
137 137
138 (defcustom arp-program "arp" 138 (defcustom arp-program "arp"
139 "Program to print IP to address translation tables." 139 "Program to print IP to address translation tables."
140 :group 'net-utils 140 :group 'net-utils
141 :type 'string) 141 :type 'string)
142 142
143 (defcustom arp-program-options 143 (defcustom arp-program-options
144 (list "-a") 144 (list "-a")
145 "Options for arp-program." 145 "Options for the arp program."
146 :group 'net-utils 146 :group 'net-utils
147 :type '(repeat string)) 147 :type '(repeat string))
148 148
149 (defcustom route-program 149 (defcustom route-program
150 (if (eq system-type 'windows-nt) 150 (if (eq system-type 'windows-nt)
156 156
157 (defcustom route-program-options 157 (defcustom route-program-options
158 (if (eq system-type 'windows-nt) 158 (if (eq system-type 'windows-nt)
159 (list "print") 159 (list "print")
160 (list "-r")) 160 (list "-r"))
161 "Options for route-program." 161 "Options for the route program."
162 :group 'net-utils 162 :group 'net-utils
163 :type '(repeat string)) 163 :type '(repeat string))
164 164
165 (defcustom nslookup-program "nslookup" 165 (defcustom nslookup-program "nslookup"
166 "Program to interactively query DNS information." 166 "Program to interactively query DNS information."
167 :group 'net-utils 167 :group 'net-utils
168 :type 'string) 168 :type 'string)
169 169
170 (defcustom nslookup-program-options nil 170 (defcustom nslookup-program-options nil
171 "List of options to pass to the nslookup program." 171 "Options for the nslookup program."
172 :group 'net-utils 172 :group 'net-utils
173 :type '(repeat string)) 173 :type '(repeat string))
174 174
175 (defcustom nslookup-prompt-regexp "^> " 175 (defcustom nslookup-prompt-regexp "^> "
176 "Regexp to match the nslookup prompt. 176 "Regexp to match the nslookup prompt.
178 This variable is only used if the variable 178 This variable is only used if the variable
179 `comint-use-prompt-regexp' is non-nil." 179 `comint-use-prompt-regexp' is non-nil."
180 :group 'net-utils 180 :group 'net-utils
181 :type 'regexp) 181 :type 'regexp)
182 182
183 (defcustom dig-program "dig" 183 (defcustom dig-program "dig"
184 "Program to query DNS information." 184 "Program to query DNS information."
185 :group 'net-utils 185 :group 'net-utils
186 :type 'string) 186 :type 'string)
187 187
188 (defcustom ftp-program "ftp" 188 (defcustom ftp-program "ftp"
189 "Progam to run to do FTP transfers." 189 "Program to run to do FTP transfers."
190 :group 'net-utils 190 :group 'net-utils
191 :type 'string) 191 :type 'string)
192 192
193 (defcustom ftp-program-options nil 193 (defcustom ftp-program-options nil
194 "List of options to pass to the FTP program." 194 "Options for the ftp program."
195 :group 'net-utils 195 :group 'net-utils
196 :type '(repeat string)) 196 :type '(repeat string))
197 197
198 (defcustom ftp-prompt-regexp "^ftp>" 198 (defcustom ftp-prompt-regexp "^ftp>"
199 "Regexp which matches the FTP program's prompt. 199 "Regexp which matches the FTP program's prompt.
207 "Smbclient program." 207 "Smbclient program."
208 :group 'net-utils 208 :group 'net-utils
209 :type 'string) 209 :type 'string)
210 210
211 (defcustom smbclient-program-options nil 211 (defcustom smbclient-program-options nil
212 "List of options to pass to the smbclient program." 212 "Options for the smbclient program."
213 :group 'net-utils 213 :group 'net-utils
214 :type '(repeat string)) 214 :type '(repeat string))
215 215
216 (defcustom smbclient-prompt-regexp "^smb: \>" 216 (defcustom smbclient-prompt-regexp "^smb: \>"
217 "Regexp which matches the smbclient program's prompt. 217 "Regexp which matches the smbclient program's prompt.
219 This variable is only used if the variable 219 This variable is only used if the variable
220 `comint-use-prompt-regexp' is non-nil." 220 `comint-use-prompt-regexp' is non-nil."
221 :group 'net-utils 221 :group 'net-utils
222 :type 'regexp) 222 :type 'regexp)
223 223
224 (defcustom dns-lookup-program "host" 224 (defcustom dns-lookup-program "host"
225 "Program to interactively query DNS information." 225 "Program to interactively query DNS information."
226 :group 'net-utils 226 :group 'net-utils
227 :type 'string 227 :type 'string)
228 ) 228
229 229 (defcustom dns-lookup-program-options nil
230 (defcustom dns-lookup-program-options nil 230 "Options for the dns-lookup program."
231 "List of options to pass to the dns-lookup program." 231 :group 'net-utils
232 :group 'net-utils 232 :type '(repeat string))
233 :type '(repeat string)
234 )
235 233
236 ;; Internal variables 234 ;; Internal variables
237 (defvar network-connection-service nil) 235 (defvar network-connection-service nil)
238 (defvar network-connection-host nil) 236 (defvar network-connection-host nil)
239 237
395 netstat-program 393 netstat-program
396 netstat-program-options)) 394 netstat-program-options))
397 395
398 ;;;###autoload 396 ;;;###autoload
399 (defun arp () 397 (defun arp ()
400 "Run the arp program." 398 "Run arp program."
401 (interactive) 399 (interactive)
402 (net-utils-run-program 400 (net-utils-run-program
403 "Arp" 401 "Arp"
404 (concat "** Arp ** " arp-program " ** ") 402 (concat "** Arp ** " arp-program " ** ")
405 arp-program 403 arp-program
406 arp-program-options)) 404 arp-program-options))
407 405
408 ;;;###autoload 406 ;;;###autoload
409 (defun route () 407 (defun route ()
410 "Run the route program." 408 "Run route program."
411 (interactive) 409 (interactive)
412 (net-utils-run-program 410 (net-utils-run-program
413 "Route" 411 "Route"
414 (concat "** Route ** " route-program " ** ") 412 (concat "** Route ** " route-program " ** ")
415 route-program 413 route-program