[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog net/net-utils.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog net/net-utils.el |
Date: |
Sat, 08 Aug 2009 18:26:39 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/08/08 18:26:39
Modified files:
lisp : ChangeLog
lisp/net : net-utils.el
Log message:
* net/net-utils.el (net-utils-font-lock-keywords): New var.
(nslookup-font-lock-keywords): Make it a variable.
(net-utils-mode): New mode for viewing diagnostic network output.
(net-utils-remove-ctrl-m-filter): Set inhibit-read-only.
(net-utils-run-simple): New function.
(ifconfig, iwconfig, netstat, arp, route): Use it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15907&r2=1.15908
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/net-utils.el?cvsroot=emacs&r1=1.37&r2=1.38
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15907
retrieving revision 1.15908
diff -u -b -r1.15907 -r1.15908
--- ChangeLog 8 Aug 2009 18:24:32 -0000 1.15907
+++ ChangeLog 8 Aug 2009 18:26:36 -0000 1.15908
@@ -1,3 +1,12 @@
+2009-08-08 Yoni Rabkin <address@hidden>
+
+ * net/net-utils.el (net-utils-font-lock-keywords): New var.
+ (nslookup-font-lock-keywords): Make it a variable.
+ (net-utils-mode): New mode for viewing diagnostic network output.
+ (net-utils-remove-ctrl-m-filter): Set inhibit-read-only.
+ (net-utils-run-simple): New function.
+ (ifconfig, iwconfig, netstat, arp, route): Use it.
+
2009-08-08 Dmitry Dzhus <address@hidden>
* progmodes/gdb-mi.el (gdb-read-memory-custom)
Index: net/net-utils.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/net-utils.el,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- net/net-utils.el 5 Jan 2009 03:22:45 -0000 1.37
+++ net/net-utils.el 8 Aug 2009 18:26:39 -0000 1.38
@@ -237,7 +237,7 @@
;; Nslookup goodies
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defconst nslookup-font-lock-keywords
+(defvar nslookup-font-lock-keywords
(list
(list "^[A-Za-z0-9 _]+:" 0 'font-lock-type-face)
(list "\\<\\(SOA\\|NS\\|MX\\|A\\|CNAME\\)\\>"
@@ -260,6 +260,36 @@
"Expressions to font-lock for nslookup.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; General network utilities mode
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defvar net-utils-font-lock-keywords
+ (list
+ ;; Dotted quads
+ (list
+ (mapconcat 'identity (make-list 4 "[0-9]+") "\\.")
+ 0 'font-lock-variable-name-face)
+ ;; Simple rfc4291 addresses
+ (list (concat
+ "\\( \\([[:xdigit:]]+\\(:\\|::\\)\\)+[[:xdigit:]]+\\)"
+ "\\|"
+ "\\(::[[:xdigit:]]+\\)")
+ 0 'font-lock-variable-name-face)
+ ;; Host names
+ (list
+ (let ((host-expression "[-A-Za-z0-9]+"))
+ (concat
+ (mapconcat 'identity (make-list 2 host-expression) "\\.")
+ "\\(\\." host-expression "\\)*"))
+ 0 'font-lock-variable-name-face))
+ "Expressions to font-lock for general network utilities.")
+
+(define-derived-mode net-utils-mode special-mode "NetworkUtil"
+ "Major mode for interacting with an external network utility."
+ (set (make-local-variable 'font-lock-defaults)
+ '((net-utils-font-lock-keywords))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Utility functions
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -288,7 +318,6 @@
(skip-chars-backward ":;.,!?" pt)
(point)))))
-
(defun net-utils-remove-ctrl-m-filter (process output-string)
"Remove trailing control Ms."
(let ((old-buffer (current-buffer))
@@ -296,6 +325,7 @@
(unwind-protect
(let ((moving))
(set-buffer (process-buffer process))
+ (let ((inhibit-read-only t))
(setq moving (= (point) (process-mark process)))
(while (string-match "\r" filtered-string)
@@ -306,7 +336,7 @@
;; Insert the text, moving the process-marker.
(goto-char (process-mark process))
(insert filtered-string)
- (set-marker (process-mark process) (point)))
+ (set-marker (process-mark process) (point))))
(if moving (goto-char (process-mark process))))
(set-buffer old-buffer))))
@@ -323,94 +353,106 @@
buf))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Wrappers for external network programs
+;; General network utilities (diagnostic)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;###autoload
-(defun traceroute (target)
- "Run traceroute program for TARGET."
- (interactive "sTarget: ")
- (let ((options
- (if traceroute-program-options
- (append traceroute-program-options (list target))
- (list target))))
- (net-utils-run-program
- (concat "Traceroute" " " target)
- (concat "** Traceroute ** " traceroute-program " ** " target)
- traceroute-program
- options)))
-
-;;;###autoload
-(defun ping (host)
- "Ping HOST.
-If your system's ping continues until interrupted, you can try setting
-`ping-program-options'."
- (interactive
- (list (read-from-minibuffer "Ping host: " (net-utils-machine-at-point))))
- (let ((options
- (if ping-program-options
- (append ping-program-options (list host))
- (list host))))
- (net-utils-run-program
- (concat "Ping" " " host)
- (concat "** Ping ** " ping-program " ** " host)
- ping-program
- options)))
+(defun net-utils-run-simple (buffer-name program-name args)
+ "Run a network utility for diagnostic output only."
+ (interactive)
+ (when (get-buffer buffer-name)
+ (kill-buffer buffer-name))
+ (get-buffer-create buffer-name)
+ (with-current-buffer buffer-name
+ (net-utils-mode)
+ (set-process-filter
+ (apply 'start-process (format "%s" program-name)
+ buffer-name program-name args)
+ 'net-utils-remove-ctrl-m-filter)
+ (goto-char (point-min)))
+ (display-buffer buffer-name))
;;;###autoload
(defun ifconfig ()
- "Run ifconfig program."
+ "Run ifconfig and display diagnostic output."
(interactive)
- (net-utils-run-program
- "Ifconfig"
- (concat "** Ifconfig ** " ifconfig-program " ** ")
+ (net-utils-run-simple
+ (format "*%s*" ifconfig-program)
ifconfig-program
ifconfig-program-options))
-;; Windows uses this name.
-;;;###autoload
(defalias 'ipconfig 'ifconfig)
;;;###autoload
(defun iwconfig ()
- "Run iwconfig program."
+ "Run iwconfig and display diagnostic output."
(interactive)
- (net-utils-run-program
- "Iwconfig"
- (concat "** Iwconfig ** " iwconfig-program " ** ")
+ (net-utils-run-simple
+ (format "*%s*" iwconfig-program)
iwconfig-program
iwconfig-program-options))
;;;###autoload
(defun netstat ()
- "Run netstat program."
+ "Run netstat and display diagnostic output."
(interactive)
- (net-utils-run-program
- "Netstat"
- (concat "** Netstat ** " netstat-program " ** ")
+ (net-utils-run-simple
+ (format "*%s*" netstat-program)
netstat-program
netstat-program-options))
;;;###autoload
(defun arp ()
- "Run arp program."
+ "Run arp and display diagnostic output."
(interactive)
- (net-utils-run-program
- "Arp"
- (concat "** Arp ** " arp-program " ** ")
+ (net-utils-run-simple
+ (format "*%s*" arp-program)
arp-program
arp-program-options))
;;;###autoload
(defun route ()
- "Run route program."
+ "Run route and display diagnostic output."
(interactive)
- (net-utils-run-program
- "Route"
- (concat "** Route ** " route-program " ** ")
+ (net-utils-run-simple
+ (format "*%s*" route-program)
route-program
route-program-options))
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Wrappers for external network programs
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;###autoload
+(defun traceroute (target)
+ "Run traceroute program for TARGET."
+ (interactive "sTarget: ")
+ (let ((options
+ (if traceroute-program-options
+ (append traceroute-program-options (list target))
+ (list target))))
+ (net-utils-run-program
+ (concat "Traceroute" " " target)
+ (concat "** Traceroute ** " traceroute-program " ** " target)
+ traceroute-program
+ options)))
+
+;;;###autoload
+(defun ping (host)
+ "Ping HOST.
+If your system's ping continues until interrupted, you can try setting
+`ping-program-options'."
+ (interactive
+ (list (read-from-minibuffer "Ping host: " (net-utils-machine-at-point))))
+ (let ((options
+ (if ping-program-options
+ (append ping-program-options (list host))
+ (list host))))
+ (net-utils-run-program
+ (concat "Ping" " " host)
+ (concat "** Ping ** " ping-program " ** " host)
+ ping-program
+ options)))
+
;; FIXME -- Needs to be a process filter
;; (defun netstat-with-filter (filter)
;; "Run netstat program."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog net/net-utils.el,
Chong Yidong <=