[Emacs-diffs] Changes to emacs/lisp/gnus/netrc.el [gnus-5_10-branch]

[Reiner Steib]

Index: emacs/lisp/gnus/netrc.el
diff -c emacs/lisp/gnus/netrc.el:1.1.2.1 emacs/lisp/gnus/netrc.el:removed
*** emacs/lisp/gnus/netrc.el:1.1.2.1    Thu Jul 22 16:45:51 2004
--- emacs/lisp/gnus/netrc.el    Tue Aug 17 09:46:49 2004
***************
*** 1,129 ****
- ;;; netrc.el --- .netrc parsing functionality
- ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
- ;;        Free Software Foundation, Inc.
- 
- ;; Author: Lars Magne Ingebrigtsen <address@hidden>
- ;; Modularizer: Ted Zlatanov <address@hidden>
- ;; Keywords: news
- 
- ;; This file is part of GNU Emacs.
- 
- ;; GNU Emacs is free software; you can redistribute it and/or modify
- ;; it under the terms of the GNU General Public License as published by
- ;; the Free Software Foundation; either version 2, or (at your option)
- ;; any later version.
- 
- ;; GNU Emacs is distributed in the hope that it will be useful,
- ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
- ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.        See the
- ;; GNU General Public License for more details.
- 
- ;; You should have received a copy of the GNU General Public License
- ;; along with GNU Emacs; see the file COPYING.  If not, write to the
- ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- ;; Boston, MA 02111-1307, USA.
- 
- ;;; Commentary:
- 
- ;; Just the .netrc parsing functionality, abstracted so other packages
- ;; besides Gnus can use it.
- 
- ;;; Code:
- 
- ;;;
- ;;; .netrc and .authinforc parsing
- ;;;
- 
- (eval-and-compile
-   (defalias 'netrc-point-at-eol
-     (if (fboundp 'point-at-eol)
-       'point-at-eol
-       'line-end-position)))
- 
- (defun netrc-parse (file)
-   "Parse FILE and return an list of all entries in the file."
-   (when (file-exists-p file)
-     (with-temp-buffer
-       (let ((tokens '("machine" "default" "login"
-                     "password" "account" "macdef" "force"
-                     "port"))
-           alist elem result pair)
-       (insert-file-contents file)
-       (goto-char (point-min))
-       ;; Go through the file, line by line.
-       (while (not (eobp))
-         (narrow-to-region (point) (netrc-point-at-eol))
-         ;; For each line, get the tokens and values.
-         (while (not (eobp))
-           (skip-chars-forward "\t ")
-           ;; Skip lines that begin with a "#".
-           (if (eq (char-after) ?#)
-               (goto-char (point-max))
-             (unless (eobp)
-               (setq elem
-                     (if (= (following-char) ?\")
-                         (read (current-buffer))
-                       (buffer-substring
-                        (point) (progn (skip-chars-forward "^\t ")
-                                       (point)))))
-               (cond
-                ((equal elem "macdef")
-                 ;; We skip past the macro definition.
-                 (widen)
-                 (while (and (zerop (forward-line 1))
-                             (looking-at "$")))
-                 (narrow-to-region (point) (point)))
-                ((member elem tokens)
-                 ;; Tokens that don't have a following value are ignored,
-                 ;; except "default".
-                 (when (and pair (or (cdr pair)
-                                     (equal (car pair) "default")))
-                   (push pair alist))
-                 (setq pair (list elem)))
-                (t
-                 ;; Values that haven't got a preceding token are ignored.
-                 (when pair
-                   (setcdr pair elem)
-                   (push pair alist)
-                   (setq pair nil)))))))
-         (when alist
-           (push (nreverse alist) result))
-         (setq alist nil
-               pair nil)
-         (widen)
-         (forward-line 1))
-       (nreverse result)))))
- 
- (defun netrc-machine (list machine &optional port defaultport)
-   "Return the netrc values from LIST for MACHINE or for the default entry.
- If PORT specified, only return entries with matching port tokens.
- Entries without port tokens default to DEFAULTPORT."
-   (let ((rest list)
-       result)
-     (while list
-       (when (equal (cdr (assoc "machine" (car list))) machine)
-       (push (car list) result))
-       (pop list))
-     (unless result
-       ;; No machine name matches, so we look for default entries.
-       (while rest
-       (when (assoc "default" (car rest))
-         (push (car rest) result))
-       (pop rest)))
-     (when result
-       (setq result (nreverse result))
-       (while (and result
-                 (not (equal (or port defaultport "nntp")
-                             (or (netrc-get (car result) "port")
-                                 defaultport "nntp"))))
-       (pop result))
-       (car result))))
- 
- (defun netrc-get (alist type)
-   "Return the value of token TYPE from ALIST."
-   (cdr (assoc type alist)))
- 
- (provide 'netrc)
- 
- ;;; arch-tag: af9929cc-2d12-482f-936e-eb4366f9fa55
- ;;; netrc.el ends here
--- 0 ----