X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnspool.el;h=35987277b3d312e5d04cb275ab0bc04d71153d52;hp=96f3df8dd4eff0a4390db8f05fc99d9af566ad39;hb=d51d408bc35fc5ac1e63f72fa911d7815b5e518a;hpb=43d0935ff93d3190a8d893bc07316b2bf5031e96 diff --git a/lisp/nnspool.el b/lisp/nnspool.el index 96f3df8dd..35987277b 100644 --- a/lisp/nnspool.el +++ b/lisp/nnspool.el @@ -1,16 +1,19 @@ ;;; nnspool.el --- spool access for GNU Emacs -;; Copyright (C) 1988,89,90,93,94,95 Free Software Foundation, Inc. + +;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA -;; Lars Magne Ingebrigtsen +;; Lars Magne Ingebrigtsen ;; Keywords: news ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; 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. +;; the Free Software Foundation, either version 3 of the License, 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 @@ -18,8 +21,7 @@ ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -27,46 +29,55 @@ (require 'nnheader) (require 'nntp) -(require 'timezone) +(require 'nnoo) +(eval-when-compile (require 'cl)) + +(nnoo-declare nnspool) -(defvar nnspool-inews-program news-inews-program +(defvoo nnspool-inews-program news-inews-program "Program to post news. This is most commonly `inews' or `injnews'.") -(defvar nnspool-inews-switches '("-h") +(defvoo nnspool-inews-switches '("-h" "-S") "Switches for nnspool-request-post to pass to `inews' for posting news. If you are using Cnews, you probably should set this variable to nil.") -(defvar nnspool-spool-directory news-path +(defvoo nnspool-spool-directory + (file-name-as-directory (if (boundp 'news-directory) + (symbol-value 'news-directory) + news-path)) "Local news spool directory.") -(defvar nnspool-nov-directory (concat nnspool-spool-directory "over.view/") +(defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/") "Local news nov directory.") -(defvar nnspool-lib-dir "/usr/lib/news/" +(defvoo nnspool-lib-dir + (if (file-exists-p "/usr/lib/news/active") + "/usr/lib/news/" + "/var/lib/news/") "Where the local news library files are stored.") -(defvar nnspool-active-file (concat nnspool-lib-dir "active") +(defvoo nnspool-active-file (concat nnspool-lib-dir "active") "Local news active file.") -(defvar nnspool-newsgroups-file (concat nnspool-lib-dir "newsgroups") +(defvoo nnspool-newsgroups-file (concat nnspool-lib-dir "newsgroups") "Local news newsgroups file.") -(defvar nnspool-distributions-file (concat nnspool-lib-dir "distributions") +(defvoo nnspool-distributions-file (concat nnspool-lib-dir "distribs.pat") "Local news distributions file.") -(defvar nnspool-history-file (concat nnspool-lib-dir "history") +(defvoo nnspool-history-file (concat nnspool-lib-dir "history") "Local news history file.") -(defvar nnspool-active-times-file (concat nnspool-lib-dir "active.times") +(defvoo nnspool-active-times-file (concat nnspool-lib-dir "active.times") "Local news active date file.") -(defvar nnspool-large-newsgroup 50 - "The number of the articles which indicates a large newsgroup. -If the number of the articles is greater than the value, verbose +(defvoo nnspool-large-newsgroup 50 + "The number of articles which indicates a large newsgroup. +If the number of articles is greater than the value, verbose messages will be shown to indicate the current status.") -(defvar nnspool-nov-is-evil nil +(defvoo nnspool-nov-is-evil nil "Non-nil means that nnspool will never return NOV lines instead of headers.") (defconst nnspool-sift-nov-with-sed nil @@ -74,424 +85,371 @@ messages will be shown to indicate the current status.") If nil, nnspool will load the entire file into a buffer and process it there.") +(defvoo nnspool-rejected-article-hook nil + "*A hook that will be run when an article has been rejected by the server.") + +(defvoo nnspool-file-coding-system nnheader-file-coding-system + "Coding system for nnspool.") + (defconst nnspool-version "nnspool 2.0" "Version numbers of this version of NNSPOOL.") -(defvar nnspool-current-directory nil +(defvoo nnspool-current-directory nil "Current news group directory.") -(defvar nnspool-current-group nil) -(defvar nnspool-status-string "") - - - -(defvar nnspool-current-server nil) -(defvar nnspool-server-alist nil) -(defvar nnspool-server-variables - (list - (list 'nnspool-inews-program nnspool-inews-program) - (list 'nnspool-inews-switches nnspool-inews-switches) - (list 'nnspool-spool-directory nnspool-spool-directory) - (list 'nnspool-nov-directory nnspool-nov-directory) - (list 'nnspool-lib-dir nnspool-lib-dir) - (list 'nnspool-active-file nnspool-active-file) - (list 'nnspool-newsgroups-file nnspool-newsgroups-file) - (list 'nnspool-distributions-file nnspool-distributions-file) - (list 'nnspool-history-file nnspool-history-file) - (list 'nnspool-active-times-file nnspool-active-times-file) - (list 'nnspool-large-newsgroup nnspool-large-newsgroup) - (list 'nnspool-nov-is-evil nnspool-nov-is-evil) - (list 'nnspool-sift-nov-with-sed nnspool-sift-nov-with-sed) - '(nnspool-current-directory nil) - '(nnspool-current-group nil) - '(nnspool-status-string ""))) +(defvoo nnspool-current-group nil) +(defvoo nnspool-status-string "") ;;; Interface functions. -(defun nnspool-retrieve-headers (sequence &optional newsgroup server) - "Retrieve the headers for the articles in SEQUENCE. -Newsgroup must be selected before calling this function." - (save-excursion - (set-buffer nntp-server-buffer) +(nnoo-define-basics nnspool) + +(deffoo nnspool-retrieve-headers (articles &optional group server fetch-old) + "Retrieve the headers of ARTICLES." + (with-current-buffer nntp-server-buffer (erase-buffer) - (let* ((number (length sequence)) - (count 0) - (do-message (and (numberp nnspool-large-newsgroup) - (> number nnspool-large-newsgroup))) - file beg article) - (if (not (nnspool-possibly-change-directory newsgroup)) - () - (if (and (numberp (car sequence)) - (nnspool-retrieve-headers-with-nov sequence)) + (when (nnspool-possibly-change-directory group) + (let* ((number (length articles)) + (count 0) + (default-directory nnspool-current-directory) + (do-message (and (numberp nnspool-large-newsgroup) + (> number nnspool-large-newsgroup))) + (nnheader-file-coding-system nnspool-file-coding-system) + file beg article ag) + (if (and (numberp (car articles)) + (nnspool-retrieve-headers-with-nov articles fetch-old)) + ;; We successfully retrieved the NOV headers. 'nov - (while sequence - (setq article (car sequence)) + ;; No NOV headers here, so we do it the hard way. + (while (setq article (pop articles)) (if (stringp article) - (progn - (setq file (nnspool-find-article-by-message-id article)) - (setq article 0)) - (setq file (concat nnspool-current-directory - (int-to-string article)))) - (and file (file-exists-p file) - (progn - (insert (format "221 %d Article retrieved.\n" article)) - (setq beg (point)) - (nnheader-insert-head file) - (goto-char beg) - (search-forward "\n\n" nil t) - (forward-char -1) - (insert ".\n") - (delete-region (point) (point-max)))) - (setq sequence (cdr sequence)) - - (and do-message - (zerop (% (setq count (1+ count)) 20)) - (message "NNSPOOL: Receiving headers... %d%%" - (/ (* count 100) number)))) - - (and do-message (message "NNSPOOL: Receiving headers...done")) - - ;; Fold continuation lines. - (goto-char (point-min)) - (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) - (replace-match " " t t)) - 'headers))))) - -(defun nnspool-open-server (server &optional defs) - (nnheader-init-server-buffer) - (if (equal server nnspool-current-server) - t - (if nnspool-current-server - (setq nnspool-server-alist - (cons (list nnspool-current-server - (nnheader-save-variables nnspool-server-variables)) - nnspool-server-alist))) - (let ((state (assoc server nnspool-server-alist))) - (if state - (progn - (nnheader-restore-variables (nth 1 state)) - (setq nnspool-server-alist (delq state nnspool-server-alist))) - (nnheader-set-init-variables nnspool-server-variables defs))) - (setq nnspool-current-server server))) + ;; This is a Message-ID. + (setq ag (nnspool-find-id article) + file (and ag (nnspool-article-pathname + (car ag) (cdr ag))) + article (cdr ag)) + ;; This is an article in the current group. + (setq file (int-to-string article))) + ;; Insert the head of the article. + (when (and file + (file-exists-p file)) + (insert "221 ") + (princ article (current-buffer)) + (insert " Article retrieved.\n") + (setq beg (point)) + (inline (nnheader-insert-head file)) + (goto-char beg) + (if (search-forward "\n\n" nil t) + (progn + (forward-char -1) + (insert ".\n")) + (goto-char (point-max)) + (if (bolp) + (insert ".\n") + (insert "\n.\n"))) + (delete-region (point) (point-max))) -(defun nnspool-close-server (&optional server) - t) + (and do-message + (zerop (% (incf count) 20)) + (nnheader-message 5 "nnspool: Receiving headers... %d%%" + (/ (* count 100) number)))) -(defun nnspool-server-opened (&optional server) - (and (equal server nnspool-current-server) - nntp-server-buffer - (buffer-name nntp-server-buffer))) + (when do-message + (nnheader-message 5 "nnspool: Receiving headers...done")) -(defun nnspool-status-message (&optional server) - "Return server status response as string." - nnspool-status-string) + ;; Fold continuation lines. + (nnheader-fold-continuation-lines) + 'headers))))) -(defun nnspool-request-article (id &optional newsgroup server buffer) +(deffoo nnspool-open-server (server &optional defs) + (nnoo-change-server 'nnspool server defs) + (cond + ((not (file-exists-p nnspool-spool-directory)) + (nnspool-close-server) + (nnheader-report 'nnspool "Spool directory doesn't exist: %s" + nnspool-spool-directory)) + ((not (file-directory-p + (directory-file-name + (file-truename nnspool-spool-directory)))) + (nnspool-close-server) + (nnheader-report 'nnspool "Not a directory: %s" nnspool-spool-directory)) + ((not (file-exists-p nnspool-active-file)) + (nnheader-report 'nnspool "The active file doesn't exist: %s" + nnspool-active-file)) + (t + (nnheader-report 'nnspool "Opened server %s using directory %s" + server nnspool-spool-directory) + t))) + +(deffoo nnspool-request-article (id &optional group server buffer) "Select article by message ID (or number)." - (nnspool-possibly-change-directory newsgroup) - (let ((file (if (stringp id) - (nnspool-find-article-by-message-id id) - (concat nnspool-current-directory (prin1-to-string id)))) - (nntp-server-buffer (or buffer nntp-server-buffer))) - (if (and (stringp file) - (file-exists-p file) - (not (file-directory-p file))) - (save-excursion - (nnspool-find-file file))))) - -(defun nnspool-request-body (id &optional newsgroup server) + (nnspool-possibly-change-directory group) + (let ((nntp-server-buffer (or buffer nntp-server-buffer)) + file ag) + (if (stringp id) + ;; This is a Message-ID. + (when (setq ag (nnspool-find-id id)) + (setq file (nnspool-article-pathname (car ag) (cdr ag)))) + (setq file (nnspool-article-pathname nnspool-current-group id))) + (and file + (file-exists-p file) + (not (file-directory-p file)) + (save-excursion (nnspool-find-file file)) + ;; We return the article number and group name. + (if (numberp id) + (cons nnspool-current-group id) + ag)))) + +(deffoo nnspool-request-body (id &optional group server) "Select article body by message ID (or number)." - (nnspool-possibly-change-directory newsgroup) - (if (nnspool-request-article id) - (save-excursion - (set-buffer nntp-server-buffer) + (nnspool-possibly-change-directory group) + (let ((res (nnspool-request-article id))) + (when res + (with-current-buffer nntp-server-buffer (goto-char (point-min)) - (if (search-forward "\n\n" nil t) - (delete-region (point-min) (point))) - t))) + (when (search-forward "\n\n" nil t) + (delete-region (point-min) (point))) + res)))) -(defun nnspool-request-head (id &optional newsgroup server) +(deffoo nnspool-request-head (id &optional group server) "Select article head by message ID (or number)." - (nnspool-possibly-change-directory newsgroup) - (if (nnspool-request-article id) - (save-excursion - (set-buffer nntp-server-buffer) + (nnspool-possibly-change-directory group) + (let ((res (nnspool-request-article id))) + (when res + (with-current-buffer nntp-server-buffer (goto-char (point-min)) - (if (search-forward "\n\n" nil t) - (delete-region (1- (point)) (point-max))) - t))) + (when (search-forward "\n\n" nil t) + (delete-region (1- (point)) (point-max))) + (nnheader-fold-continuation-lines))) + res)) -(defun nnspool-request-group (group &optional server dont-check) +(deffoo nnspool-request-group (group &optional server dont-check info) "Select news GROUP." - (let ((pathname (nnspool-article-pathname - (nnspool-replace-chars-in-string group ?. ?/))) + (let ((pathname (nnspool-article-pathname group)) dir) (if (not (file-directory-p pathname)) - (progn - (setq nnspool-status-string - "Invalid group name (no such directory)") - nil) + (nnheader-report + 'nnspool "Invalid group name (no such directory): %s" group) (setq nnspool-current-directory pathname) - (setq nnspool-status-string "") - (if (not dont-check) + (nnheader-report 'nnspool "Selected group %s" group) + (if dont-check (progn - (setq dir (directory-files pathname nil "^[0-9]+$" t)) - ;; yes, completely empty spool directories *are* possible - ;; Fix by Sudish Joseph - (and dir - (setq dir - (sort - (mapcar - (function - (lambda (name) - (string-to-int name))) - dir) - '<))) - (save-excursion - (set-buffer nntp-server-buffer) - (erase-buffer) - (if dir - (insert - (format "211 %d %d %d %s\n" (length dir) (car dir) - (progn (while (cdr dir) (setq dir (cdr dir))) - (car dir)) - group)) - (insert (format "211 0 0 0 %s\n" group)))))) - t))) - -(defun nnspool-close-group (group &optional server) + (nnheader-report 'nnspool "Selected group %s" group) + t) + ;; Yes, completely empty spool directories *are* possible. + ;; Fix by Sudish Joseph + (when (setq dir (directory-files pathname nil "^[0-9]+$" t)) + (setq dir (sort (mapcar 'string-to-number dir) '<))) + (if dir + (nnheader-insert + "211 %d %d %d %s\n" (length dir) (car dir) + (car (last dir)) group) + (nnheader-report 'nnspool "Empty group %s" group) + (nnheader-insert "211 0 0 0 %s\n" group)))))) + +(deffoo nnspool-request-type (group &optional article) + 'news) + +(deffoo nnspool-close-group (group &optional server) t) -(defun nnspool-request-list (&optional server) +(deffoo nnspool-request-list (&optional server) "List active newsgroups." (save-excursion - (nnspool-find-file nnspool-active-file))) + (or (nnspool-find-file nnspool-active-file) + (nnheader-report 'nnspool (nnheader-file-error nnspool-active-file))))) -(defun nnspool-request-list-newsgroups (&optional server) +(deffoo nnspool-request-list-newsgroups (&optional server) "List newsgroups (defined in NNTP2)." (save-excursion - (nnspool-find-file nnspool-newsgroups-file))) + (or (nnspool-find-file nnspool-newsgroups-file) + (nnheader-report 'nnspool (nnheader-file-error + nnspool-newsgroups-file))))) -(defun nnspool-request-list-distributions (&optional server) +(deffoo nnspool-request-list-distributions (&optional server) "List distributions (defined in NNTP2)." (save-excursion - (nnspool-find-file nnspool-distributions-file))) + (or (nnspool-find-file nnspool-distributions-file) + (nnheader-report 'nnspool (nnheader-file-error + nnspool-distributions-file))))) ;; Suggested by Hallvard B Furuseth . -(defun nnspool-request-newgroups (date &optional server) +(deffoo nnspool-request-newgroups (date &optional server) "List groups created after DATE." (if (nnspool-find-file nnspool-active-times-file) (save-excursion ;; Find the last valid line. (goto-char (point-max)) - (while (and (not (looking-at + (while (and (not (looking-at "\\([^ ]+\\) +\\([0-9]+\\)[0-9][0-9][0-9] ")) (zerop (forward-line -1)))) - (let ((seconds (nnspool-seconds-since-epoch date)) + ;; We require nnheader which requires gnus-util. + (let ((seconds (gnus-float-time (date-to-time date))) groups) ;; Go through lines and add the latest groups to a list. (while (and (looking-at "\\([^ ]+\\) +[0-9]+ ") (progn ;; We insert a .0 to make the list reader - ;; interpret the number as a float. It is far - ;; too big to be stored in a lisp integer. + ;; interpret the number as a float. It is far + ;; too big to be stored in a lisp integer. (goto-char (1- (match-end 0))) (insert ".0") (> (progn (goto-char (match-end 1)) (read (current-buffer))) seconds)) - (setq groups (cons (buffer-substring - (match-beginning 1) (match-end 1)) - groups)) + (push (buffer-substring + (match-beginning 1) (match-end 1)) + groups) (zerop (forward-line -1)))) (erase-buffer) - (while groups - (insert (car groups) " 0 0 y\n") - (setq groups (cdr groups)))) + (dolist (group groups) + (insert group " 0 0 y\n"))) t) nil)) -(defun nnspool-request-post (&optional server) +(deffoo nnspool-request-post (&optional server) "Post a new news in current buffer." (save-excursion (let* ((process-connection-type nil) ; t bugs out on Solaris (inews-buffer (generate-new-buffer " *nnspool post*")) - (proc (apply 'start-process "*nnspool inews*" inews-buffer - nnspool-inews-program nnspool-inews-switches))) - (set-process-sentinel proc 'nnspool-inews-sentinel) - (process-send-region proc (point-min) (point-max)) - ;; We slap a condition-case around this, because the process may - ;; have exited already... - (condition-case nil - (process-send-eof proc) - (error nil)) - t))) + (proc + (condition-case err + (apply 'start-process "*nnspool inews*" inews-buffer + nnspool-inews-program nnspool-inews-switches) + (error + (nnheader-report 'nnspool "inews error: %S" err))))) + (if (not proc) + ;; The inews program failed. + () + (nnheader-report 'nnspool "") + (set-process-sentinel proc 'nnspool-inews-sentinel) + (mm-with-unibyte-current-buffer + (process-send-region proc (point-min) (point-max))) + ;; We slap a condition-case around this, because the process may + ;; have exited already... + (ignore-errors + (process-send-eof proc)) + t)))) + + + +;;; Internal functions. (defun nnspool-inews-sentinel (proc status) - (save-excursion - (set-buffer (process-buffer proc)) + (with-current-buffer (process-buffer proc) (goto-char (point-min)) (if (or (zerop (buffer-size)) (search-forward "spooled" nil t)) (kill-buffer (current-buffer)) - ;; Make status message by unfolding lines. - (subst-char-in-region (point-min) (point-max) ?\n ?\\ 'noundo) - (setq nnspool-status-string (buffer-string)) - (message "nnspool: %s" nnspool-status-string) - ;(kill-buffer (current-buffer)) - ))) - -(defalias 'nnspool-request-post-buffer 'nntp-request-post-buffer) - - -;;; Internal functions. - -(defun nnspool-retrieve-headers-with-nov (articles) + ;; Make status message by folding lines. + (while (re-search-forward "[ \t\n]+" nil t) + (replace-match " " t t)) + (nnheader-report 'nnspool "%s" (buffer-string)) + (nnheader-message 5 "nnspool: %s" nnspool-status-string) + (ding) + (run-hooks 'nnspool-rejected-article-hook)))) + +(defun nnspool-retrieve-headers-with-nov (articles &optional fetch-old) (if (or gnus-nov-is-evil nnspool-nov-is-evil) nil - (let ((nov (concat (file-name-as-directory nnspool-nov-directory) - (nnspool-replace-chars-in-string - nnspool-current-group ?. ?/) - "/.overview")) - article) - (if (file-exists-p nov) - (save-excursion - (set-buffer nntp-server-buffer) - (erase-buffer) - (if nnspool-sift-nov-with-sed - (nnspool-sift-nov-with-sed articles nov) - (insert-file-contents nov) - ;; First we find the first wanted line. We issue a number - ;; of search-forwards - the first article we are lookign - ;; for may be expired, so we have to go on searching until - ;; we find one of the articles we want. - (while (and articles - (setq article (concat (int-to-string - (car articles)) "\t")) - (not (or (looking-at article) - (search-forward (concat "\n" article) - nil t)))) - (setq articles (cdr articles))) - (if (not articles) - () - (beginning-of-line) - (delete-region (point-min) (point)) - ;; Then we find the last wanted line. We go to the end - ;; of the buffer and search backward much the same way - ;; we did to find the first article. - ;; !!! Perhaps it would be better just to do a (last articles), - ;; and go forward successively over each line and - ;; compare to avoid this (reverse), like this: - ;; (while (and (>= last (read nntp-server-buffer))) - ;; (zerop (forward-line 1)))) - (setq articles (reverse articles)) - (goto-char (point-max)) - (while (and articles - (not (search-backward - (concat "\n" (int-to-string (car articles)) - "\t") nil t))) - (setq articles (cdr articles))) - (if articles - (progn - (forward-line 2) - (delete-region (point) (point-max))))) - (or articles (progn (erase-buffer) nil)))))))) + (let ((nov (nnheader-group-pathname + nnspool-current-group nnspool-nov-directory ".overview")) + (arts articles) + (nnheader-file-coding-system nnspool-file-coding-system) + last) + (if (not (file-exists-p nov)) + () + (with-current-buffer nntp-server-buffer + (erase-buffer) + (if nnspool-sift-nov-with-sed + (nnspool-sift-nov-with-sed articles nov) + (nnheader-insert-file-contents nov) + (if (and fetch-old + (not (numberp fetch-old))) + t ; We want all the headers. + (ignore-errors + ;; Delete unwanted NOV lines. + (nnheader-nov-delete-outside-range + (if fetch-old (max 1 (- (car articles) fetch-old)) + (car articles)) + (car (last articles))) + ;; If the buffer is empty, this wasn't very successful. + (unless (zerop (buffer-size)) + ;; We check what the last article number was. + ;; The NOV file may be out of sync with the articles + ;; in the group. + (forward-line -1) + (setq last (read (current-buffer))) + (if (= last (car articles)) + ;; Yup, it's all there. + t + ;; Perhaps not. We try to find the missing articles. + (while (and arts + (<= last (car arts))) + (pop arts)) + ;; The articles in `arts' are missing from the buffer. + (mapc 'nnspool-insert-nov-head arts) + t)))))))))) + +(defun nnspool-insert-nov-head (article) + "Read the head of ARTICLE, convert to NOV headers, and insert." + (save-excursion + (let ((cur (current-buffer)) + buf) + (setq buf (nnheader-set-temp-buffer " *nnspool head*")) + (when (nnheader-insert-head + (nnspool-article-pathname nnspool-current-group article)) + (nnheader-insert-article-line article) + (let ((headers (nnheader-parse-head))) + (set-buffer cur) + (goto-char (point-max)) + (nnheader-insert-nov headers))) + (kill-buffer buf)))) (defun nnspool-sift-nov-with-sed (articles file) (let ((first (car articles)) - (last (progn (while (cdr articles) (setq articles (cdr articles))) - (car articles)))) - (call-process "awk" nil t nil + (last (car (last articles)))) + (call-process "awk" nil t nil (format "BEGIN {firstmsg=%d; lastmsg=%d;}\n $1 >= firstmsg && $1 <= lastmsg {print;}" (1- first) (1+ last)) file))) -;; Fixed by fdc@cliwe.ping.de (Frank D. Cringle). -(defun nnspool-find-article-by-message-id (id) - "Return full pathname of an article identified by message-ID." - (save-excursion - (let ((buf (get-buffer-create " *nnspool work*"))) - (set-buffer buf) - (erase-buffer) - (call-process "grep" nil t nil id nnspool-history-file) - (goto-char (point-min)) - (if (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ \t\n]*\\)") - (concat nnspool-spool-directory - (nnspool-replace-chars-in-string - (buffer-substring (match-beginning 1) (match-end 1)) - ?. ?/)))))) +;; Fixed by fdc@cliwe.ping.de (Frank D. Cringle). +;; Find out what group an article identified by a Message-ID is in. +(defun nnspool-find-id (id) + (with-temp-buffer + (ignore-errors + (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file)) + (goto-char (point-min)) + (when (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ /\t\n]+\\)/\\([0-9]+\\)[ \t\n]") + (cons (match-string 1) (string-to-number (match-string 2)))))) (defun nnspool-find-file (file) "Insert FILE in server buffer safely." (set-buffer nntp-server-buffer) (erase-buffer) (condition-case () - (progn (insert-file-contents file) t) + (let ((coding-system-for-read nnspool-file-coding-system)) + (mm-insert-file-contents file) + t) (file-error nil))) -(defun nnspool-possibly-change-directory (newsgroup) - (if newsgroup - (let ((pathname (nnspool-article-pathname - (nnspool-replace-chars-in-string newsgroup ?. ?/)))) - (if (file-directory-p pathname) - (progn - (setq nnspool-current-directory pathname) - (setq nnspool-current-group newsgroup)) - (setq nnspool-status-string - (format "No such newsgroup: %s" newsgroup)) - nil)) - t)) - -(defun nnspool-article-pathname (group) - "Make pathname for GROUP." - (concat (file-name-as-directory nnspool-spool-directory) group "/")) - -(defun nnspool-replace-chars-in-string (string from to) - "Replace characters in STRING from FROM to TO." - (let ((string (substring string 0)) ;Copy string. - (len (length string)) - (idx 0)) - ;; Replace all occurrences of FROM with TO. - (while (< idx len) - (if (= (aref string idx) from) - (aset string idx to)) - (setq idx (1+ idx))) - string)) - -(defun nnspool-number-base-10 (num pos) - (if (<= pos 0) "" - (setcdr num (+ (* (% (car num) 10) 65536) (cdr num))) - (apply - 'concat - (reverse - (list - (char-to-string - (aref "0123456789" (% (cdr num) 10))) - (progn - (setcdr num (/ (cdr num) 10)) - (setcar num (/ (car num) 10)) - (nnspool-number-base-10 num (1- pos)))))))) - -(defun nnspool-seconds-since-epoch (date) - (let* ((tdate (mapcar (lambda (ti) (and ti (string-to-int ti))) - (timezone-parse-date date))) - (ttime (mapcar (lambda (ti) (and ti (string-to-int ti))) - (timezone-parse-time - (aref (timezone-parse-date date) 3)))) - (edate (mapcar (lambda (ti) (and ti (string-to-int ti))) - (timezone-parse-date "Jan 1 12:00:00 1970"))) - (tday (- (timezone-absolute-from-gregorian - (nth 1 tdate) (nth 2 tdate) (nth 0 tdate)) - (timezone-absolute-from-gregorian - (nth 1 edate) (nth 2 edate) (nth 0 edate))))) - (+ (nth 2 ttime) - (* (nth 1 ttime) 60) - (* 1.0 (nth 0 ttime) 60 60) - (* 1.0 tday 60 60 24)))) +(defun nnspool-possibly-change-directory (group) + (if (not group) + t + (let ((pathname (nnspool-article-pathname group))) + (if (file-directory-p pathname) + (setq nnspool-current-directory pathname + nnspool-current-group group) + (nnheader-report 'nnspool "No such newsgroup: %s" group))))) + +(defun nnspool-article-pathname (group &optional article) + "Find the file name for GROUP." + (nnheader-group-pathname group nnspool-spool-directory article)) (provide 'nnspool)