Commit fd6b829d authored by Noam Postavsky's avatar Noam Postavsky
Browse files

Improve ffap-gopher-at-point handling of long lines

* lisp/ffap.el (ffap-gopher-regexp): Only match the KEY part.  Note
setting to nil is now supported.
(ffap--gopher-var-on-line): New function.
(ffap-gopher-at-point): Use it instead of the old ffap-gopher-regexp
which could overflow the regexp stack on long lines (Bug#25391).  Use
`let-alist' instead of calling `set' on local variables.
* test/lisp/ffap-tests.el (ffap-gopher-at-point): New test.
parent af3db69e
......@@ -76,6 +76,7 @@
;; (setq ffap-machine-p-known 'accept) ; no pinging
;; (setq ffap-url-regexp nil) ; disable URL features in ffap
;; (setq ffap-shell-prompt-regexp nil) ; disable shell prompt stripping
;; (setq ffap-gopher-regexp nil) ; disable gopher bookmark matching
;; ffap uses `browse-url' (if found, else `w3-fetch') to fetch URL's.
;; For a hairier `ffap-url-fetcher', try ffap-url.el (same ftp site).
......@@ -1194,43 +1195,46 @@ Sets the variable `ffap-string-at-point-region' to the bounds of URL, if any."
(defvar ffap-gopher-regexp
"^.*\\<\\(Type\\|Name\\|Path\\|Host\\|Port\\) *= *\\(.*\\) *$"
"Regexp matching a line in a gopher bookmark (maybe indented).
The two subexpressions are the KEY and VALUE.")
"\\<\\(Type\\|Name\\|Path\\|Host\\|Port\\) *= *"
"Regexp matching a key in a gopher bookmark.
Set to nil to disable matching gopher bookmarks.")
(defun ffap--gopher-var-on-line ()
"Return (KEY . VALUE) of gopher bookmark on current line."
(let ((eol (progn (end-of-line) (skip-chars-backward " ") (point)))
(bol (progn (beginning-of-line) (point))))
(when (re-search-forward ffap-gopher-regexp eol t)
(let ((key (match-string 1))
(val (buffer-substring-no-properties (match-end 0) eol)))
(cons (intern (downcase key)) val))))))
(defun ffap-gopher-at-point ()
"If point is inside a gopher bookmark block, return its URL.
Sets the variable `ffap-string-at-point-region' to the bounds of URL, if any."
;; `gopher-parse-bookmark' from gopher.el is not so robust
(if (looking-at ffap-gopher-regexp)
(while (and (looking-at ffap-gopher-regexp) (not (bobp)))
(forward-line -1))
(or (looking-at ffap-gopher-regexp) (forward-line 1))
(setq ffap-string-at-point-region (list (point) (point)))
(let ((type "1") path host (port "70"))
(while (looking-at ffap-gopher-regexp)
(let ((var (intern
(buffer-substring (match-beginning 1)
(match-end 1)))))
(val (buffer-substring (match-beginning 2)
(match-end 2))))
(set var val)
(forward-line 1)))
(setcdr ffap-string-at-point-region (list (point)))
(if (and path (string-match "^ftp:.*@" path))
(concat "ftp://"
(substring path 4 (1- (match-end 0)))
(substring path (match-end 0)))
(and (= (length type) 1)
host;; (ffap-machine-p host)
(concat "gopher://" host
(if (equal port "70") "" (concat ":" port))
"/" type path))))))))
(when (stringp ffap-gopher-regexp)
(let* ((beg (progn (beginning-of-line)
(while (and (not (bobp)) (ffap--gopher-var-on-line))
(forward-line -1))
(bookmark (cl-loop for keyval = (ffap--gopher-var-on-line)
while keyval collect keyval
do (forward-line 1))))
(when bookmark
(setq ffap-string-at-point-region (list beg (point)))
(let-alist (nconc bookmark '((type . "1") (port . "70")))
(if (and .path (string-match "\\`ftp:.*@" .path))
(concat "ftp://"
(substring .path 4 (1- (match-end 0)))
(substring .path (match-end 0)))
(and (= (length .type) 1)
.host ;; (ffap-machine-p host)
(concat "gopher://" .host
(if (equal .port "70") "" (concat ":" .port))
"/" .type .path)))))))))
(defvar ffap-ftp-sans-slash-regexp
......@@ -49,6 +49,23 @@ index 3d7cebadcf..ad4b70d737 100644
(should (equal '(1 1) ffap-string-at-point-region)))))
(and (file-exists-p file) (delete-file file)))))
(ert-deftest ffap-gopher-at-point ()
(insert "\
Type = 1
Name = foo
Path = /the/path
Port = 7070
Host =\n")
(should-not (ffap-gopher-at-point))
(goto-char (point-min))
(should (equal (ffap-gopher-at-point)
(should (equal ffap-string-at-point-region
(list (point-min) (point-max))))
(let ((ffap-gopher-regexp nil))
(should-not (ffap-gopher-at-point)))))
(provide 'ffap-tests)
;;; ffap-tests.el ends here
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