1 WARNING: Run the following script before configure:
9 Vsevolod Volkov <vvv@mutt.org.ua>
12 diff -udprP mutt-1.5.16.orig/ChangeLog.nntp mutt-1.5.16/ChangeLog.nntp
13 --- mutt-1.5.16.orig/ChangeLog.nntp 1970-01-01 03:00:00.000000000 +0300
14 +++ mutt-1.5.16/ChangeLog.nntp 2007-06-15 17:14:18.000000000 +0300
16 +* Fri Jun 15 2007 Vsevolod Volkov <vvv@mutt.org.ua>
17 +- fixed error selecting news group
19 +* Tue Jun 12 2007 Vsevolod Volkov <vvv@mutt.org.ua>
22 +* Wed Apr 11 2007 Vsevolod Volkov <vvv@mutt.org.ua>
23 +- fixed posting error if $smtp_url is set
24 +- added support of print-style sequence %R (x-comment-to)
26 +* Sun Apr 8 2007 Vsevolod Volkov <vvv@mutt.org.ua>
28 +- nntp://... url changed to news://...
29 +- added indicator of fetching descriptions progress
31 +* Tue Feb 28 2007 Vsevolod Volkov <vvv@mutt.org.ua>
34 +* Tue Aug 15 2006 Vsevolod Volkov <vvv@mutt.org.ua>
37 +* Mon Jul 17 2006 Vsevolod Volkov <vvv@mutt.org.ua>
39 +- fixed reading empty .newsrc
41 +* Sat Sep 17 2005 Vsevolod Volkov <vvv@mutt.org.ua>
44 +* Sat Aug 13 2005 Vsevolod Volkov <vvv@mutt.org.ua>
47 +* Sun Mar 13 2005 Vsevolod Volkov <vvv@mutt.org.ua>
50 +* Sun Feb 13 2005 Vsevolod Volkov <vvv@mutt.org.ua>
53 +* Sat Feb 5 2005 Vsevolod Volkov <vvv@mutt.org.ua>
55 +- function mutt_update_list_file() moved to newsrc.c and changed algorithm
57 +* Thu Jul 8 2004 Vsevolod Volkov <vvv@mutt.org.ua>
58 +- fixed error in nntp_logout_all()
60 +* Sat Apr 3 2004 Vsevolod Volkov <vvv@mutt.org.ua>
61 +- fixed debug output in mutt_newsrc_update()
62 +- added optional support of LISTGROUP command
63 +- fixed typo in nntp_parse_xref()
65 +* Tue Feb 3 2004 Vsevolod Volkov <vvv@mutt.org.ua>
68 +* Thu Dec 18 2003 Vsevolod Volkov <vvv@mutt.org.ua>
71 +* Thu Nov 6 2003 Vsevolod Volkov <vvv@mutt.org.ua>
74 +* Wed Nov 5 2003 Vsevolod Volkov <vvv@mutt.org.ua>
76 +- added space after newsgroup name in .newsrc file
78 +* Sun May 18 2003 Vsevolod Volkov <vvv@mutt.org.ua>
79 +- nntp patch: fixed SIGSEGV when posting article
81 +* Sat Mar 22 2003 Vsevolod Volkov <vvv@mutt.org.ua>
84 +* Sat Dec 21 2002 Vsevolod Volkov <vvv@mutt.org.ua>
86 +- replace safe_free calls by the FREE macro
88 +* Fri Dec 6 2002 Vsevolod Volkov <vvv@mutt.org.ua>
90 +- nntp authentication can be passed after any command
92 +* Sat May 4 2002 Vsevolod Volkov <vvv@mutt.org.ua>
95 +* Thu May 2 2002 Vsevolod Volkov <vvv@mutt.org.ua>
98 +* Wed Mar 13 2002 Vsevolod Volkov <vvv@mutt.org.ua>
100 +- fixed SIGSEGV in <get-message>, <get-parent>, <get-children>,
101 + <reconstruct-thread> functions
102 +- fixed message about nntp reconnect
103 +- fixed <attach-news-message> function using browser
104 +- added support of Followup-To: poster
105 +- added %n (new articles) in group_index_format
106 +- posting articles without inews by default
108 +* Wed Jan 23 2002 Vsevolod Volkov <vvv@mutt.org.ua>
111 +* Fri Jan 18 2002 Vsevolod Volkov <vvv@mutt.org.ua>
114 +* Thu Jan 3 2002 Vsevolod Volkov <vvv@mutt.org.ua>
116 +- accelerated speed of access to news->newsgroups hash (by <gul@gul.kiev.ua>)
117 +- added default content disposition
119 +* Mon Dec 3 2001 Vsevolod Volkov <vvv@mutt.org.ua>
122 +* Fri Nov 9 2001 Vsevolod Volkov <vvv@mutt.org.ua>
123 +- update to 1.3.23.2
124 +- fixed segfault if mutt_conn_find() returns null
126 +* Wed Oct 31 2001 Vsevolod Volkov <vvv@mutt.org.ua>
127 +- update to 1.3.23.1
128 +- added support of LISTGROUP command
129 +- added support for servers with broken overview
130 +- disabled <flag-message> function on news server
131 +- fixed error storing bad authentication information
133 +* Wed Oct 10 2001 Vsevolod Volkov <vvv@mutt.org.ua>
135 +- fixed typo in buffy.c
136 +- added substitution of %s parameter in $inews variable
138 +* Fri Aug 31 2001 Vsevolod Volkov <vvv@mutt.org.ua>
139 +- update to 1.3.22.1
142 +* Thu Aug 23 2001 Vsevolod Volkov <vvv@mutt.org.ua>
145 +* Wed Jul 25 2001 Vsevolod Volkov <vvv@mutt.org.ua>
147 +- removed 'server-hook', use 'account-hook' instead
148 +- fixed error opening NNTP server without newsgroup using -f option
150 +* Fri Jun 8 2001 Vsevolod Volkov <vvv@mutt.org.ua>
153 +* Sat May 5 2001 Vsevolod Volkov <vvv@mutt.org.ua>
155 +- fixed typo in nntp_attempt_features()
156 +- changed algorithm of XGTITLE command testing
157 +- disabled writing of NNTP password in debug file
158 +- fixed reading and writing of long newsrc lines
159 +- changed checking of last line while reading lines from server
160 +- fixed possible buffer overrun in nntp_parse_newsrc_line()
161 +- removed checking of XHDR command
162 +- compare NNTP return codes without trailing space
164 +* Thu Mar 29 2001 Vsevolod Volkov <vvv@mutt.org.ua>
166 +- support for 'LIST NEWSGROUPS' command to read descriptions
168 +* Fri Mar 2 2001 Vsevolod Volkov <vvv@mutt.org.ua>
171 +* Wed Feb 14 2001 Vsevolod Volkov <vvv@mutt.org.ua>
174 +* Sun Jan 28 2001 Vsevolod Volkov <vvv@mutt.org.ua>
176 +- show number of tagged messages patch from Felix von Leitner <leitner@fefe.de>
178 +* Sun Dec 31 2000 Vsevolod Volkov <vvv@mutt.org.ua>
181 +* Sat Dec 30 2000 Vsevolod Volkov <vvv@mutt.org.ua>
182 +- Fixed problem if last article in group is deleted
184 +* Fri Dec 22 2000 Vsevolod Volkov <vvv@mutt.org.ua>
185 +- Fixed checking of XGTITLE command on some servers
187 +* Mon Dec 18 2000 Vsevolod Volkov <vvv@mutt.org.ua>
188 +- Added \r in AUTHINFO commands
190 +* Mon Nov 27 2000 Vsevolod Volkov <vvv@mutt.org.ua>
193 +* Wed Nov 1 2000 Vsevolod Volkov <vvv@mutt.org.ua>
195 +- fixed error opening newsgroup from mutt started with -g or -G
197 +* Thu Oct 12 2000 Vsevolod Volkov <vvv@mutt.org.ua>
199 +- hotkey 'G' (get-message) replaced with '^G'
201 +* Thu Sep 21 2000 Vsevolod Volkov <vvv@mutt.org.ua>
203 +- changed delay displaying error messages from 1 to 2 seconds
204 +- fixed error compiling with nntp and without imap
206 +* Wed Sep 6 2000 Vsevolod Volkov <vvv@mutt.org.ua>
207 +- fixed catchup in index
208 +- fixed nntp_open_mailbox()
210 +* Sat Sep 2 2000 Vsevolod Volkov <vvv@mutt.org.ua>
211 +- functions <edit> and <delete-entry> disabled
212 +- format of news mailbox names changed to url form
213 +- option nntp_attempts removed
214 +- option reconnect_news renamed to nntp_reconnect
215 +- default value of nntp_poll changed from 30 to 60
216 +- error handling improved
218 +* Wed Aug 30 2000 Vsevolod Volkov <vvv@mutt.org.ua>
220 +- new option show_only_unread
221 +- add newsgroup completion
223 +* Fri Aug 4 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
226 +* Sat Jul 29 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
229 +* Sun Jul 9 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
231 +- authentication code update
232 +- fix for changing to newsgroup from mailbox with read messages
233 +- socket code optimization
235 +* Wed Jun 21 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
238 +* Wed Jun 14 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
239 +- don't substitute current newsgroup with deleted new messages
241 +* Mon Jun 12 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
243 +- fix for substitution of newsgroup after reconnection
244 +- fix for loading newsgroups with very long names
245 +- fix for loading more than 32768 newsgroups
247 +* Wed May 24 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
250 +* Sat May 20 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
253 +* Fri May 12 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
256 +* Thu May 11 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
259 +* Thu May 4 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
262 +* Sun Apr 23 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
265 +* Fri Apr 7 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
266 +- add substitution of newsgroup with new messages by default
268 +* Wed Apr 5 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
269 +- add attach message from newsgroup
270 +- add one-line help in newsreader mode
271 +- disable 'change-dir' command in newsgroups browser
274 +* Tue Apr 4 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
275 +- get default newsserver name from file /etc/nntpserver
276 +- use case insensitive server names
277 +- add print-style sequence %s to $newsrc
280 +* Sat Apr 1 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
281 +- remove 'X-FTN-Origin' header processing
283 +* Thu Mar 30 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
287 +* Thu Mar 23 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
288 +- fix mutt_select_newsserver()
289 +- remove 'toggle-mode' function
290 +- add 'change-newsgroup' function
292 +* Wed Mar 22 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
295 +* Tue Mar 21 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
296 +- fix error 'bounce' function after 'post'
297 +- add 'forward to newsgroup' function
299 +* Mon Mar 20 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
300 +- 'forward' function works in newsreader mode
301 +- add 'post' and 'followup' functions to pager and attachment menu
302 +- fix active descriptions and allowed flag reload
304 +* Tue Mar 14 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
306 +- remove deleted newsgroups from list
308 +* Mon Mar 13 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
309 +- update .newsrc in browser
311 +* Sun Mar 12 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
312 +- reload .newsrc if externally modified
313 +- fix active cache update
315 +* Sun Mar 5 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
318 +* Sat Mar 4 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
319 +- patch *.update_list_file is not required
320 +- count lines when loading descriptions
321 +- remove cache of unsubscribed newsgroups
323 +* Thu Mar 2 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
324 +- load list of newsgroups from cache faster
326 +* Wed Mar 1 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
329 +* Tue Feb 29 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
330 +- fix unread messages in browser
331 +- fix newsrc_gen_entries()
333 +* Mon Feb 28 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
334 +- fix mutt_newsgroup_stat()
335 +- fix nntp_delete_cache()
336 +- fix nntp_get_status()
337 +- fix check_children()
338 +- fix nntp_fetch_headers()
340 +* Fri Feb 25 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
343 +* Thu Feb 24 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
344 +- fix updating new messages in cache
346 +* Mon Feb 21 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
347 +- change default cache filenames
348 +- fix updating new messages in cache
350 +* Fri Feb 18 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
351 +- fix segmentation fault in news groups browser
353 +* Tue Feb 15 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
356 +* Thu Feb 10 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
359 +* Sun Jan 30 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
360 +- add X-Comment-To editing
361 +- add my_hdr support for Newsgroups:, Followup-To: and X-Comment-To: headers
362 +- add variables $ask_followup_to and $ask_x_comment_to
364 +* Fri Jan 28 2000 Vsevolod Volkov <vvv@mutt.kiev.ua>
366 diff -udprP mutt-1.5.16.orig/Makefile.am mutt-1.5.16/Makefile.am
367 --- mutt-1.5.16.orig/Makefile.am 2007-06-04 07:20:01.000000000 +0300
368 +++ mutt-1.5.16/Makefile.am 2007-06-15 17:12:26.000000000 +0300
369 @@ -62,6 +62,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu
370 smtp.c browser.h mbyte.h remailer.h url.h \
371 crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
372 pgppacket.c mutt_idna.h hcache.h hcache.c bcache.c bcache.h mutt_ssl_gnutls.c \
374 crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c \
377 @@ -73,6 +74,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O
378 mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
379 mx.h pager.h pgp.h pop.h protos.h rfc1524.h rfc2047.h \
380 rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION prepare \
381 + nntp.h ChangeLog.nntp \
382 _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
383 mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttrc.head Muttrc \
384 makedoc.c makedoc-defs.h stamp-doc-rc README.SSL smime.h \
385 diff -udprP mutt-1.5.16.orig/Makefile.in mutt-1.5.16/Makefile.in
386 --- mutt-1.5.16.orig/Makefile.in 2007-06-10 05:43:26.000000000 +0300
387 +++ mutt-1.5.16/Makefile.in 2007-06-15 17:12:26.000000000 +0300
388 @@ -331,6 +331,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu
389 smtp.c browser.h mbyte.h remailer.h url.h \
390 crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \
391 pgppacket.c mutt_idna.h hcache.h hcache.c bcache.c bcache.h mutt_ssl_gnutls.c \
393 crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c \
396 @@ -342,6 +343,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O
397 mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
398 mx.h pager.h pgp.h pop.h protos.h rfc1524.h rfc2047.h \
399 rfc2231.h rfc822.h rfc3676.h sha1.h sort.h mime.types VERSION prepare \
400 + nntp.h ChangeLog.nntp \
401 _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h \
402 mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttrc.head Muttrc \
403 makedoc.c makedoc-defs.h stamp-doc-rc README.SSL smime.h \
404 @@ -557,6 +559,8 @@ distclean-compile:
405 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mutt_tunnel.Po@am__quote@
406 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/muttlib.Po@am__quote@
407 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mx.Po@am__quote@
408 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newsrc.Po@am__quote@
409 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nntp.Po@am__quote@
410 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pager.Po@am__quote@
411 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@
412 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patchlist.Po@am__quote@
413 diff -udprP mutt-1.5.16.orig/Muttrc mutt-1.5.16/Muttrc
414 --- mutt-1.5.16.orig/Muttrc 2007-06-10 06:29:25.000000000 +0300
415 +++ mutt-1.5.16/Muttrc 2007-06-15 17:12:26.000000000 +0300
416 @@ -266,6 +266,28 @@ attachments -I message/external-body
420 +# set ask_follow_up=no
422 +# Name: ask_follow_up
427 +# If set, Mutt will prompt you for follow-up groups before editing
428 +# the body of an outgoing message.
431 +# set ask_x_comment_to=no
433 +# Name: ask_x_comment_to
438 +# If set, Mutt will prompt you for x-comment-to field before editing
439 +# the body of an outgoing message.
442 # set attach_format="%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] "
444 # Name: attach_format
445 @@ -433,6 +455,17 @@ attachments -I message/external-body
446 # access time when checking for new mail.
449 +# set catchup_newsgroup=ask-yes
451 +# Name: catchup_newsgroup
456 +# If this variable is set, Mutt will mark all articles in newsgroup
457 +# as read when you quit the newsgroup (catchup newsgroup).
463 @@ -930,6 +963,19 @@ attachments -I message/external-body
464 # of the same email for you.
467 +# set followup_to_poster=ask-yes
469 +# Name: followup_to_poster
474 +# If this variable is set and the keyword "poster" is present in
475 +# Followup-To header, follow-up to newsgroup function is not
476 +# permitted. The message will be mailed to the submitter of the
483 @@ -1027,6 +1073,28 @@ attachments -I message/external-body
484 # "Franklin" to "Franklin, Steve".
487 +# set group_index_format="%4C %M%N %5s %-45.45f %d"
489 +# Name: group_index_format
491 +# Default: "%4C %M%N %5s %-45.45f %d"
494 +# This variable allows you to customize the newsgroup browser display to
495 +# your personal taste. This string is similar to ``index_format'', but
496 +# has its own set of printf()-like sequences:
498 +# %C current newsgroup number
499 +# %d description of newsgroup (becomes from server)
501 +# %M - if newsgroup not allowed for direct post (moderated for example)
502 +# %N N if newsgroup is new, u if unsubscribed, blank otherwise
503 +# %n number of new articles in newsgroup
504 +# %s number of unread articles in newsgroup
505 +# %>X right justify the rest of the string and pad with character "X"
506 +# %|X pad to the end of the line with character "X"
512 @@ -1472,6 +1540,7 @@ attachments -I message/external-body
513 # %E number of messages in current thread
514 # %f entire From: line (address + real name)
515 # %F author name, or recipient name if the message is from you
516 +# %g newsgroup name (if compiled with nntp support)
517 # %H spam attribute(s) of this message
518 # %i message-id of the current message
519 # %l number of lines in the message (does not work with maildir,
520 @@ -1486,12 +1555,14 @@ attachments -I message/external-body
521 # %O (_O_riginal save folder) Where mutt would formerly have
522 # stashed the message: list name or recipient name if no list
523 # %P progress indicator for the builtin pager (how much of the file has been displayed)
524 +# %R `x-comment-to:' field (if present and compiled with nntp support)
525 # %s subject of the message
526 # %S status of the message (N/D/d/!/r/*)
527 # %t `to:' field (recipients)
528 # %T the appropriate character from the $to_chars string
529 # %u user (login) name of the author
530 # %v first name of the author, or the recipient if the message is from you
531 +# %W name of organization of author (`organization:' field)
532 # %X number of attachments
533 # (please see the ``attachments'' section for possible speed effects)
534 # %y `x-label:' field, if present
535 @@ -1517,6 +1588,22 @@ attachments -I message/external-body
536 # See also: ``$to_chars''.
546 +# If set, specifies the program and arguments used to deliver news posted
547 +# by Mutt. Otherwise, mutt posts article using current connection to
548 +# news server. The following printf-style sequence is understood:
550 +# %s newsserver name
552 +# Example: set inews="/usr/local/bin/inews -hS"
555 # set ispell="ispell"
558 @@ -1860,6 +1947,18 @@ attachments -I message/external-body
559 # be attached to the newly composed message if this option is set.
562 +# set mime_subject=yes
564 +# Name: mime_subject
569 +# If unset, 8-bit ``subject:'' line in article header will not be
570 +# encoded according to RFC2047 to base64. This is useful when message
571 +# is Usenet article, because MIME for news is nonstandard feature.
574 # set mix_entry_format="%4n %c %-16s %a"
576 # Name: mix_entry_format
577 @@ -1964,6 +2063,118 @@ attachments -I message/external-body
578 # See also ``$read_inc'' and ``$write_inc''.
581 +# set news_cache_dir="~/.mutt"
583 +# Name: news_cache_dir
585 +# Default: "~/.mutt"
588 +# This variable pointing to directory where Mutt will save cached news
589 +# articles headers in. If unset, headers will not be saved at all
590 +# and will be reloaded each time when you enter to newsgroup.
593 +# set news_server=""
600 +# This variable specifies domain name or address of NNTP server. It
601 +# defaults to the newsserver specified in the environment variable
602 +# $NNTPSERVER or contained in the file /etc/nntpserver. You can also
603 +# specify username and an alternative port for each newsserver, ie:
605 +# [news[s]://][username[:password]@]newsserver[:port]
608 +# set newsrc="~/.newsrc"
612 +# Default: "~/.newsrc"
615 +# The file, containing info about subscribed newsgroups - names and
616 +# indexes of read articles. The following printf-style sequence
619 +# %s newsserver name
622 +# set nntp_context=1000
624 +# Name: nntp_context
629 +# This variable defines number of articles which will be in index when
630 +# newsgroup entered. If active newsgroup have more articles than this
631 +# number, oldest articles will be ignored. Also controls how many
632 +# articles headers will be saved in cache when you quit newsgroup.
635 +# set nntp_load_description=yes
637 +# Name: nntp_load_description
642 +# This variable controls whether or not descriptions for each newsgroup
643 +# must be loaded when newsgroup is added to list (first time list
644 +# loading or new newsgroup adding).
654 +# Your login name on the NNTP server. If unset and NNTP server requires
655 +# authentification, Mutt will prompt you for your account name when you
656 +# connect to newsserver.
666 +# Your password for NNTP account.
676 +# The time in seconds until any operations on newsgroup except post new
677 +# article will cause recheck for new news. If set to 0, Mutt will
678 +# recheck newsgroup on each operation in index (stepping, read article,
682 +# set nntp_reconnect=ask-yes
684 +# Name: nntp_reconnect
689 +# Controls whether or not Mutt will try to reconnect to newsserver when
693 # set pager="builtin"
696 @@ -3167,6 +3378,19 @@ attachments -I message/external-body
697 # string after the inclusion of a message which is being replied to.
700 +# set post_moderated=ask-yes
702 +# Name: post_moderated
707 +# If set to yes, Mutt will post article to newsgroup that have
708 +# not permissions to posting (e.g. moderated). Note: if newsserver
709 +# does not support posting to that newsgroup or totally read-only, that
710 +# posting will not have an effect.
713 # set postpone=ask-yes
716 @@ -3692,6 +3916,41 @@ attachments -I message/external-body
717 # shell from /etc/passwd is used.
720 +# set save_unsubscribed=no
722 +# Name: save_unsubscribed
727 +# When set, info about unsubscribed newsgroups will be saved into
728 +# ``newsrc'' file and into cache.
731 +# set show_new_news=yes
733 +# Name: show_new_news
738 +# If set, newsserver will be asked for new newsgroups on entering
739 +# the browser. Otherwise, it will be done only once for a newsserver.
740 +# Also controls whether or not number of new articles of subscribed
741 +# newsgroups will be then checked.
744 +# set show_only_unread=no
746 +# Name: show_only_unread
751 +# If set, only subscribed newsgroups that contain unread articles
752 +# will be displayed in browser.
758 @@ -4405,3 +4664,14 @@ attachments -I message/external-body
762 +# set x_comment_to=no
764 +# Name: x_comment_to
769 +# If set, Mutt will add ``X-Comment-To:'' field (that contains full
770 +# name of original article author) to article that followuped to newsgroup.
773 diff -udprP mutt-1.5.16.orig/OPS mutt-1.5.16/OPS
774 --- mutt-1.5.16.orig/OPS 2007-05-14 20:09:59.000000000 +0300
775 +++ mutt-1.5.16/OPS 2007-06-15 17:12:26.000000000 +0300
776 @@ -8,14 +8,16 @@ OP_BOUNCE_MESSAGE "remail a message to a
777 OP_BROWSER_NEW_FILE "select a new file in this directory"
778 OP_BROWSER_VIEW_FILE "view file"
779 OP_BROWSER_TELL "display the currently selected file's name"
780 -OP_BROWSER_SUBSCRIBE "subscribe to current mailbox (IMAP only)"
781 -OP_BROWSER_UNSUBSCRIBE "unsubscribe from current mailbox (IMAP only)"
782 +OP_BROWSER_SUBSCRIBE "subscribe to current mbox (IMAP/NNTP only)"
783 +OP_BROWSER_UNSUBSCRIBE "unsubscribe from current mbox (IMAP/NNTP only)"
784 OP_BROWSER_TOGGLE_LSUB "toggle view all/subscribed mailboxes (IMAP only)"
785 OP_BUFFY_LIST "list mailboxes with new mail"
786 +OP_CATCHUP "mark all articles in newsgroup as read"
787 OP_CHANGE_DIRECTORY "change directories"
788 OP_CHECK_NEW "check mailboxes for new mail"
789 OP_COMPOSE_ATTACH_FILE "attach file(s) to this message"
790 OP_COMPOSE_ATTACH_MESSAGE "attach message(s) to this message"
791 +OP_COMPOSE_ATTACH_NEWS_MESSAGE "attach newsmessage(s) to this message"
792 OP_COMPOSE_EDIT_BCC "edit the BCC list"
793 OP_COMPOSE_EDIT_CC "edit the CC list"
794 OP_COMPOSE_EDIT_DESCRIPTION "edit attachment description"
795 @@ -26,7 +28,10 @@ OP_COMPOSE_EDIT_FROM "edit the from fiel
796 OP_COMPOSE_EDIT_HEADERS "edit the message with headers"
797 OP_COMPOSE_EDIT_MESSAGE "edit the message"
798 OP_COMPOSE_EDIT_MIME "edit attachment using mailcap entry"
799 +OP_COMPOSE_EDIT_NEWSGROUPS "edit the newsgroups list"
800 OP_COMPOSE_EDIT_REPLY_TO "edit the Reply-To field"
801 +OP_COMPOSE_EDIT_FOLLOWUP_TO "edit the Followup-To field"
802 +OP_COMPOSE_EDIT_X_COMMENT_TO "edit the X-Comment-To field"
803 OP_COMPOSE_EDIT_SUBJECT "edit the subject of this message"
804 OP_COMPOSE_EDIT_TO "edit the TO list"
805 OP_CREATE_MAILBOX "create a new mailbox (IMAP only)"
806 @@ -85,8 +90,13 @@ OP_EXIT "exit this menu"
807 OP_FILTER "filter attachment through a shell command"
808 OP_FIRST_ENTRY "move to the first entry"
809 OP_FLAG_MESSAGE "toggle a message's 'important' flag"
810 +OP_FOLLOWUP "followup to newsgroup"
811 +OP_FORWARD_TO_GROUP "forward to newsgroup"
812 OP_FORWARD_MESSAGE "forward a message with comments"
813 OP_GENERIC_SELECT_ENTRY "select the current entry"
814 +OP_GET_CHILDREN "get all children of the current message"
815 +OP_GET_MESSAGE "get message with Message-Id"
816 +OP_GET_PARENT "get parent of the current message"
817 OP_GROUP_REPLY "reply to all recipients"
818 OP_HALF_DOWN "scroll down 1/2 page"
819 OP_HALF_UP "scroll up 1/2 page"
820 @@ -94,11 +104,14 @@ OP_HELP "this screen"
821 OP_JUMP "jump to an index number"
822 OP_LAST_ENTRY "move to the last entry"
823 OP_LIST_REPLY "reply to specified mailing list"
824 +OP_LOAD_ACTIVE "load active file from NNTP server"
825 OP_MACRO "execute a macro"
826 OP_MAIL "compose a new mail message"
827 OP_MAIN_BREAK_THREAD "break the thread in two"
828 OP_MAIN_CHANGE_FOLDER "open a different folder"
829 OP_MAIN_CHANGE_FOLDER_READONLY "open a different folder in read only mode"
830 +OP_MAIN_CHANGE_GROUP "open a different newsgroup"
831 +OP_MAIN_CHANGE_GROUP_READONLY "open a different newsgroup in read only mode"
832 OP_MAIN_CLEAR_FLAG "clear a status flag from a message"
833 OP_MAIN_DELETE_PATTERN "delete messages matching a pattern"
834 OP_MAIN_IMAP_FETCH "force retrieval of mail from IMAP server"
835 @@ -137,6 +150,7 @@ OP_PAGER_HIDE_QUOTED "toggle display of
836 OP_PAGER_SKIP_QUOTED "skip beyond quoted text"
837 OP_PAGER_TOP "jump to the top of the message"
838 OP_PIPE "pipe message/attachment to a shell command"
839 +OP_POST "post message to newsgroup"
840 OP_PREV_ENTRY "move to the previous entry"
841 OP_PREV_LINE "scroll up one line"
842 OP_PREV_PAGE "move to the previous page"
843 @@ -145,6 +159,7 @@ OP_QUERY "query external program for add
844 OP_QUERY_APPEND "append new query results to current results"
845 OP_QUIT "save changes to mailbox and quit"
846 OP_RECALL_MESSAGE "recall a postponed message"
847 +OP_RECONSTRUCT_THREAD "reconstruct thread containing current message"
848 OP_REDRAW "clear and redraw the screen"
849 OP_REFORMAT_WINCH "{internal}"
850 OP_RENAME_MAILBOX "rename the current mailbox (IMAP only)"
851 @@ -159,18 +174,22 @@ OP_SEARCH_TOGGLE "toggle search pattern
852 OP_SHELL_ESCAPE "invoke a command in a subshell"
853 OP_SORT "sort messages"
854 OP_SORT_REVERSE "sort messages in reverse order"
855 +OP_SUBSCRIBE_PATTERN "subscribe to newsgroups matching a pattern"
856 OP_TAG "tag the current entry"
857 OP_TAG_PREFIX "apply next function to tagged messages"
858 OP_TAG_PREFIX_COND "apply next function ONLY to tagged messages"
859 OP_TAG_SUBTHREAD "tag the current subthread"
860 OP_TAG_THREAD "tag the current thread"
861 OP_TOGGLE_NEW "toggle a message's 'new' flag"
862 +OP_TOGGLE_READ "toggle view of read messages"
863 OP_TOGGLE_WRITE "toggle whether the mailbox will be rewritten"
864 OP_TOGGLE_MAILBOXES "toggle whether to browse mailboxes or all files"
865 OP_TOP_PAGE "move to the top of the page"
866 +OP_UNCATCHUP "mark all articles in newsgroup as unread"
867 OP_UNDELETE "undelete the current entry"
868 OP_UNDELETE_THREAD "undelete all messages in thread"
869 OP_UNDELETE_SUBTHREAD "undelete all messages in subthread"
870 +OP_UNSUBSCRIBE_PATTERN "unsubscribe from newsgroups matching a pattern"
871 OP_VERSION "show the Mutt version number and date"
872 OP_VIEW_ATTACH "view attachment using mailcap entry if necessary"
873 OP_VIEW_ATTACHMENTS "show MIME attachments"
874 diff -udprP mutt-1.5.16.orig/PATCHES mutt-1.5.16/PATCHES
875 --- mutt-1.5.16.orig/PATCHES 2007-04-30 05:07:48.000000000 +0300
876 +++ mutt-1.5.16/PATCHES 2007-06-15 17:12:26.000000000 +0300
879 diff -udprP mutt-1.5.16.orig/account.c mutt-1.5.16/account.c
880 --- mutt-1.5.16.orig/account.c 2007-04-11 23:28:23.000000000 +0300
881 +++ mutt-1.5.16/account.c 2007-06-15 17:12:26.000000000 +0300
882 @@ -54,6 +54,11 @@ int mutt_account_match (const ACCOUNT* a
887 + if (a1->type == M_ACCT_TYPE_NNTP && NntpUser)
891 if (a1->flags & a2->flags & M_ACCT_USER)
892 return (!strcmp (a1->user, a2->user));
893 if (a1->flags & M_ACCT_USER)
894 @@ -133,6 +138,16 @@ void mutt_account_tourl (ACCOUNT* accoun
899 + if (account->type == M_ACCT_TYPE_NNTP)
901 + if (account->flags & M_ACCT_SSL)
902 + url->scheme = U_NNTPS;
904 + url->scheme = U_NNTP;
908 url->host = account->host;
909 if (account->flags & M_ACCT_PORT)
910 url->port = account->port;
911 @@ -158,6 +173,10 @@ int mutt_account_getuser (ACCOUNT* accou
912 else if ((account->type == M_ACCT_TYPE_POP) && PopUser)
913 strfcpy (account->user, PopUser, sizeof (account->user));
916 + else if ((account->type == M_ACCT_TYPE_NNTP) && NntpUser)
917 + strfcpy (account->user, NntpUser, sizeof (account->user));
919 /* prompt (defaults to unix username), copy into account->user */
922 @@ -218,6 +237,10 @@ int mutt_account_getpass (ACCOUNT* accou
923 else if ((account->type == M_ACCT_TYPE_SMTP) && SmtpPass)
924 strfcpy (account->pass, SmtpPass, sizeof (account->pass));
927 + else if ((account->type == M_ACCT_TYPE_NNTP) && NntpPass)
928 + strfcpy (account->pass, NntpPass, sizeof (account->pass));
932 snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
933 diff -udprP mutt-1.5.16.orig/account.h mutt-1.5.16/account.h
934 --- mutt-1.5.16.orig/account.h 2007-04-02 00:58:55.000000000 +0300
935 +++ mutt-1.5.16/account.h 2007-06-15 17:12:26.000000000 +0300
936 @@ -29,7 +29,8 @@ enum
937 M_ACCT_TYPE_NONE = 0,
946 diff -udprP mutt-1.5.16.orig/attach.h mutt-1.5.16/attach.h
947 --- mutt-1.5.16.orig/attach.h 2007-04-02 00:58:55.000000000 +0300
948 +++ mutt-1.5.16/attach.h 2007-06-15 17:12:26.000000000 +0300
949 @@ -50,7 +50,7 @@ void mutt_print_attachment_list (FILE *f
951 void mutt_attach_bounce (FILE *, HEADER *, ATTACHPTR **, short, BODY *);
952 void mutt_attach_resend (FILE *, HEADER *, ATTACHPTR **, short, BODY *);
953 -void mutt_attach_forward (FILE *, HEADER *, ATTACHPTR **, short, BODY *);
954 +void mutt_attach_forward (FILE *, HEADER *, ATTACHPTR **, short, BODY *, int);
955 void mutt_attach_reply (FILE *, HEADER *, ATTACHPTR **, short, BODY *, int);
957 #endif /* _ATTACH_H_ */
958 diff -udprP mutt-1.5.16.orig/browser.c mutt-1.5.16/browser.c
959 --- mutt-1.5.16.orig/browser.c 2007-04-16 02:56:26.000000000 +0300
960 +++ mutt-1.5.16/browser.c 2007-06-15 17:12:38.000000000 +0300
971 @@ -49,6 +52,19 @@ static struct mapping_t FolderHelp[] = {
976 +static struct mapping_t FolderNewsHelp[] = {
977 + { N_("Exit"), OP_EXIT },
978 + { N_("List"), OP_TOGGLE_MAILBOXES },
979 + { N_("Subscribe"), OP_BROWSER_SUBSCRIBE },
980 + { N_("Unsubscribe"), OP_BROWSER_UNSUBSCRIBE },
981 + { N_("Catchup"), OP_CATCHUP },
982 + { N_("Mask"), OP_ENTER_MASK },
983 + { N_("Help"), OP_HELP },
988 typedef struct folder_t
990 struct folder_file *ff;
991 @@ -114,9 +130,17 @@ static void browser_sort (struct browser
996 + if (option (OPTNEWS))
999 f = browser_compare_date;
1003 + if (option (OPTNEWS))
1006 f = browser_compare_size;
1009 @@ -307,8 +331,106 @@ folder_format_str (char *dest, size_t de
1014 +static const char *
1015 +newsgroup_format_str (char *dest, size_t destlen, size_t col, char op, const char *src,
1016 + const char *fmt, const char *ifstring, const char *elsestring,
1017 + unsigned long data, format_flag flags)
1019 + char fn[SHORT_STRING], tmp[SHORT_STRING];
1020 + FOLDER *folder = (FOLDER *) data;
1025 + snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
1026 + snprintf (dest, destlen, tmp, folder->num + 1);
1030 + strncpy (fn, folder->ff->name, sizeof(fn) - 1);
1031 + snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
1032 + snprintf (dest, destlen, tmp, fn);
1036 + snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
1037 + if (folder->ff->nd->subscribed)
1038 + snprintf (dest, destlen, tmp, ' ');
1040 + snprintf (dest, destlen, tmp, folder->ff->new ? 'N' : 'u');
1044 + snprintf (tmp, sizeof (tmp), "%%%sc", fmt);
1045 + if (folder->ff->nd->deleted)
1046 + snprintf (dest, destlen, tmp, 'D');
1048 + snprintf (dest, destlen, tmp, folder->ff->nd->allowed ? ' ' : '-');
1052 + if (flags & M_FORMAT_OPTIONAL)
1054 + if (folder->ff->nd->unread != 0)
1055 + mutt_FormatString (dest, destlen, col, ifstring, newsgroup_format_str,
1058 + mutt_FormatString (dest, destlen, col, elsestring, newsgroup_format_str,
1061 + else if (Context && Context->data == folder->ff->nd)
1063 + snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
1064 + snprintf (dest, destlen, tmp, Context->unread);
1068 + snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
1069 + snprintf (dest, destlen, tmp, folder->ff->nd->unread);
1074 + if (Context && Context->data == folder->ff->nd)
1076 + snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
1077 + snprintf (dest, destlen, tmp, Context->new);
1079 + else if (option (OPTMARKOLD) &&
1080 + folder->ff->nd->lastCached >= folder->ff->nd->firstMessage &&
1081 + folder->ff->nd->lastCached <= folder->ff->nd->lastMessage)
1083 + snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
1084 + snprintf (dest, destlen, tmp, folder->ff->nd->lastMessage - folder->ff->nd->lastCached);
1088 + snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
1089 + snprintf (dest, destlen, tmp, folder->ff->nd->unread);
1094 + if (folder->ff->nd->desc != NULL)
1096 + snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
1097 + snprintf (dest, destlen, tmp, folder->ff->nd->desc);
1101 + snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
1102 + snprintf (dest, destlen, tmp, "");
1108 +#endif /* USE_NNTP */
1110 static void add_folder (MUTTMENU *m, struct browser_state *state,
1111 - const char *name, const struct stat *s, int new)
1112 + const char *name, const struct stat *s,
1113 + void *data, int new)
1115 if (state->entrylen == state->entrymax)
1117 @@ -337,6 +459,10 @@ static void add_folder (MUTTMENU *m, str
1119 (state->entry)[state->entrylen].imap = 0;
1122 + if (option (OPTNEWS))
1123 + (state->entry)[state->entrylen].nd = (NNTP_DATA *) data;
1125 (state->entrylen)++;
1128 @@ -352,9 +478,35 @@ static void init_state (struct browser_s
1129 menu->data = state->entry;
1132 +/* get list of all files/newsgroups with mask */
1133 static int examine_directory (MUTTMENU *menu, struct browser_state *state,
1134 char *d, const char *prefix)
1137 + if (option (OPTNEWS))
1141 + NNTP_SERVER *news = CurrentNewsSrv;
1143 +/* mutt_buffy_check (0); */
1144 + init_state (state, menu);
1146 + for (tmp = news->list; tmp; tmp = tmp->next)
1148 + if (!(data = (NNTP_DATA *)tmp->data))
1150 + if (prefix && *prefix && strncmp (prefix, data->group,
1151 + strlen (prefix)) != 0)
1153 + if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
1155 + add_folder (menu, state, data->group, NULL, data, data->new);
1159 +#endif /* USE_NNTP */
1164 @@ -415,17 +567,40 @@ static int examine_directory (MUTTMENU *
1166 while (tmp && mutt_strcmp (buffer, tmp->path))
1168 - add_folder (menu, state, de->d_name, &s, (tmp) ? tmp->new : 0);
1169 + add_folder (menu, state, de->d_name, &s, NULL, (tmp) ? tmp->new : 0);
1174 browser_sort (state);
1178 +/* get list of mailboxes/subscribed newsgroups */
1179 static int examine_mailboxes (MUTTMENU *menu, struct browser_state *state)
1182 char buffer[LONG_STRING];
1185 + if (option (OPTNEWS))
1189 + NNTP_SERVER *news = CurrentNewsSrv;
1191 +/* mutt_buffy_check (0); */
1192 + init_state (state, menu);
1194 + for (tmp = news->list; tmp; tmp = tmp->next)
1196 + if ((data = (NNTP_DATA *) tmp->data) != NULL && (data->new ||
1197 + (data->subscribed && (!option (OPTSHOWONLYUNREAD) || data->unread))))
1198 + add_folder (menu, state, data->group, NULL, data, data->new);
1204 BUFFY *tmp = Incoming;
1206 struct mailbox_state mbox;
1207 @@ -443,14 +618,21 @@ static int examine_mailboxes (MUTTMENU *
1208 if (mx_is_imap (tmp->path))
1210 imap_mailbox_state (tmp->path, &mbox);
1211 - add_folder (menu, state, tmp->path, NULL, mbox.new);
1212 + add_folder (menu, state, tmp->path, NULL, NULL, mbox.new);
1217 if (mx_is_pop (tmp->path))
1219 - add_folder (menu, state, tmp->path, NULL, tmp->new);
1220 + add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
1225 + if (mx_is_nntp (tmp->path))
1227 + add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
1231 @@ -464,15 +646,20 @@ static int examine_mailboxes (MUTTMENU *
1232 strfcpy (buffer, NONULL(tmp->path), sizeof (buffer));
1233 mutt_pretty_mailbox (buffer);
1235 - add_folder (menu, state, buffer, &s, tmp->new);
1236 + add_folder (menu, state, buffer, &s, NULL, tmp->new);
1238 while ((tmp = tmp->next));
1240 browser_sort (state);
1244 static int select_file_search (MUTTMENU *menu, regex_t *re, int n)
1247 + if (option (OPTNEWS))
1248 + return (regexec (re, ((struct folder_file *) menu->data)[n].desc, 0, NULL, 0));
1250 return (regexec (re, ((struct folder_file *) menu->data)[n].name, 0, NULL, 0));
1253 @@ -483,6 +670,12 @@ static void folder_entry (char *s, size_
1254 folder.ff = &((struct folder_file *) menu->data)[num];
1258 + if (option (OPTNEWS))
1259 + mutt_FormatString (s, slen, 0, NONULL(GroupFormat), newsgroup_format_str,
1260 + (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
1263 mutt_FormatString (s, slen, 0, NONULL(FolderFormat), folder_format_str,
1264 (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
1266 @@ -503,6 +696,17 @@ static void init_menu (struct browser_st
1271 + if (option (OPTNEWS))
1274 + snprintf (title, titlelen, _("Subscribed newsgroups"));
1276 + snprintf (title, titlelen, _("Newsgroups on server [%s]"),
1277 + CurrentNewsSrv->conn->account.host);
1282 snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0));
1284 @@ -558,6 +762,31 @@ void _mutt_select_file (char *f, size_t
1286 strfcpy (LastDirBackup, LastDir, sizeof (LastDirBackup));
1289 + if (option (OPTNEWS))
1292 + strfcpy (prefix, f, sizeof (prefix));
1297 + /* default state for news reader mode is browse subscribed newsgroups */
1299 + for (list = CurrentNewsSrv->list; list; list = list->next)
1301 + NNTP_DATA *data = (NNTP_DATA *) list->data;
1303 + if (data && data->subscribed)
1315 mutt_expand_path (f, flen);
1316 @@ -655,6 +884,9 @@ void _mutt_select_file (char *f, size_t
1317 menu->tag = file_tag;
1319 menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER,
1321 + (option (OPTNEWS)) ? FolderNewsHelp :
1325 init_menu (&state, menu, title, sizeof (title), buffy);
1326 @@ -793,7 +1025,11 @@ void _mutt_select_file (char *f, size_t
1331 + if (buffy || option (OPTNEWS)) /* news have not path */
1336 strfcpy (f, state.entry[menu->current].name, flen);
1337 mutt_expand_path (f, flen);
1338 @@ -851,14 +1087,6 @@ void _mutt_select_file (char *f, size_t
1342 - case OP_BROWSER_SUBSCRIBE:
1343 - imap_subscribe (state.entry[menu->current].name, 1);
1346 - case OP_BROWSER_UNSUBSCRIBE:
1347 - imap_subscribe (state.entry[menu->current].name, 0);
1350 case OP_BROWSER_TOGGLE_LSUB:
1351 if (option (OPTIMAPLSUB))
1353 @@ -957,6 +1185,11 @@ void _mutt_select_file (char *f, size_t
1355 case OP_CHANGE_DIRECTORY:
1358 + if (option (OPTNEWS))
1362 strfcpy (buf, LastDir, sizeof (buf));
1364 if (!state.imap_browse)
1365 @@ -1213,6 +1446,190 @@ void _mutt_select_file (char *f, size_t
1367 mutt_error _("Error trying to view file");
1373 + case OP_UNCATCHUP:
1374 + if (option (OPTNEWS))
1376 + struct folder_file *f = &state.entry[menu->current];
1379 + if (i == OP_CATCHUP)
1380 + nd = mutt_newsgroup_catchup (CurrentNewsSrv, f->name);
1382 + nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, f->name);
1387 + struct folder_file ff;
1388 + char buffer[_POSIX_PATH_MAX + SHORT_STRING];
1391 + folder.ff->name = f->name;
1392 + folder.ff->st = NULL;
1393 + folder.ff->is_new = nd->new;
1394 + folder.ff->nd = nd;
1396 + mutt_FormatString (buffer, sizeof (buffer), 0, NONULL(GroupFormat),
1397 + newsgroup_format_str, (unsigned long) &folder,
1398 + M_FORMAT_ARROWCURSOR);
1399 + f->desc = safe_strdup (buffer); */
1400 + if (menu->current + 1 < menu->max)
1402 + menu->redraw = REDRAW_MOTION_RESYNCH;
1407 + case OP_LOAD_ACTIVE:
1408 + if (!option (OPTNEWS))
1415 + for (tmp = CurrentNewsSrv->list; tmp; tmp = tmp->next)
1417 + if ((data = (NNTP_DATA *)tmp->data))
1418 + data->deleted = 1;
1421 + nntp_get_active (CurrentNewsSrv);
1423 + destroy_state (&state);
1425 + examine_mailboxes (menu, &state);
1427 + examine_directory (menu, &state, NULL, NULL);
1428 + init_menu (&state, menu, title, sizeof (title), buffy);
1430 +#endif /* USE_NNTP */
1432 +#if defined USE_IMAP || defined USE_NNTP
1433 + case OP_BROWSER_SUBSCRIBE:
1434 + case OP_BROWSER_UNSUBSCRIBE:
1437 + case OP_SUBSCRIBE_PATTERN:
1438 + case OP_UNSUBSCRIBE_PATTERN:
1439 + if (option (OPTNEWS))
1441 + regex_t *rx = (regex_t *) safe_malloc (sizeof (regex_t));
1443 + int j = menu->current;
1445 + NNTP_SERVER *news = CurrentNewsSrv;
1447 + if (i == OP_SUBSCRIBE_PATTERN || i == OP_UNSUBSCRIBE_PATTERN)
1453 + if (i == OP_SUBSCRIBE_PATTERN)
1454 + snprintf (tmp, sizeof (tmp), _("Subscribe pattern: "));
1456 + snprintf (tmp, sizeof (tmp), _("Unsubscribe pattern: "));
1457 + if (mutt_get_field (tmp, buf, sizeof (buf), 0) != 0 || !buf[0])
1463 + if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0)
1465 + regerror (err, rx, buf, sizeof (buf));
1468 + mutt_error ("%s", buf);
1471 + menu->redraw = REDRAW_FULL;
1474 + else if (!state.entrylen)
1476 + mutt_error _("No newsgroups match the mask");
1480 + for ( ; j < state.entrylen; j++)
1482 + struct folder_file *f = &state.entry[j];
1484 + if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE ||
1485 + regexec (rx, f->name, 0, NULL, 0) == 0)
1487 + if (i == OP_BROWSER_SUBSCRIBE || i == OP_SUBSCRIBE_PATTERN)
1488 + nd = mutt_newsgroup_subscribe (news, f->name);
1490 + nd = mutt_newsgroup_unsubscribe (news, f->name);
1494 + char buffer[_POSIX_PATH_MAX + SHORT_STRING];
1496 + folder.name = f->name;
1498 + folder.new = nd->new;
1501 + mutt_FormatString (buffer, sizeof (buffer), 0, NONULL(GroupFormat),
1502 + newsgroup_format_str, (unsigned long) &folder,
1503 + M_FORMAT_ARROWCURSOR);
1504 + f->desc = safe_strdup (buffer);
1507 + if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE)
1509 + if (menu->current + 1 < menu->max)
1511 + menu->redraw = REDRAW_MOTION_RESYNCH;
1515 + if (i == OP_SUBSCRIBE_PATTERN)
1517 + LIST *grouplist = NULL;
1520 + grouplist = news->list;
1521 + for (; grouplist; grouplist = grouplist->next)
1523 + nd = (NNTP_DATA *) grouplist->data;
1524 + if (nd && nd->group && !nd->subscribed)
1526 + if (regexec (rx, nd->group, 0, NULL, 0) == 0)
1528 + mutt_newsgroup_subscribe (news, nd->group);
1529 + add_folder (menu, &state, nd->group, NULL, nd, nd->new);
1533 + init_menu (&state, menu, title, sizeof (title), buffy);
1535 + mutt_newsrc_update (news);
1536 + nntp_clear_cacheindex (news);
1537 + if (i != OP_BROWSER_SUBSCRIBE && i != OP_BROWSER_UNSUBSCRIBE)
1543 +#endif /* USE_IMAP && USE_NNTP */
1544 +#endif /* USE_NNTP */
1547 + if (i == OP_BROWSER_SUBSCRIBE)
1548 + imap_subscribe (state.entry[menu->current].name, 1);
1550 + imap_subscribe (state.entry[menu->current].name, 0);
1552 +#endif /* USE_IMAP */
1556 diff -udprP mutt-1.5.16.orig/browser.h mutt-1.5.16/browser.h
1557 --- mutt-1.5.16.orig/browser.h 2007-04-03 07:57:21.000000000 +0300
1558 +++ mutt-1.5.16/browser.h 2007-06-15 17:12:26.000000000 +0300
1561 #define _BROWSER_H 1
1570 @@ -38,14 +42,17 @@ struct folder_file
1571 unsigned selectable : 1;
1572 unsigned inferiors : 1;
1577 unsigned tagged : 1;
1580 struct browser_state
1582 struct folder_file *entry;
1583 - short entrylen; /* number of real entries */
1584 - short entrymax; /* max entry */
1585 + unsigned int entrylen; /* number of real entries */
1586 + unsigned int entrymax; /* max entry */
1590 diff -udprP mutt-1.5.16.orig/buffy.c mutt-1.5.16/buffy.c
1591 --- mutt-1.5.16.orig/buffy.c 2007-04-02 00:58:55.000000000 +0300
1592 +++ mutt-1.5.16/buffy.c 2007-06-15 17:12:26.000000000 +0300
1593 @@ -285,6 +285,9 @@ int mutt_buffy_check (int force)
1595 if (!Context || Context->magic != M_POP)
1598 + if (!Context || Context->magic != M_NNTP)
1600 /* check device ID and serial number instead of comparing paths */
1601 if (!Context || !Context->path || stat (Context->path, &contex_sb) != 0)
1603 @@ -308,6 +311,11 @@ int mutt_buffy_check (int force)
1608 + if ((tmp->magic == M_NNTP) || mx_is_nntp (tmp->path))
1609 + tmp->magic = M_NNTP;
1612 if (stat (tmp->path, &sb) != 0 || sb.st_size == 0 ||
1613 (!tmp->magic && (tmp->magic = mx_get_magic (tmp->path)) <= 0))
1615 @@ -325,25 +333,21 @@ int mutt_buffy_check (int force)
1616 /* check to see if the folder is the currently selected folder
1618 if (!Context || !Context->path ||
1619 -#if defined USE_IMAP || defined USE_POP
1624 - tmp->magic == M_IMAP
1625 + || tmp->magic == M_IMAP
1631 - tmp->magic == M_POP
1633 - ) ? mutt_strcmp (tmp->path, Context->path) :
1634 + || tmp->magic == M_POP
1636 - (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)
1637 -#if defined USE_IMAP || defined USE_POP
1640 + || tmp->magic == M_NNTP
1644 + ) ? mutt_strcmp (tmp->path, Context->path) :
1645 + (sb.st_dev != contex_sb.st_dev || sb.st_ino != contex_sb.st_ino)
1651 diff -udprP mutt-1.5.16.orig/complete.c mutt-1.5.16/complete.c
1652 --- mutt-1.5.16.orig/complete.c 2007-04-08 00:39:04.000000000 +0300
1653 +++ mutt-1.5.16/complete.c 2007-06-15 17:12:26.000000000 +0300
1655 #include "mailbox.h"
1664 @@ -48,9 +51,71 @@ int mutt_complete (char *s, size_t slen)
1665 char filepart[_POSIX_PATH_MAX];
1667 char imap_path[LONG_STRING];
1670 dprint (2, (debugfile, "mutt_complete: completing %s\n", s));
1673 + if (option (OPTNEWS))
1675 + LIST *l = CurrentNewsSrv->list;
1677 + strfcpy (filepart, s, sizeof (filepart));
1680 + * special case to handle when there is no filepart yet.
1681 + * find the first subscribed newsgroup
1683 + if ((len = mutt_strlen (filepart)) == 0)
1685 + for (; l; l = l->next)
1687 + NNTP_DATA *data = (NNTP_DATA *)l->data;
1689 + if (data && data->subscribed)
1691 + strfcpy (filepart, data->group, sizeof (filepart));
1699 + for (; l; l = l->next)
1701 + NNTP_DATA *data = (NNTP_DATA *)l->data;
1703 + if (data && data->subscribed &&
1704 + mutt_strncmp (data->group, filepart, len) == 0)
1708 + for (i = 0; filepart[i] && data->group[i]; i++)
1710 + if (filepart[i] != data->group[i])
1720 + strfcpy (filepart, data->group, sizeof (filepart));
1726 + strcpy (s, filepart);
1728 + return (init ? 0 : -1);
1733 /* we can use '/' as a delimiter, imap_complete rewrites it */
1734 if (*s == '=' || *s == '+' || *s == '!')
1736 diff -udprP mutt-1.5.16.orig/compose.c mutt-1.5.16/compose.c
1737 --- mutt-1.5.16.orig/compose.c 2007-04-16 02:56:26.000000000 +0300
1738 +++ mutt-1.5.16/compose.c 2007-06-15 17:12:26.000000000 +0300
1740 #include "mailbox.h"
1742 #include "charset.h"
1746 #include "remailer.h"
1755 @@ -67,11 +72,17 @@ enum
1765 HDR_ATTACH = (HDR_FCC + 5) /* where to start printing the attachments */
1768 -#define HDR_XOFFSET 10
1769 -#define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
1770 +#define HDR_XOFFSET 14
1771 +#define TITLE_FMT "%14s" /* Used for Prompts, which are ASCII */
1772 #define W (COLS - HDR_XOFFSET)
1774 static char *Prompts[] =
1775 @@ -83,6 +91,16 @@ static char *Prompts[] =
1791 static struct mapping_t ComposeHelp[] = {
1792 @@ -97,6 +115,19 @@ static struct mapping_t ComposeHelp[] =
1797 +static struct mapping_t ComposeNewsHelp[] = {
1798 + { N_("Send"), OP_COMPOSE_SEND_MESSAGE },
1799 + { N_("Abort"), OP_EXIT },
1800 + { "Newsgroups", OP_COMPOSE_EDIT_NEWSGROUPS },
1801 + { "Subj", OP_COMPOSE_EDIT_SUBJECT },
1802 + { N_("Attach file"), OP_COMPOSE_ATTACH_FILE },
1803 + { N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION },
1804 + { N_("Help"), OP_HELP },
1809 static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num)
1811 mutt_FormatString (b, blen, 0, NONULL (AttachFormat), mutt_attach_fmt,
1812 @@ -115,16 +146,16 @@ static void redraw_crypt_lines (HEADER *
1813 if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME))
1816 - mvaddstr (HDR_CRYPT, 0, "Security: ");
1817 + mvaddstr (HDR_CRYPT, 0, " Security: ");
1818 else if (msg->security & APPLICATION_SMIME)
1819 - mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
1820 + mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
1821 else if (msg->security & APPLICATION_PGP)
1822 - mvaddstr (HDR_CRYPT, 0, " PGP: ");
1823 + mvaddstr (HDR_CRYPT, 0, " PGP: ");
1825 else if ((WithCrypto & APPLICATION_SMIME))
1826 - mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
1827 + mvaddstr (HDR_CRYPT, 0, " S/MIME: ");
1828 else if ((WithCrypto & APPLICATION_PGP))
1829 - mvaddstr (HDR_CRYPT, 0, " PGP: ");
1830 + mvaddstr (HDR_CRYPT, 0, " PGP: ");
1834 @@ -252,9 +283,28 @@ static void draw_envelope_addr (int line
1835 static void draw_envelope (HEADER *msg, char *fcc)
1837 draw_envelope_addr (HDR_FROM, msg->env->from);
1839 + if (!option (OPTNEWSSEND))
1842 draw_envelope_addr (HDR_TO, msg->env->to);
1843 draw_envelope_addr (HDR_CC, msg->env->cc);
1844 draw_envelope_addr (HDR_BCC, msg->env->bcc);
1849 + mvprintw (HDR_TO, 0, TITLE_FMT , Prompts[HDR_NEWSGROUPS - 1]);
1850 + mutt_paddstr (W, NONULL (msg->env->newsgroups));
1851 + mvprintw (HDR_CC, 0, TITLE_FMT , Prompts[HDR_FOLLOWUPTO - 1]);
1852 + mutt_paddstr (W, NONULL (msg->env->followup_to));
1853 + if (option (OPTXCOMMENTTO))
1855 + mvprintw (HDR_BCC, 0, TITLE_FMT , Prompts[HDR_XCOMMENTTO - 1]);
1856 + mutt_paddstr (W, NONULL (msg->env->x_comment_to));
1860 mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
1861 mutt_paddstr (W, NONULL (msg->env->subject));
1862 draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
1863 @@ -507,6 +557,12 @@ int mutt_compose_menu (HEADER *msg, /*
1864 /* Sort, SortAux could be changed in mutt_index_menu() */
1865 int oldSort, oldSortAux;
1868 + int news = 0; /* is it a news article ? */
1870 + if (option (OPTNEWSSEND))
1874 mutt_attach_init (msg->content);
1875 idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, 1);
1876 @@ -518,10 +574,18 @@ int mutt_compose_menu (HEADER *msg, /*
1877 menu->make_entry = snd_entry;
1878 menu->tag = mutt_tag_attach;
1882 + menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeNewsHelp);
1885 menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, ComposeHelp);
1890 + unset_option (OPTNEWS); /* for any case */
1892 switch (op = mutt_menuLoop (menu))
1895 @@ -534,17 +598,87 @@ int mutt_compose_menu (HEADER *msg, /*
1896 mutt_message_hook (NULL, msg, M_SEND2HOOK);
1898 case OP_COMPOSE_EDIT_TO:
1903 menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
1904 mutt_message_hook (NULL, msg, M_SEND2HOOK);
1906 case OP_COMPOSE_EDIT_BCC:
1911 menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
1912 mutt_message_hook (NULL, msg, M_SEND2HOOK);
1914 case OP_COMPOSE_EDIT_CC:
1919 menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
1920 mutt_message_hook (NULL, msg, M_SEND2HOOK);
1923 + case OP_COMPOSE_EDIT_NEWSGROUPS:
1926 + if (msg->env->newsgroups)
1927 + strfcpy (buf, msg->env->newsgroups, sizeof (buf));
1930 + if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0 && buf[0])
1932 + FREE (&msg->env->newsgroups);
1933 + mutt_remove_trailing_ws (buf);
1934 + msg->env->newsgroups = safe_strdup (mutt_skip_whitespace (buf));
1935 + move (HDR_TO, HDR_XOFFSET);
1937 + if (msg->env->newsgroups)
1938 + printw ("%-*.*s", W, W, msg->env->newsgroups);
1943 + case OP_COMPOSE_EDIT_FOLLOWUP_TO:
1947 + if (msg->env->followup_to)
1948 + strfcpy (buf, msg->env->followup_to, sizeof (buf));
1949 + if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0 && buf[0])
1951 + FREE (&msg->env->followup_to);
1952 + mutt_remove_trailing_ws (buf);
1953 + msg->env->followup_to = safe_strdup (mutt_skip_whitespace (buf));
1954 + move (HDR_CC, HDR_XOFFSET);
1956 + if (msg->env->followup_to)
1957 + printw ("%-*.*s", W, W, msg->env->followup_to);
1962 + case OP_COMPOSE_EDIT_X_COMMENT_TO:
1963 + if (news && option (OPTXCOMMENTTO))
1966 + if (msg->env->x_comment_to)
1967 + strfcpy (buf, msg->env->x_comment_to, sizeof (buf));
1968 + if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0 && buf[0])
1970 + FREE (&msg->env->x_comment_to);
1971 + msg->env->x_comment_to = safe_strdup (buf);
1972 + move (HDR_BCC, HDR_XOFFSET);
1974 + if (msg->env->x_comment_to)
1975 + printw ("%-*.*s", W, W, msg->env->x_comment_to);
1980 case OP_COMPOSE_EDIT_SUBJECT:
1981 if (msg->env->subject)
1982 strfcpy (buf, msg->env->subject, sizeof (buf));
1983 @@ -707,6 +841,9 @@ int mutt_compose_menu (HEADER *msg, /*
1986 case OP_COMPOSE_ATTACH_MESSAGE:
1988 + case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
1993 @@ -714,7 +851,22 @@ int mutt_compose_menu (HEADER *msg, /*
1995 prompt = _("Open mailbox to attach message from");
1998 + unset_option (OPTNEWS);
1999 + if (op == OP_COMPOSE_ATTACH_NEWS_MESSAGE)
2001 + if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)))
2004 + prompt = _("Open newsgroup to attach message from");
2005 + set_option (OPTNEWS);
2011 + if ((op == OP_COMPOSE_ATTACH_MESSAGE) ^ (Context->magic == M_NNTP))
2014 strfcpy (fname, NONULL (Context->path), sizeof (fname));
2015 mutt_pretty_mailbox (fname);
2016 @@ -723,6 +875,11 @@ int mutt_compose_menu (HEADER *msg, /*
2017 if (mutt_enter_fname (prompt, fname, sizeof (fname), &menu->redraw, 1) == -1 || !fname[0])
2021 + if (option (OPTNEWS))
2022 + nntp_expand_path (fname, sizeof (fname), &CurrentNewsSrv->conn->account);
2025 mutt_expand_path (fname, sizeof (fname));
2027 if (!mx_is_imap (fname))
2028 @@ -730,6 +887,9 @@ int mutt_compose_menu (HEADER *msg, /*
2030 if (!mx_is_pop (fname))
2033 + if (!mx_is_nntp (fname) && !option (OPTNEWS))
2035 /* check to make sure the file exists and is readable */
2036 if (access (fname, R_OK) == -1)
2038 diff -udprP mutt-1.5.16.orig/config.h.in mutt-1.5.16/config.h.in
2039 --- mutt-1.5.16.orig/config.h.in 2007-06-10 05:44:57.000000000 +0300
2040 +++ mutt-1.5.16/config.h.in 2007-06-15 17:12:26.000000000 +0300
2042 significant more memory when defined. */
2043 #undef EXACT_ADDRESS
2045 +/* Compiling with newsreading support with NNTP */
2048 /* program to use for shell commands */
2051 diff -udprP mutt-1.5.16.orig/configure mutt-1.5.16/configure
2052 --- mutt-1.5.16.orig/configure 2007-06-10 05:43:29.000000000 +0300
2053 +++ mutt-1.5.16/configure 2007-06-15 17:12:26.000000000 +0300
2054 @@ -1342,6 +1342,7 @@ Optional Features:
2055 Force use of an external dotlock program
2056 --enable-pop Enable POP3 support
2057 --enable-imap Enable IMAP support
2058 + --enable-nntp Enable NNTP support
2059 --enable-smtp include internal SMTP relay support
2060 --enable-debug Enable debugging support
2061 --enable-flock Use flock() to lock files
2062 @@ -13919,6 +13920,20 @@ fi
2066 +# Check whether --enable-nntp or --disable-nntp was given.
2067 +if test "${enable_nntp+set}" = set; then
2068 + enableval="$enable_nntp"
2069 + if test x$enableval = xyes ; then
2070 + cat >>confdefs.h <<\_ACEOF
2074 + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS nntp.o newsrc.o"
2082 for ac_func in strftime
2083 diff -udprP mutt-1.5.16.orig/configure.ac mutt-1.5.16/configure.ac
2084 --- mutt-1.5.16.orig/configure.ac 2007-06-04 07:20:01.000000000 +0300
2085 +++ mutt-1.5.16/configure.ac 2007-06-15 17:12:26.000000000 +0300
2086 @@ -584,6 +584,14 @@ if test x"$need_imap" = xyes -o x"$need_
2087 MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS bcache.o"
2090 +AC_ARG_ENABLE(nntp, [ --enable-nntp Enable NNTP support],
2091 +[ if test x$enableval = xyes ; then
2092 + AC_DEFINE(USE_NNTP,1,[ Define if you want support for the NNTP protocol. ])
2093 + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS nntp.o newsrc.o"
2098 dnl -- end socket dependencies --
2100 if test "$need_socket" = "yes"
2101 diff -udprP mutt-1.5.16.orig/curs_main.c mutt-1.5.16/curs_main.c
2102 --- mutt-1.5.16.orig/curs_main.c 2007-05-20 10:30:00.000000000 +0300
2103 +++ mutt-1.5.16/curs_main.c 2007-06-15 17:12:41.000000000 +0300
2107 #include "mutt_curses.h"
2109 #include "mutt_menu.h"
2111 #include "mailbox.h"
2114 #include "mutt_crypt.h"
2123 @@ -415,12 +420,27 @@ struct mapping_t IndexHelp[] = {
2128 +struct mapping_t IndexNewsHelp[] = {
2129 + { N_("Quit"), OP_QUIT },
2130 + { N_("Del"), OP_DELETE },
2131 + { N_("Undel"), OP_UNDELETE },
2132 + { N_("Save"), OP_SAVE },
2133 + { N_("Post"), OP_POST },
2134 + { N_("Followup"), OP_FOLLOWUP },
2135 + { N_("Catchup"), OP_CATCHUP },
2136 + { N_("Help"), OP_HELP },
2141 /* This function handles the message index window as well as commands returned
2142 * from the pager (MENU_PAGER).
2144 int mutt_index_menu (void)
2146 char buf[LONG_STRING], helpstr[LONG_STRING];
2149 int done = 0; /* controls when to exit the "event" loop */
2151 @@ -442,7 +462,11 @@ int mutt_index_menu (void)
2152 menu->make_entry = index_make_entry;
2153 menu->color = index_color;
2154 menu->current = ci_first_message ();
2155 - menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN, IndexHelp);
2156 + menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN,
2158 + (Context && (Context->magic == M_NNTP)) ? IndexNewsHelp :
2163 mutt_buffy_check(1); /* force the buffy check after we enter the folder */
2164 @@ -694,6 +718,9 @@ int mutt_index_menu (void)
2165 mutt_curs_set (1); /* fallback from the pager */
2169 + unset_option (OPTNEWS); /* for any case */
2174 @@ -744,6 +771,120 @@ int mutt_index_menu (void)
2175 menu_current_bottom (menu);
2179 + case OP_GET_MESSAGE:
2180 + case OP_GET_PARENT:
2182 + if (Context->magic == M_NNTP)
2186 + if (op == OP_GET_MESSAGE)
2189 + if (mutt_get_field (_("Enter Message-Id: "), buf, sizeof (buf), 0) != 0
2195 + LIST *ref = CURHDR->env->references;
2198 + mutt_error _("Article has no parent reference!");
2201 + strfcpy (buf, ref->data, sizeof (buf));
2203 + if (!Context->id_hash)
2204 + Context->id_hash = mutt_make_id_hash (Context);
2205 + if ((h = hash_find (Context->id_hash, buf)))
2207 + if (h->virtual != -1)
2209 + menu->current = h->virtual;
2210 + menu->redraw = REDRAW_MOTION_RESYNCH;
2212 + else if (h->collapsed)
2214 + mutt_uncollapse_thread (Context, h);
2215 + mutt_set_virtual (Context);
2216 + menu->current = h->virtual;
2217 + menu->redraw = REDRAW_MOTION_RESYNCH;
2220 + mutt_error _("Message not visible in limited view.");
2224 + if (nntp_check_msgid (Context, buf) == 0)
2226 + h = Context->hdrs[Context->msgcount-1];
2227 + mutt_sort_headers (Context, 0);
2228 + menu->current = h->virtual;
2229 + menu->redraw = REDRAW_FULL;
2232 + mutt_error (_("Article %s not found on server"), buf);
2237 + case OP_GET_CHILDREN:
2238 + case OP_RECONSTRUCT_THREAD:
2240 + if (Context->magic == M_NNTP)
2243 + int old = CURHDR->index, i;
2245 + if (!CURHDR->env->message_id)
2247 + mutt_error _("No Message-Id. Unable to perform operation");
2251 + if (!Context->id_hash)
2252 + Context->id_hash = mutt_make_id_hash (Context);
2253 + strfcpy (buf, CURHDR->env->message_id, sizeof (buf));
2255 + if (op == OP_RECONSTRUCT_THREAD)
2257 + LIST *ref = CURHDR->env->references;
2260 + nntp_check_msgid (Context, ref->data);
2261 + /* the last msgid in References is the root message */
2263 + strfcpy (buf, ref->data, sizeof (buf));
2267 + mutt_message _("Check for children of message...");
2268 + if (nntp_check_children (Context, buf) == 0)
2270 + mutt_sort_headers (Context, (op == OP_RECONSTRUCT_THREAD));
2271 + h = hash_find (Context->id_hash, buf);
2272 + /* if the root message was retrieved, move to it */
2274 + menu->current = h->virtual;
2275 + else /* try to restore old position */
2276 + for (i = 0; i < Context->msgcount; i++)
2277 + if (Context->hdrs[i]->index == old)
2279 + menu->current = Context->hdrs[i]->virtual;
2280 + /* As an added courtesy, recenter the menu
2281 + * with the current entry at the middle of the screen */
2282 + menu_check_recenter (menu);
2283 + menu_current_middle (menu);
2286 + menu->redraw = REDRAW_FULL;
2287 + mutt_clear_error ();
2295 @@ -841,11 +982,33 @@ int mutt_index_menu (void)
2299 + case OP_TOGGLE_READ:
2302 menu->oldcurrent = (Context->vcount && menu->current >= 0 && menu->current < Context->vcount) ?
2304 - if (mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
2305 + if (op == OP_TOGGLE_READ)
2307 + char buf[LONG_STRING];
2309 + if (!Context->pattern || strncmp (Context->pattern, "!~R!~D~s", 8) != 0)
2311 + snprintf (buf, sizeof (buf), "!~R!~D~s%s",
2312 + Context->pattern ? Context->pattern : ".*");
2313 + set_option (OPTHIDEREAD);
2317 + strfcpy (buf, Context->pattern + 8, sizeof(buf));
2318 + if (!*buf || strncmp (buf, ".*", 2) == 0)
2319 + snprintf (buf, sizeof(buf), "~A");
2320 + unset_option (OPTHIDEREAD);
2322 + FREE (&Context->pattern);
2323 + Context->pattern = safe_strdup (buf);
2325 + if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
2326 + mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
2328 if (menu->oldcurrent >= 0)
2330 @@ -1053,15 +1216,22 @@ int mutt_index_menu (void)
2332 case OP_MAIN_CHANGE_FOLDER:
2333 case OP_MAIN_NEXT_UNREAD_MAILBOX:
2336 - op = OP_MAIN_CHANGE_FOLDER_READONLY;
2338 - /* fallback to the readonly case */
2340 case OP_MAIN_CHANGE_FOLDER_READONLY:
2342 + case OP_MAIN_CHANGE_GROUP:
2343 + case OP_MAIN_CHANGE_GROUP_READONLY:
2344 + unset_option (OPTNEWS);
2346 + if (attach_msg || option (OPTREADONLY) ||
2348 + op == OP_MAIN_CHANGE_GROUP_READONLY ||
2350 + op == OP_MAIN_CHANGE_FOLDER_READONLY)
2351 + flags = M_READONLY;
2355 - if ((op == OP_MAIN_CHANGE_FOLDER_READONLY) || option (OPTREADONLY))
2357 cp = _("Open mailbox in read-only mode");
2359 cp = _("Open mailbox");
2360 @@ -1080,6 +1250,21 @@ int mutt_index_menu (void)
2365 + if (op == OP_MAIN_CHANGE_GROUP ||
2366 + op == OP_MAIN_CHANGE_GROUP_READONLY)
2368 + set_option (OPTNEWS);
2369 + if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)))
2372 + cp = _("Open newsgroup in read-only mode");
2374 + cp = _("Open newsgroup");
2379 mutt_buffy (buf, sizeof (buf));
2381 if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
2382 @@ -1099,6 +1284,14 @@ int mutt_index_menu (void)
2387 + if (option (OPTNEWS))
2389 + unset_option (OPTNEWS);
2390 + nntp_expand_path (buf, sizeof (buf), &CurrentNewsSrv->conn->account);
2394 mutt_expand_path (buf, sizeof (buf));
2395 if (mx_get_magic (buf) <= 0)
2397 @@ -1136,15 +1329,18 @@ int mutt_index_menu (void)
2398 CurrentMenu = MENU_MAIN;
2399 mutt_folder_hook (buf);
2401 - if ((Context = mx_open_mailbox (buf,
2402 - (option (OPTREADONLY) || op == OP_MAIN_CHANGE_FOLDER_READONLY) ?
2403 - M_READONLY : 0, NULL)) != NULL)
2404 + if ((Context = mx_open_mailbox (buf, flags, NULL)) != NULL)
2406 menu->current = ci_first_message ();
2412 + /* mutt_buffy_check() must be done with mail-reader mode! */
2413 + menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN,
2414 + (Context && (Context->magic == M_NNTP)) ? IndexNewsHelp : IndexHelp);
2416 mutt_clear_error ();
2417 mutt_buffy_check(1); /* force the buffy check after we have changed
2419 @@ -1515,6 +1711,15 @@ int mutt_index_menu (void)
2421 CHECK_ACL(M_ACL_WRITE, _("flag message"));
2424 + if (Context->magic == M_NNTP)
2427 + mutt_error _("Can't change 'important' flag on NNTP server.");
2434 for (j = 0; j < Context->vcount; j++)
2435 @@ -1862,6 +2067,17 @@ int mutt_index_menu (void)
2441 + if (Context && Context->magic == M_NNTP)
2443 + if (mutt_newsgroup_catchup (CurrentNewsSrv,
2444 + ((NNTP_DATA *)Context->data)->group))
2445 + menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
2450 case OP_DISPLAY_ADDRESS:
2453 @@ -1989,6 +2205,15 @@ int mutt_index_menu (void)
2454 menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
2459 + if (Context->magic == M_NNTP)
2462 + mutt_error _("Can't edit message on newsserver.");
2467 MAYBE_REDRAW (menu->redraw);
2469 @@ -2060,6 +2285,37 @@ int mutt_index_menu (void)
2471 menu->redraw = REDRAW_FULL;
2477 + case OP_FORWARD_TO_GROUP:
2480 + if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
2481 + mutt_strcasecmp (CURHDR->env->followup_to, "poster") ||
2482 + query_quadoption (OPT_FOLLOWUPTOPOSTER,_("Reply by mail as poster prefers?")) != M_YES)
2484 + if (Context && Context->magic == M_NNTP &&
2485 + !((NNTP_DATA *)Context->data)->allowed &&
2486 + query_quadoption (OPT_TOMODERATED, _("Posting to this group not allowed, may be moderated. Continue?")) != M_YES)
2488 + if (op == OP_POST)
2489 + ci_send_message (SENDNEWS, NULL, NULL, Context, NULL);
2493 + if (op == OP_FOLLOWUP)
2494 + ci_send_message (SENDNEWS|SENDREPLY, NULL, NULL, Context,
2495 + tag ? NULL : CURHDR);
2497 + ci_send_message (SENDNEWS|SENDFORWARD, NULL, NULL, Context,
2498 + tag ? NULL : CURHDR);
2500 + menu->redraw = REDRAW_FULL;
2507 @@ -2136,6 +2392,12 @@ int mutt_index_menu (void)
2509 CHECK_ACL(M_ACL_DELETE, _("undelete message(s)"));
2512 + /* Close all open NNTP connections */
2514 + nntp_logout_all ();
2517 rc = mutt_thread_set_flag (CURHDR, M_DELETE, 0,
2518 op == OP_UNDELETE_THREAD ? 0 : 1);
2520 diff -udprP mutt-1.5.16.orig/doc/manual.xml.head mutt-1.5.16/doc/manual.xml.head
2521 --- mutt-1.5.16.orig/doc/manual.xml.head 2007-04-04 08:37:13.000000000 +0300
2522 +++ mutt-1.5.16/doc/manual.xml.head 2007-06-15 17:12:26.000000000 +0300
2523 @@ -1295,6 +1295,22 @@ fo-table</literal> for details.
2528 +<title>Reading news via NNTP</title>
2531 +If compiled with <emphasis>--enable-nntp</emphasis> option, Mutt can
2532 +read news from newsserver via NNTP. You can open a newsgroup with
2533 +function ``change-newsgroup'' (default: ``i''). Default newsserver
2534 +can be obtained from <emphasis>NNTPSERVER</emphasis> environment
2535 +variable. Like other news readers, info about subscribed newsgroups
2536 +is saved in file by <link linkend="newsrc">$newsrc</link>
2537 +variable. Article headers are cached and can be loaded from file when
2538 +newsgroup entered instead loading from newsserver.
2545 <sect1 id="forwarding-mail">
2546 diff -udprP mutt-1.5.16.orig/doc/mutt.man mutt-1.5.16/doc/mutt.man
2547 --- mutt-1.5.16.orig/doc/mutt.man 2007-04-04 08:37:13.000000000 +0300
2548 +++ mutt-1.5.16/doc/mutt.man 2007-06-15 17:12:26.000000000 +0300
2549 @@ -23,8 +23,8 @@ mutt \- The Mutt Mail User Agent
2554 -[-e \fIcmd\fP] [-F \fIfile\fP] [-m \fItype\fP] [-f \fIfile\fP]
2556 +[-e \fIcmd\fP] [-F \fIfile\fP] [-g \fIserver\fP] [-m \fItype\fP] [-f \fIfile\fP]
2560 @@ -83,6 +83,10 @@ files.
2561 Specify which mailbox to load.
2562 .IP "-F \fImuttrc\fP"
2563 Specify an initialization file to read instead of ~/.muttrc
2564 +.IP "-g \fIserver\fP"
2565 +Start Mutt with a listing of subscribed newsgroups at specified newsserver.
2567 +Start Mutt with a listing of subscribed newsgroups.
2570 .IP "-H \fIdraft\fP"
2571 diff -udprP mutt-1.5.16.orig/functions.h mutt-1.5.16/functions.h
2572 --- mutt-1.5.16.orig/functions.h 2007-05-14 20:10:00.000000000 +0300
2573 +++ mutt-1.5.16/functions.h 2007-06-15 17:12:26.000000000 +0300
2574 @@ -88,6 +88,10 @@ struct binding_t OpMain[] = { /* map: in
2575 { "break-thread", OP_MAIN_BREAK_THREAD, "#" },
2576 { "change-folder", OP_MAIN_CHANGE_FOLDER, "c" },
2577 { "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
2579 + { "change-newsgroup", OP_MAIN_CHANGE_GROUP, "I" },
2580 + { "change-newsgroup-readonly",OP_MAIN_CHANGE_GROUP_READONLY, "\033i" },
2582 { "next-unread-mailbox", OP_MAIN_NEXT_UNREAD_MAILBOX, NULL },
2583 { "collapse-thread", OP_MAIN_COLLAPSE_THREAD, "\033v" },
2584 { "collapse-all", OP_MAIN_COLLAPSE_ALL, "\033V" },
2585 @@ -102,6 +106,14 @@ struct binding_t OpMain[] = { /* map: in
2586 { "edit-type", OP_EDIT_TYPE, "\005" },
2587 { "forward-message", OP_FORWARD_MESSAGE, "f" },
2588 { "flag-message", OP_FLAG_MESSAGE, "F" },
2590 + { "forward-to-group", OP_FORWARD_TO_GROUP, "\033F" },
2591 + { "followup-message", OP_FOLLOWUP, "\033f" },
2592 + { "get-children", OP_GET_CHILDREN, NULL },
2593 + { "get-message", OP_GET_MESSAGE, "\007" },
2594 + { "get-parent", OP_GET_PARENT, "\033G" },
2595 + { "reconstruct-thread", OP_RECONSTRUCT_THREAD, NULL },
2597 { "group-reply", OP_GROUP_REPLY, "g" },
2599 { "fetch-mail", OP_MAIN_FETCH_MAIL, "G" },
2600 @@ -127,6 +139,9 @@ struct binding_t OpMain[] = { /* map: in
2601 { "sort-mailbox", OP_SORT, "o" },
2602 { "sort-reverse", OP_SORT_REVERSE, "O" },
2603 { "print-message", OP_PRINT, "p" },
2605 + { "post-message", OP_POST, "\033m" },
2607 { "previous-thread", OP_MAIN_PREV_THREAD, "\020" },
2608 { "previous-subthread", OP_MAIN_PREV_SUBTHREAD, "\033p" },
2609 { "recall-message", OP_RECALL_MESSAGE, "R" },
2610 @@ -146,6 +161,10 @@ struct binding_t OpMain[] = { /* map: in
2611 { "show-version", OP_VERSION, "V" },
2612 { "set-flag", OP_MAIN_SET_FLAG, "w" },
2613 { "clear-flag", OP_MAIN_CLEAR_FLAG, "W" },
2614 + { "toggle-read", OP_TOGGLE_READ, "X" },
2616 + { "catchup", OP_CATCHUP, "y" },
2618 { "display-message", OP_DISPLAY_MESSAGE, M_ENTER_S },
2619 { "buffy-list", OP_BUFFY_LIST, "." },
2620 { "sync-mailbox", OP_MAIN_SYNC_FOLDER, "$" },
2621 @@ -177,6 +196,10 @@ struct binding_t OpPager[] = { /* map: p
2622 { "bounce-message", OP_BOUNCE_MESSAGE, "b" },
2623 { "change-folder", OP_MAIN_CHANGE_FOLDER, "c" },
2624 { "change-folder-readonly", OP_MAIN_CHANGE_FOLDER_READONLY, "\033c" },
2626 + { "change-newsgroup", OP_MAIN_CHANGE_GROUP, "I" },
2627 + { "change-newsgroup-readonly",OP_MAIN_CHANGE_GROUP_READONLY, "\033i" },
2629 { "next-unread-mailbox", OP_MAIN_NEXT_UNREAD_MAILBOX, NULL },
2630 { "copy-message", OP_COPY_MESSAGE, "C" },
2631 { "decode-copy", OP_DECODE_COPY, "\033C" },
2632 @@ -185,6 +208,10 @@ struct binding_t OpPager[] = { /* map: p
2633 { "delete-subthread", OP_DELETE_SUBTHREAD, "\033d" },
2634 { "edit", OP_EDIT_MESSAGE, "e" },
2635 { "edit-type", OP_EDIT_TYPE, "\005" },
2637 + { "followup-message", OP_FOLLOWUP, "\033f" },
2638 + { "forward-to-group", OP_FORWARD_TO_GROUP, "\033F" },
2640 { "forward-message", OP_FORWARD_MESSAGE, "f" },
2641 { "flag-message", OP_FLAG_MESSAGE, "F" },
2642 { "group-reply", OP_GROUP_REPLY, "g" },
2643 @@ -205,6 +232,9 @@ struct binding_t OpPager[] = { /* map: p
2644 { "next-thread", OP_MAIN_NEXT_THREAD, "\016" },
2645 { "next-subthread", OP_MAIN_NEXT_SUBTHREAD, "\033n" },
2646 { "print-message", OP_PRINT, "p" },
2648 + { "post-message", OP_POST, "\033m" },
2650 { "previous-thread", OP_MAIN_PREV_THREAD, "\020" },
2651 { "previous-subthread",OP_MAIN_PREV_SUBTHREAD, "\033p" },
2652 { "quit", OP_QUIT, "Q" },
2653 @@ -272,6 +302,10 @@ struct binding_t OpAttach[] = { /* map:
2654 { "bounce-message", OP_BOUNCE_MESSAGE, "b" },
2655 { "display-toggle-weed", OP_DISPLAY_HEADERS, "h" },
2656 { "edit-type", OP_EDIT_TYPE, "\005" },
2658 + { "followup-message", OP_FOLLOWUP, "\033f" },
2659 + { "forward-to-group", OP_FORWARD_TO_GROUP, "\033F" },
2661 { "print-entry", OP_PRINT, "p" },
2662 { "save-entry", OP_SAVE, "s" },
2663 { "pipe-entry", OP_PIPE, "|" },
2664 @@ -297,6 +331,7 @@ struct binding_t OpAttach[] = { /* map:
2665 struct binding_t OpCompose[] = { /* map: compose */
2666 { "attach-file", OP_COMPOSE_ATTACH_FILE, "a" },
2667 { "attach-message", OP_COMPOSE_ATTACH_MESSAGE, "A" },
2668 + { "attach-news-message",OP_COMPOSE_ATTACH_NEWS_MESSAGE,"\033a" },
2669 { "edit-bcc", OP_COMPOSE_EDIT_BCC, "b" },
2670 { "edit-cc", OP_COMPOSE_EDIT_CC, "c" },
2671 { "copy-file", OP_SAVE, "C" },
2672 @@ -316,6 +351,11 @@ struct binding_t OpCompose[] = { /* map:
2673 { "print-entry", OP_PRINT, "l" },
2674 { "edit-mime", OP_COMPOSE_EDIT_MIME, "m" },
2675 { "new-mime", OP_COMPOSE_NEW_MIME, "n" },
2677 + { "edit-newsgroups", OP_COMPOSE_EDIT_NEWSGROUPS, "N" },
2678 + { "edit-followup-to", OP_COMPOSE_EDIT_FOLLOWUP_TO, "o" },
2679 + { "edit-x-comment-to",OP_COMPOSE_EDIT_X_COMMENT_TO, "x" },
2681 { "postpone-message", OP_COMPOSE_POSTPONE_MESSAGE, "P" },
2682 { "edit-reply-to", OP_COMPOSE_EDIT_REPLY_TO, "r" },
2683 { "rename-file", OP_COMPOSE_RENAME_FILE, "R" },
2684 @@ -367,14 +407,25 @@ struct binding_t OpBrowser[] = { /* map:
2685 { "select-new", OP_BROWSER_NEW_FILE, "N" },
2686 { "check-new", OP_CHECK_NEW, NULL },
2687 { "toggle-mailboxes", OP_TOGGLE_MAILBOXES, "\t" },
2689 + { "reload-active", OP_LOAD_ACTIVE, "g" },
2690 + { "subscribe-pattern", OP_SUBSCRIBE_PATTERN, "S" },
2691 + { "unsubscribe-pattern", OP_UNSUBSCRIBE_PATTERN, "U" },
2692 + { "catchup", OP_CATCHUP, "y" },
2693 + { "uncatchup", OP_UNCATCHUP, "Y" },
2695 { "view-file", OP_BROWSER_VIEW_FILE, " " },
2696 { "buffy-list", OP_BUFFY_LIST, "." },
2698 { "create-mailbox", OP_CREATE_MAILBOX, "C" },
2699 { "delete-mailbox", OP_DELETE_MAILBOX, "d" },
2700 { "rename-mailbox", OP_RENAME_MAILBOX, "r" },
2702 +#if defined USE_IMAP || defined USE_NNTP
2703 { "subscribe", OP_BROWSER_SUBSCRIBE, "s" },
2704 { "unsubscribe", OP_BROWSER_UNSUBSCRIBE, "u" },
2707 { "toggle-subscribed", OP_BROWSER_TOGGLE_LSUB, "T" },
2710 diff -udprP mutt-1.5.16.orig/globals.h mutt-1.5.16/globals.h
2711 --- mutt-1.5.16.orig/globals.h 2007-06-10 05:29:21.000000000 +0300
2712 +++ mutt-1.5.16/globals.h 2007-06-15 17:12:26.000000000 +0300
2713 @@ -95,6 +95,15 @@ WHERE char *MixEntryFormat;
2716 WHERE char *Muttrc INITVAL (NULL);
2718 +WHERE char *NewsCacheDir;
2719 +WHERE char *GroupFormat;
2721 +WHERE char *NewsServer;
2722 +WHERE char *NntpUser;
2723 +WHERE char *NntpPass;
2724 +WHERE char *NewsRc;
2728 WHERE char *PagerFmt;
2729 @@ -190,6 +199,11 @@ extern unsigned char QuadOptions[];
2731 WHERE unsigned short Counter INITVAL (0);
2734 +WHERE short NewsPollTimeout;
2735 +WHERE short NntpContext;
2738 WHERE short ConnectTimeout;
2739 WHERE short HistSize;
2740 WHERE short MenuContext;
2741 diff -udprP mutt-1.5.16.orig/hash.c mutt-1.5.16/hash.c
2742 --- mutt-1.5.16.orig/hash.c 2007-04-02 00:58:56.000000000 +0300
2743 +++ mutt-1.5.16/hash.c 2007-06-15 17:12:26.000000000 +0300
2744 @@ -51,10 +51,35 @@ HASH *hash_create (int nelem)
2747 table->nelem = nelem;
2748 + table->curnelem = 0;
2749 table->table = safe_calloc (nelem, sizeof (struct hash_elem *));
2753 +HASH *hash_resize (HASH *ptr, int nelem)
2756 + struct hash_elem *elem, *tmp;
2759 + table = hash_create (nelem);
2761 + for (i = 0; i < ptr->nelem; i++)
2763 + for (elem = ptr->table[i]; elem; )
2766 + elem = elem->next;
2767 + hash_insert (table, tmp->key, tmp->data, 1);
2771 + FREE (&ptr->table);
2777 /* table hash table to update
2778 * key key to hash on
2779 * data data to associate with `key'
2780 @@ -74,6 +99,7 @@ int hash_insert (HASH * table, const cha
2782 ptr->next = table->table[h];
2783 table->table[h] = ptr;
2784 + table->curnelem++;
2788 @@ -96,6 +122,7 @@ int hash_insert (HASH * table, const cha
2790 table->table[h] = ptr;
2792 + table->curnelem++;
2796 @@ -126,6 +153,7 @@ void hash_delete_hash (HASH * table, int
2798 destroy (ptr->data);
2800 + table->curnelem--;
2804 diff -udprP mutt-1.5.16.orig/hash.h mutt-1.5.16/hash.h
2805 --- mutt-1.5.16.orig/hash.h 2007-04-02 00:58:56.000000000 +0300
2806 +++ mutt-1.5.16/hash.h 2007-06-15 17:12:26.000000000 +0300
2807 @@ -28,7 +28,7 @@ struct hash_elem
2812 + int nelem, curnelem;
2813 struct hash_elem **table;
2816 @@ -40,6 +40,7 @@ HASH;
2817 HASH *hash_create (int nelem);
2818 int hash_string (const unsigned char *s, int n);
2819 int hash_insert (HASH * table, const char *key, void *data, int allow_dup);
2820 +HASH *hash_resize (HASH * table, int nelem);
2821 void *hash_find_hash (const HASH * table, int hash, const char *key);
2822 void hash_delete_hash (HASH * table, int hash, const char *key, const void *data,
2823 void (*destroy) (void *));
2824 diff -udprP mutt-1.5.16.orig/hdrline.c mutt-1.5.16/hdrline.c
2825 --- mutt-1.5.16.orig/hdrline.c 2007-04-16 02:56:26.000000000 +0300
2826 +++ mutt-1.5.16/hdrline.c 2007-06-15 17:12:26.000000000 +0300
2827 @@ -209,6 +209,7 @@ int mutt_user_is_recipient (HEADER *h)
2828 * %E = number of messages in current thread
2829 * %f = entire from line
2830 * %F = like %n, unless from self
2831 + * %g = newsgroup name (if compiled with nntp support)
2833 * %l = number of lines in the message
2834 * %L = like %F, except `lists' are displayed first
2835 @@ -217,12 +218,14 @@ int mutt_user_is_recipient (HEADER *h)
2837 * %O = like %L, except using address instead of name
2838 * %P = progress indicator for builtin pager
2839 + * %R = `x-comment-to:' field (if present and compiled with nntp support)
2841 * %S = short message status (e.g., N/O/D/!/r/-)
2842 * %t = `to:' field (recipients)
2844 * %u = user (login) name of author
2845 * %v = first name of author, unless from self
2846 + * %W = where user is (organization)
2847 * %X = number of MIME attachments
2848 * %y = `x-label:' field (if present)
2849 * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
2850 @@ -455,6 +458,12 @@ hdr_format_str (char *dest,
2856 + mutt_format_s (dest, destlen, prefix, hdr->env->newsgroups ? hdr->env->newsgroups : "");
2861 mutt_format_s (dest, destlen, prefix, hdr->env->message_id ? hdr->env->message_id : "<no.id>");
2863 @@ -546,6 +555,15 @@ hdr_format_str (char *dest,
2864 strfcpy(dest, NONULL(hfi->pager_progress), destlen);
2870 + mutt_format_s (dest, destlen, prefix, hdr->env->x_comment_to ? hdr->env->x_comment_to : "");
2871 + else if (!hdr->env->x_comment_to)
2878 if (flags & M_FORMAT_TREE && !hdr->collapsed)
2879 @@ -635,6 +653,13 @@ hdr_format_str (char *dest,
2880 mutt_format_s (dest, destlen, prefix, buf2);
2885 + mutt_format_s (dest, destlen, prefix, hdr->env->organization ? hdr->env->organization : "");
2886 + else if (!hdr->env->organization)
2893 diff -udprP mutt-1.5.16.orig/headers.c mutt-1.5.16/headers.c
2894 --- mutt-1.5.16.orig/headers.c 2007-04-10 07:33:44.000000000 +0300
2895 +++ mutt-1.5.16/headers.c 2007-06-15 17:12:26.000000000 +0300
2896 @@ -118,6 +118,9 @@ void mutt_edit_headers (const char *edit
2897 msg->env = n; n = NULL;
2899 if (!msg->env->in_reply_to)
2901 + if (!option (OPTNEWSSEND))
2903 mutt_free_list (&msg->env->references);
2905 mutt_expand_aliases_env (msg->env);
2906 diff -udprP mutt-1.5.16.orig/init.c mutt-1.5.16/init.c
2907 --- mutt-1.5.16.orig/init.c 2007-04-02 00:58:56.000000000 +0300
2908 +++ mutt-1.5.16/init.c 2007-06-15 17:12:26.000000000 +0300
2909 @@ -2859,6 +2859,28 @@ void mutt_init (int skip_sys_rc, LIST *c
2911 Fqdn = safe_strdup(NONULL(Hostname));
2918 + if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r")))
2921 + fgets (buffer, sizeof (buffer), f);
2925 + while (*i && (*i != ' ') && (*i != '\t') && (*i != '\r') && (*i != '\n')) i++;
2927 + NewsServer = safe_strdup (p);
2931 + if ((p = getenv ("NNTPSERVER")))
2932 + NewsServer = safe_strdup (p);
2935 if ((p = getenv ("MAIL")))
2936 Spoolfile = safe_strdup (p);
2937 else if ((p = getenv ("MAILDIR")))
2938 diff -udprP mutt-1.5.16.orig/init.h mutt-1.5.16/init.h
2939 --- mutt-1.5.16.orig/init.h 2007-06-10 05:29:21.000000000 +0300
2940 +++ mutt-1.5.16/init.h 2007-06-15 17:12:26.000000000 +0300
2941 @@ -169,6 +169,20 @@ struct option_t MuttVars[] = {
2942 ** If set, Mutt will prompt you for carbon-copy (Cc) recipients before
2943 ** editing the body of an outgoing message.
2946 + { "ask_follow_up", DT_BOOL, R_NONE, OPTASKFOLLOWUP, 0 },
2949 + ** If set, Mutt will prompt you for follow-up groups before editing
2950 + ** the body of an outgoing message.
2952 + { "ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, 0 },
2955 + ** If set, Mutt will prompt you for x-comment-to field before editing
2956 + ** the body of an outgoing message.
2959 { "assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, UL 0},
2962 @@ -308,6 +322,14 @@ struct option_t MuttVars[] = {
2963 ** When this variable is set, mutt will use file size attribute instead of
2964 ** access time when checking for new mail.
2967 + { "catchup_newsgroup", DT_QUAD, R_NONE, OPT_CATCHUP, M_ASKYES },
2970 + ** If this variable is \fIset\fP, Mutt will mark all articles in newsgroup
2971 + ** as read when you quit the newsgroup (catchup newsgroup).
2974 { "charset", DT_STR, R_NONE, UL &Charset, UL 0 },
2977 @@ -635,6 +657,16 @@ struct option_t MuttVars[] = {
2978 ** sent to both the list and your address, resulting in two copies
2979 ** of the same email for you.
2982 + { "followup_to_poster", DT_QUAD, R_NONE, OPT_FOLLOWUPTOPOSTER, M_ASKYES },
2985 + ** If this variable is \fIset\fP and the keyword "poster" is present in
2986 + ** \fIFollowup-To\fP header, follow-up to newsgroup function is not
2987 + ** permitted. The message will be mailed to the submitter of the
2988 + ** message via mail.
2991 { "force_name", DT_BOOL, R_NONE, OPTFORCENAME, 0 },
2994 @@ -706,6 +738,27 @@ struct option_t MuttVars[] = {
2995 ** a regular expression that will match the whole name so mutt will expand
2996 ** "Franklin" to "Franklin, Steve".
2999 + { "group_index_format", DT_STR, R_BOTH, UL &GroupFormat, UL "%4C %M%N %5s %-45.45f %d" },
3002 + ** This variable allows you to customize the newsgroup browser display to
3003 + ** your personal taste. This string is similar to ``$index_format'', but
3004 + ** has its own set of printf()-like sequences:
3007 + ** %C current newsgroup number
3008 + ** %d description of newsgroup (becomes from server)
3009 + ** %f newsgroup name
3010 + ** %M - if newsgroup not allowed for direct post (moderated for example)
3011 + ** %N N if newsgroup is new, u if unsubscribed, blank otherwise
3012 + ** %n number of new articles in newsgroup
3013 + ** %s number of unread articles in newsgroup
3014 + ** %>X right justify the rest of the string and pad with character "X"
3015 + ** %|X pad to the end of the line with character "X"
3019 { "hdr_format", DT_SYN, R_NONE, UL "index_format", 0 },
3022 @@ -996,6 +1049,7 @@ struct option_t MuttVars[] = {
3023 ** .dt %E .dd number of messages in current thread
3024 ** .dt %f .dd entire From: line (address + real name)
3025 ** .dt %F .dd author name, or recipient name if the message is from you
3026 + ** .dt %g .dd newsgroup name (if compiled with nntp support)
3027 ** .dt %H .dd spam attribute(s) of this message
3028 ** .dt %i .dd message-id of the current message
3029 ** .dt %l .dd number of lines in the message (does not work with maildir,
3030 @@ -1010,12 +1064,14 @@ struct option_t MuttVars[] = {
3031 ** .dt %O .dd (_O_riginal save folder) Where mutt would formerly have
3032 ** stashed the message: list name or recipient name if no list
3033 ** .dt %P .dd progress indicator for the builtin pager (how much of the file has been displayed)
3034 + ** .dt %R .dd `x-comment-to:' field (if present and compiled with nntp support)
3035 ** .dt %s .dd subject of the message
3036 ** .dt %S .dd status of the message (N/D/d/!/r/\(as)
3037 ** .dt %t .dd `to:' field (recipients)
3038 ** .dt %T .dd the appropriate character from the $$to_chars string
3039 ** .dt %u .dd user (login) name of the author
3040 ** .dt %v .dd first name of the author, or the recipient if the message is from you
3041 + ** .dt %W .dd name of organization of author (`organization:' field)
3042 ** .dt %X .dd number of attachments
3043 ** (please see the ``$attachments'' section for possible speed effects)
3044 ** .dt %y .dd `x-label:' field, if present
3045 @@ -1040,6 +1096,21 @@ struct option_t MuttVars[] = {
3047 ** See also: ``$$to_chars''.
3050 + { "inews", DT_PATH, R_NONE, UL &Inews, UL "" },
3053 + ** If set, specifies the program and arguments used to deliver news posted
3054 + ** by Mutt. Otherwise, mutt posts article using current connection to
3055 + ** news server. The following printf-style sequence is understood:
3058 + ** %s newsserver name
3061 + ** Example: set inews="/usr/local/bin/inews -hS"
3064 { "ispell", DT_PATH, R_NONE, UL &Ispell, UL ISPELL },
3067 @@ -1254,6 +1325,16 @@ struct option_t MuttVars[] = {
3068 ** be attached to the newly composed message if this option is set.
3072 + { "mime_subject", DT_BOOL, R_NONE, OPTMIMESUBJECT, 1 },
3075 + ** If \fIunset\fP, 8-bit ``subject:'' line in article header will not be
3076 + ** encoded according to RFC2047 to base64. This is useful when message
3077 + ** is Usenet article, because MIME for news is nonstandard feature.
3082 { "mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, UL "%4n %c %-16s %a" },
3084 @@ -1331,6 +1412,77 @@ struct option_t MuttVars[] = {
3085 ** See also ``$$read_inc'' and ``$$write_inc''.
3089 + { "news_cache_dir", DT_PATH, R_NONE, UL &NewsCacheDir, UL "~/.mutt" },
3092 + ** This variable pointing to directory where Mutt will save cached news
3093 + ** articles headers in. If \fIunset\fP, headers will not be saved at all
3094 + ** and will be reloaded each time when you enter to newsgroup.
3096 + { "news_server", DT_STR, R_NONE, UL &NewsServer, 0 },
3099 + ** This variable specifies domain name or address of NNTP server. It
3100 + ** defaults to the newsserver specified in the environment variable
3101 + ** $$$NNTPSERVER or contained in the file /etc/nntpserver. You can also
3102 + ** specify username and an alternative port for each newsserver, ie:
3104 + ** [news[s]://][username[:password]@]newsserver[:port]
3106 + { "newsrc", DT_PATH, R_NONE, UL &NewsRc, UL "~/.newsrc" },
3109 + ** The file, containing info about subscribed newsgroups - names and
3110 + ** indexes of read articles. The following printf-style sequence
3114 + ** %s newsserver name
3117 + { "nntp_context", DT_NUM, R_NONE, UL &NntpContext, 1000 },
3120 + ** This variable defines number of articles which will be in index when
3121 + ** newsgroup entered. If active newsgroup have more articles than this
3122 + ** number, oldest articles will be ignored. Also controls how many
3123 + ** articles headers will be saved in cache when you quit newsgroup.
3125 + { "nntp_load_description", DT_BOOL, R_NONE, OPTLOADDESC, 1 },
3128 + ** This variable controls whether or not descriptions for each newsgroup
3129 + ** must be loaded when newsgroup is added to list (first time list
3130 + ** loading or new newsgroup adding).
3132 + { "nntp_user", DT_STR, R_NONE, UL &NntpUser, UL "" },
3135 + ** Your login name on the NNTP server. If \fIunset\fP and NNTP server requires
3136 + ** authentification, Mutt will prompt you for your account name when you
3137 + ** connect to newsserver.
3139 + { "nntp_pass", DT_STR, R_NONE, UL &NntpPass, UL "" },
3142 + ** Your password for NNTP account.
3144 + { "nntp_poll", DT_NUM, R_NONE, UL &NewsPollTimeout, 60 },
3147 + ** The time in seconds until any operations on newsgroup except post new
3148 + ** article will cause recheck for new news. If set to 0, Mutt will
3149 + ** recheck newsgroup on each operation in index (stepping, read article,
3152 + { "nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, M_ASKYES },
3155 + ** Controls whether or not Mutt will try to reconnect to newsserver when
3156 + ** connection lost.
3159 { "pager", DT_PATH, R_NONE, UL &Pager, UL "builtin" },
3162 @@ -2141,6 +2293,16 @@ struct option_t MuttVars[] = {
3163 { "post_indent_str", DT_SYN, R_NONE, UL "post_indent_string", 0 },
3167 + { "post_moderated", DT_QUAD, R_NONE, OPT_TOMODERATED, M_ASKYES },
3170 + ** If set to \fIyes\fP, Mutt will post article to newsgroup that have
3171 + ** not permissions to posting (e.g. moderated). \fBNote:\fP if newsserver
3172 + ** does not support posting to that newsgroup or totally read-only, that
3173 + ** posting will not have an effect.
3176 { "postpone", DT_QUAD, R_NONE, OPT_POSTPONE, M_ASKYES },
3179 @@ -2497,6 +2659,28 @@ struct option_t MuttVars[] = {
3180 ** Command to use when spawning a subshell. By default, the user's login
3181 ** shell from /etc/passwd is used.
3184 + { "save_unsubscribed",DT_BOOL, R_NONE, OPTSAVEUNSUB, 0 },
3187 + ** When \fIset\fP, info about unsubscribed newsgroups will be saved into
3188 + ** ``newsrc'' file and into cache.
3190 + { "show_new_news", DT_BOOL, R_NONE, OPTSHOWNEWNEWS, 1 },
3193 + ** If \fIset\fP, newsserver will be asked for new newsgroups on entering
3194 + ** the browser. Otherwise, it will be done only once for a newsserver.
3195 + ** Also controls whether or not number of new articles of subscribed
3196 + ** newsgroups will be then checked.
3198 + { "show_only_unread", DT_BOOL, R_NONE, OPTSHOWONLYUNREAD, 0 },
3201 + ** If \fIset\fP, only subscribed newsgroups that contain unread articles
3202 + ** will be displayed in browser.
3205 { "sig_dashes", DT_BOOL, R_NONE, OPTSIGDASHES, 1 },
3208 @@ -3005,6 +3189,14 @@ struct option_t MuttVars[] = {
3209 ** option does nothing: mutt will never write out the BCC header
3213 + { "x_comment_to", DT_BOOL, R_NONE, OPTXCOMMENTTO, 0 },
3216 + ** If \fIset\fP, Mutt will add ``X-Comment-To:'' field (that contains full
3217 + ** name of original article author) to article that followuped to newsgroup.
3223 diff -udprP mutt-1.5.16.orig/mailbox.h mutt-1.5.16/mailbox.h
3224 --- mutt-1.5.16.orig/mailbox.h 2007-04-02 00:58:56.000000000 +0300
3225 +++ mutt-1.5.16/mailbox.h 2007-06-15 17:12:26.000000000 +0300
3226 @@ -74,6 +74,9 @@ int mx_is_imap (const char *);
3228 int mx_is_pop (const char *);
3231 +int mx_is_nntp (const char *);
3234 int mx_access (const char*, int);
3235 int mx_check_empty (const char *);
3236 diff -udprP mutt-1.5.16.orig/main.c mutt-1.5.16/main.c
3237 --- mutt-1.5.16.orig/main.c 2007-04-10 23:53:08.000000000 +0300
3238 +++ mutt-1.5.16/main.c 2007-06-15 17:12:26.000000000 +0300
3240 #include <stringprep.h>
3247 static const char *ReachingUs = N_("\
3248 To contact the developers, please mail to <mutt-dev@mutt.org>.\n\
3249 To report a bug, please visit http://bugs.mutt.org/.\n");
3250 @@ -127,6 +131,8 @@ options:\n\
3251 " -e <command>\tspecify a command to be executed after initialization\n\
3252 -f <file>\tspecify which mailbox to read\n\
3253 -F <file>\tspecify an alternate muttrc file\n\
3254 + -g <server>\tspecify a newsserver (if compiled with NNTP)\n\
3255 + -G\t\tselect a newsgroup (if compiled with NNTP)\n\
3256 -H <file>\tspecify a draft file to read header and body from\n\
3257 -i <file>\tspecify a file which Mutt should include in the body\n\
3258 -m <type>\tspecify a default mailbox type\n\
3259 @@ -253,6 +259,12 @@ static void show_version (void)
3272 @@ -521,6 +533,9 @@ static void start_curses (void)
3273 #define M_NOSYSRC (1<<2) /* -n */
3274 #define M_RO (1<<3) /* -R */
3275 #define M_SELECT (1<<4) /* -y */
3277 +#define M_NEWS (1<<5) /* -g and -G */
3280 int main (int argc, char **argv)
3282 @@ -577,7 +592,11 @@ int main (int argc, char **argv)
3287 + while ((i = getopt (argc, argv, "A:a:b:F:f:c:Dd:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF)
3289 while ((i = getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF)
3294 @@ -670,6 +689,20 @@ int main (int argc, char **argv)
3299 + case 'g': /* Specify a newsserver */
3301 + char buf[LONG_STRING];
3303 + snprintf (buf, sizeof (buf), "set news_server=%s", optarg);
3304 + commands = mutt_add_list (commands, buf);
3307 + case 'G': /* List of newsgroups */
3308 + flags |= M_SELECT | M_NEWS;
3315 @@ -947,6 +980,18 @@ int main (int argc, char **argv)
3317 else if (flags & M_SELECT)
3320 + if (flags & M_NEWS)
3322 + set_option (OPTNEWS);
3323 + if(!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)))
3325 + mutt_endwin (Errorbuf);
3332 mutt_endwin _("No incoming mailboxes defined.");
3334 @@ -962,6 +1007,15 @@ int main (int argc, char **argv)
3337 strfcpy (folder, NONULL(Spoolfile), sizeof (folder));
3340 + if (option (OPTNEWS))
3342 + unset_option (OPTNEWS);
3343 + nntp_expand_path (folder, sizeof (folder), &CurrentNewsSrv->conn->account);
3347 mutt_expand_path (folder, sizeof (folder));
3349 mutt_str_replace (&CurrentFolder, folder);
3350 diff -udprP mutt-1.5.16.orig/mutt.h mutt-1.5.16/mutt.h
3351 --- mutt-1.5.16.orig/mutt.h 2007-04-11 06:14:01.000000000 +0300
3352 +++ mutt-1.5.16/mutt.h 2007-06-15 17:12:26.000000000 +0300
3353 @@ -243,6 +243,9 @@ enum
3361 /* Options for Mailcap lookup */
3363 @@ -298,6 +301,12 @@ enum
3366 OPT_VERIFYSIG, /* verify PGP signatures */
3369 + OPT_NNTPRECONNECT,
3371 + OPT_FOLLOWUPTOPOSTER,
3372 +#endif /* USE_NNTP */
3374 /* THIS MUST BE THE LAST VALUE. */
3376 @@ -313,6 +322,7 @@ enum
3377 #define SENDMAILX (1<<6)
3378 #define SENDKEY (1<<7)
3379 #define SENDRESEND (1<<8)
3380 +#define SENDNEWS (1<<9)
3382 /* flags to _mutt_select_file() */
3383 #define M_SEL_BUFFY (1<<0)
3384 @@ -332,6 +342,8 @@ enum
3393 @@ -407,6 +419,9 @@ enum
3398 + OPTMIMESUBJECT, /* encode subject line with RFC2047 */
3403 @@ -488,6 +503,16 @@ enum
3407 + /* news options */
3411 + OPTSHOWONLYUNREAD,
3415 +#endif /* USE_NNTP */
3417 /* pseudo options */
3419 OPTAUXSORT, /* (pseudo) using auxillary sort function */
3420 @@ -508,6 +533,7 @@ enum
3421 OPTSORTSUBTHREADS, /* (pseudo) used when $sort_aux changes */
3422 OPTNEEDRESCORE, /* (pseudo) set when the `score' command is used */
3423 OPTATTACHMSG, /* (pseudo) used by attach-message */
3424 + OPTHIDEREAD, /* (pseudo) whether or not hide read messages */
3425 OPTKEEPQUIET, /* (pseudo) shut up the message and refresh
3426 * functions while we are executing an
3428 @@ -518,6 +544,12 @@ enum
3429 OPTDONTHANDLEPGPKEYS, /* (pseudo) used to extract PGP keys */
3430 OPTUNBUFFEREDINPUT, /* (pseudo) don't use key buffer */
3433 + OPTNEWS, /* (pseudo) used to change reader mode */
3434 + OPTNEWSSEND, /* (pseudo) used to change behavior when posting */
3435 + OPTNEWSCACHE, /* (pseudo) used to indicate if news cache exist */
3441 @@ -595,6 +627,13 @@ typedef struct envelope
3445 + char *organization;
3449 + char *followup_to;
3450 + char *x_comment_to;
3453 LIST *references; /* message references (in reverse order) */
3454 LIST *in_reply_to; /* in-reply-to header content */
3455 @@ -761,6 +800,9 @@ typedef struct header
3456 ENVELOPE *env; /* envelope information */
3457 BODY *content; /* list of MIME parts */
3463 char *tree; /* character string to print thread tree */
3464 struct thread *thread;
3465 @@ -776,7 +818,7 @@ typedef struct header
3466 int refno; /* message number on server */
3469 -#if defined USE_POP || defined USE_IMAP
3470 +#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
3471 void *data; /* driver-specific data */
3474 diff -udprP mutt-1.5.16.orig/muttlib.c mutt-1.5.16/muttlib.c
3475 --- mutt-1.5.16.orig/muttlib.c 2007-05-14 20:10:00.000000000 +0300
3476 +++ mutt-1.5.16/muttlib.c 2007-06-15 17:12:26.000000000 +0300
3477 @@ -286,7 +286,7 @@ void mutt_free_header (HEADER **h)
3479 mutt_free_list (&(*h)->chain);
3481 -#if defined USE_POP || defined USE_IMAP
3482 +#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
3485 FREE (h); /* __FREE_CHECKED__ */
3486 @@ -674,6 +674,13 @@ void mutt_free_envelope (ENVELOPE **p)
3487 FREE (&(*p)->supersedes);
3489 FREE (&(*p)->x_label);
3490 + FREE (&(*p)->organization);
3492 + FREE (&(*p)->newsgroups);
3493 + FREE (&(*p)->xref);
3494 + FREE (&(*p)->followup_to);
3495 + FREE (&(*p)->x_comment_to);
3498 mutt_buffer_free (&(*p)->spam);
3500 @@ -1394,6 +1401,14 @@ int mutt_save_confirm (const char *s, st
3505 + if (magic == M_NNTP)
3507 + mutt_error _("Can't save message to newsserver.");
3512 if (stat (s, st) != -1)
3515 diff -udprP mutt-1.5.16.orig/mx.c mutt-1.5.16/mx.c
3516 --- mutt-1.5.16.orig/mx.c 2007-04-03 20:41:14.000000000 +0300
3517 +++ mutt-1.5.16/mx.c 2007-06-15 17:12:26.000000000 +0300
3518 @@ -348,6 +348,22 @@ int mx_is_pop (const char *p)
3523 +int mx_is_nntp (const char *p)
3525 + url_scheme_t scheme;
3530 + scheme = url_check_scheme (p);
3531 + if (scheme == U_NNTP || scheme == U_NNTPS)
3538 int mx_get_magic (const char *path)
3541 @@ -365,6 +381,11 @@ int mx_get_magic (const char *path)
3543 #endif /* USE_POP */
3546 + if (mx_is_nntp (path))
3548 +#endif /* USE_NNTP */
3550 if (stat (path, &st) == -1)
3552 dprint (1, (debugfile, "mx_get_magic(): unable to stat %s: %s (errno %d).\n",
3553 @@ -704,6 +725,12 @@ CONTEXT *mx_open_mailbox (const char *pa
3555 #endif /* USE_POP */
3559 + rc = nntp_open_mailbox (ctx);
3561 +#endif /* USE_NNTP */
3566 @@ -796,6 +823,12 @@ static int sync_mailbox (CONTEXT *ctx, i
3567 rc = pop_sync_mailbox (ctx, index_hint);
3569 #endif /* USE_POP */
3573 + rc = nntp_sync_mailbox (ctx);
3575 +#endif /* USE_NNTP */
3579 @@ -822,6 +855,16 @@ int mx_close_mailbox (CONTEXT *ctx, int
3584 + if (ctx->magic == M_NNTP)
3588 + ret = nntp_close_mailbox (ctx);
3589 + mx_fastclose_mailbox (ctx);
3593 if (ctx->readonly || ctx->dontwrite)
3595 /* mailbox is readonly or we don't want to write */
3596 @@ -1359,6 +1402,11 @@ int mx_check_mailbox (CONTEXT *ctx, int
3598 return (pop_check_mailbox (ctx, index_hint));
3599 #endif /* USE_POP */
3603 + return (nntp_check_mailbox (ctx));
3604 +#endif /* USE_NNTP */
3608 @@ -1419,6 +1467,15 @@ MESSAGE *mx_open_message (CONTEXT *ctx,
3610 #endif /* USE_POP */
3615 + if (nntp_fetch_message (msg, ctx, msgno) != 0)
3619 +#endif /* USE_NNTP */
3622 dprint (1, (debugfile, "mx_open_message(): function not implemented for mailbox type %d.\n", ctx->magic));
3624 @@ -1500,6 +1557,9 @@ int mx_close_message (MESSAGE **msg)
3626 || (*msg)->magic == M_POP
3629 + || (*msg)->magic == M_NNTP
3633 r = safe_fclose (&(*msg)->fp);
3634 diff -udprP mutt-1.5.16.orig/mx.h mutt-1.5.16/mx.h
3635 --- mutt-1.5.16.orig/mx.h 2007-04-02 00:58:56.000000000 +0300
3636 +++ mutt-1.5.16/mx.h 2007-06-15 17:12:26.000000000 +0300
3637 @@ -40,6 +40,9 @@ enum
3646 WHERE short DefaultMagic INITVAL (M_MBOX);
3647 diff -udprP mutt-1.5.16.orig/newsrc.c mutt-1.5.16/newsrc.c
3648 --- mutt-1.5.16.orig/newsrc.c 1970-01-01 03:00:00.000000000 +0300
3649 +++ mutt-1.5.16/newsrc.c 2007-06-15 17:12:26.000000000 +0300
3652 + * Copyright (C) 1998 Brandon Long <blong@fiction.net>
3653 + * Copyright (C) 1999 Andrej Gritsenko <andrej@lucky.net>
3654 + * Copyright (C) 2000-2007 Vsevolod Volkov <vvv@mutt.org.ua>
3656 + * This program is free software; you can redistribute it and/or modify
3657 + * it under the terms of the GNU General Public License as published by
3658 + * the Free Software Foundation; either version 2 of the License, or
3659 + * (at your option) any later version.
3661 + * This program is distributed in the hope that it will be useful,
3662 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3663 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3664 + * GNU General Public License for more details.
3666 + * You should have received a copy of the GNU General Public License
3667 + * along with this program; if not, write to the Free Software
3668 + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
3672 +# include "config.h"
3676 +#include "mutt_curses.h"
3680 +#include "mailbox.h"
3682 +#include "rfc822.h"
3683 +#include "rfc1524.h"
3684 +#include "rfc2047.h"
3686 +#include <unistd.h>
3687 +#include <string.h>
3689 +#include <stdlib.h>
3690 +#include <sys/stat.h>
3692 +void nntp_add_to_list (NNTP_SERVER *s, NNTP_DATA *d)
3699 + l = safe_calloc (1, sizeof (LIST));
3701 + s->tail->next = l;
3705 + l->data = (void *) d;
3708 +static int nntp_parse_newsrc_line (NNTP_SERVER *news, char *line)
3711 + char group[LONG_STRING];
3713 + char *p = line, *b, *h;
3723 + while (*p && (*p != ':' && *p != '!')) p++;
3726 + len = p + 1 - line;
3727 + if (len > sizeof (group))
3728 + len = sizeof (group);
3729 + strfcpy (group, line, len);
3730 + if ((data = (NNTP_DATA *)hash_find (news->newsgroups, group)) == NULL)
3732 + data = (NNTP_DATA *) safe_calloc (1, sizeof (NNTP_DATA) + strlen (group) + 1);
3733 + data->group = (char *) data + sizeof (NNTP_DATA);
3734 + strcpy (data->group, group);
3735 + data->nserv = news;
3736 + data->deleted = 1;
3737 + if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
3738 + news->newsgroups = hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
3739 + hash_insert (news->newsgroups, data->group, data, 0);
3740 + nntp_add_to_list (news, data);
3743 + FREE ((void **) &data->entries);
3746 + data->entries = safe_calloc (x*2, sizeof (NEWSRC_ENTRY));
3750 + data->subscribed = 1;
3752 + data->subscribed = 0;
3759 + while (*p && *p != ',' && *p != '\n') p++;
3765 + if ((h = strchr(b, '-')))
3769 + data->entries[x].first = atoi(b);
3770 + data->entries[x].last = atoi(h);
3774 + data->entries[x].first = atoi(b);
3775 + data->entries[x].last = data->entries[x].first;
3778 + if (data->entries[x].last != 0)
3781 + if (x && !data->lastMessage)
3782 + data->lastMessage = data->entries[x-1].last;
3784 + mutt_newsgroup_stat (data);
3785 + dprint (2, (debugfile, "parse_line: Newsgroup %s\n", data->group));
3790 +static int slurp_newsrc (NNTP_SERVER *news)
3796 + news->stat = stat (news->newsrc, &sb);
3797 + news->size = sb.st_size;
3798 + news->mtime = sb.st_mtime;
3800 + if ((fp = safe_fopen (news->newsrc, "r")) == NULL)
3802 + /* hmm, should we use dotlock? */
3803 + if (mx_lock_file (news->newsrc, fileno (fp), 0, 0, 1))
3809 + buf = safe_malloc (sb.st_size + 1);
3810 + while (sb.st_size && fgets (buf, sb.st_size + 1, fp))
3811 + nntp_parse_newsrc_line (news, buf);
3814 + mx_unlock_file (news->newsrc, fileno (fp), 0);
3819 +void nntp_cache_expand (char *dst, const char *src)
3821 + snprintf (dst, _POSIX_PATH_MAX, "%s/%s", NewsCacheDir, src);
3822 + mutt_expand_path (dst, _POSIX_PATH_MAX);
3825 +/* Loads $news_cache_dir/.index into memory, loads newsserver data
3826 + * and newsgroup cache names */
3827 +static int nntp_parse_cacheindex (NNTP_SERVER *news)
3830 + char buf[HUGE_STRING], *cp;
3831 + char dir[_POSIX_PATH_MAX], file[_POSIX_PATH_MAX];
3836 + /* check is server name defined or not */
3837 + if (!news || !news->conn || !news->conn->account.host)
3839 + unset_option (OPTNEWSCACHE);
3840 + if (!NewsCacheDir || !*NewsCacheDir)
3843 + strfcpy (dir, NewsCacheDir, sizeof (dir));
3844 + mutt_expand_path (dir, sizeof(dir));
3846 + if (lstat (dir, &st) || (st.st_mode & S_IFDIR) == 0)
3848 + snprintf (buf, sizeof(buf), _("Directory %s not exist. Create it?"), dir);
3849 + if (mutt_yesorno (buf, M_YES) != M_YES || mkdir (dir, (S_IRWXU+S_IRWXG+
3852 + mutt_error _("Cache directory not created!");
3855 + mutt_clear_error();
3858 + set_option (OPTNEWSCACHE);
3860 + FREE (&news->cache);
3861 + snprintf (buf, sizeof(buf), "%s/.index", dir);
3862 + if (!(index = safe_fopen (buf, "a+")))
3865 + while (fgets (buf, sizeof(buf), index))
3867 + buf[strlen(buf) - 1] = 0; /* strip ending '\n' */
3868 + if (!mutt_strncmp (buf, "#: ", 3) &&
3869 + !mutt_strcasecmp (buf+3, news->conn->account.host))
3872 + while (fgets (buf, sizeof(buf), index))
3875 + while (*cp && *cp != ' ') cp++;
3876 + if (!*cp) continue;
3878 + if (!mutt_strcmp (buf, "#:"))
3880 + sscanf (cp + 1, "%s %d %d", file, &l, &m);
3881 + if (!mutt_strcmp (buf, "ALL"))
3883 + news->cache = safe_strdup (file);
3884 + news->newgroups_time = m;
3886 + else if (news->newsgroups)
3888 + if ((data = (NNTP_DATA *)hash_find (news->newsgroups, buf)) == NULL)
3890 + data = (NNTP_DATA *) safe_calloc (1, sizeof (NNTP_DATA) + strlen (buf) + 1);
3891 + data->group = (char *) data + sizeof (NNTP_DATA);
3892 + strcpy(data->group, buf);
3893 + data->nserv = news;
3894 + data->deleted = 1;
3895 + if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
3896 + news->newsgroups = hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
3897 + hash_insert (news->newsgroups, data->group, data, 0);
3898 + nntp_add_to_list (news, data);
3900 + data->cache = safe_strdup (file);
3902 + if (!data->firstMessage || data->lastMessage < m)
3904 + if (!data->firstMessage)
3905 + data->firstMessage = l;
3906 + if (data->lastMessage < m)
3907 + data->lastMessage = m;
3908 + data->lastCached = m;
3909 + if (t || !data->unread)
3910 + mutt_newsgroup_stat (data);
3918 +nntp_format_str (char *dest, size_t destlen, char op, const char *src,
3919 + const char *fmt, const char *ifstring, const char *elsestring,
3920 + unsigned long data, format_flag flags)
3922 + char fn[SHORT_STRING], tmp[SHORT_STRING];
3927 + strncpy (fn, NewsServer, sizeof(fn) - 1);
3928 + mutt_strlower (fn);
3929 + snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
3930 + snprintf (dest, destlen, tmp, fn);
3936 +/* nntp_parse_url: given an NNPT URL, return host, port,
3937 + * username, password and newsgroup will recognise. */
3938 +int nntp_parse_url (const char *server, ACCOUNT *acct,
3939 + char *group, size_t group_len)
3947 + acct->port = NNTP_PORT;
3948 + acct->type = M_ACCT_TYPE_NNTP;
3950 + c = safe_strdup (server);
3951 + url_parse_ciss (&url, c);
3953 + if (url.scheme == U_NNTP || url.scheme == U_NNTPS)
3955 + if (url.scheme == U_NNTPS)
3957 + acct->flags |= M_ACCT_SSL;
3958 + acct->port = NNTP_SSL_PORT;
3963 + strfcpy (group, url.path, group_len);
3965 + ret = mutt_account_fromurl (acct, &url);
3972 +void nntp_expand_path (char *line, size_t len, ACCOUNT *acct)
3976 + url.path = safe_strdup (line);
3977 + mutt_account_tourl (acct, &url);
3978 + url_ciss_tostring (&url, line, len, 0);
3983 + * Automatically loads a newsrc into memory, if necessary.
3984 + * Checks the size/mtime of a newsrc file, if it doesn't match, load
3985 + * again. Hmm, if a system has broken mtimes, this might mean the file
3986 + * is reloaded every time, which we'd have to fix.
3988 + * a newsrc file is a line per newsgroup, with the newsgroup, then a
3989 + * ':' denoting subscribed or '!' denoting unsubscribed, then a
3990 + * comma separated list of article numbers and ranges.
3992 +NNTP_SERVER *mutt_select_newsserver (char *server)
3994 + char file[_POSIX_PATH_MAX];
3998 + NNTP_SERVER *serv;
4001 + if (!server || !*server)
4003 + mutt_error _("No newsserver defined!");
4007 + buf = p = safe_calloc (strlen (server) + 10, sizeof (char));
4008 + if (url_check_scheme (server) == U_UNKNOWN)
4010 + strcpy (buf, "news://");
4011 + p = strchr (buf, '\0');
4013 + strcpy (p, server);
4015 + if ((nntp_parse_url (buf, &acct, file, sizeof (file))) < 0 || *file)
4018 + mutt_error (_("%s is an invalid newsserver specification!"), server);
4023 + conn = mutt_conn_find (NULL, &acct);
4027 + mutt_FormatString (file, sizeof (file), 0, NONULL (NewsRc), nntp_format_str, 0, 0);
4028 + mutt_expand_path (file, sizeof (file));
4030 + serv = (NNTP_SERVER *)conn->data;
4035 + /* externally modified? */
4036 + if (serv->stat != stat (file, &sb) || (!serv->stat &&
4037 + (serv->size != sb.st_size || serv->mtime != sb.st_mtime)))
4039 + for (list = serv->list; list; list = list->next)
4041 + NNTP_DATA *data = (NNTP_DATA *) list->data;
4045 + data->subscribed = 0;
4050 + slurp_newsrc (serv);
4051 + nntp_clear_cacheindex (serv);
4054 + if (serv->status == NNTP_BYE)
4055 + serv->status = NNTP_NONE;
4056 + nntp_check_newgroups (serv, 0);
4060 + /* New newsserver */
4061 + serv = safe_calloc (1, sizeof (NNTP_SERVER));
4062 + serv->conn = conn;
4063 + serv->newsrc = safe_strdup (file);
4064 + serv->newsgroups = hash_create (1009);
4065 + slurp_newsrc (serv); /* load .newsrc */
4066 + nntp_parse_cacheindex (serv); /* load .index */
4067 + if (option (OPTNEWSCACHE) && serv->cache && nntp_get_cache_all (serv) >= 0)
4068 + nntp_check_newgroups (serv, 1);
4069 + else if (nntp_get_active (serv) < 0)
4071 + hash_destroy (&serv->newsgroups, nntp_delete_data);
4072 + for (list = serv->list; list; list = list->next)
4073 + list->data = NULL;
4074 + mutt_free_list (&serv->list);
4075 + FREE (&serv->newsrc);
4076 + FREE (&serv->cache);
4080 + nntp_clear_cacheindex (serv);
4081 + conn->data = (void *)serv;
4087 + * full status flags are not supported by nntp, but we can fake some
4088 + * of them. This is how:
4089 + * Read = a read message number is in the .newsrc
4090 + * New = a message is new since we last read this newsgroup
4091 + * Old = anything else
4092 + * So, Read is marked as such in the newsrc, old is anything that is
4093 + * "skipped" in the newsrc, and new is anything not in the newsrc nor
4094 + * in the cache. By skipped, I mean before the last unread message
4096 +void nntp_get_status (CONTEXT *ctx, HEADER *h, char *group, int article)
4098 + NNTP_DATA *data = (NNTP_DATA *) ctx->data;
4102 + data = (NNTP_DATA *) hash_find (data->nserv->newsgroups, group);
4108 + dprint (3, (debugfile, "newsgroup %s not found\n", group));
4113 + for (x = 0; x < data->num; x++)
4115 + if ((article >= data->entries[x].first) &&
4116 + (article <= data->entries[x].last))
4118 + /* we cannot use mutt_set_flag() because mx_update_context()
4119 + didn't called yet */
4124 + /* If article was not cached yet, it is new! :) */
4125 + if (!data->cache || article > data->lastCached)
4127 + /* Old articles are articles which aren't read but an article after them
4128 + * has been cached */
4129 + if (option (OPTMARKOLD))
4133 +void mutt_newsgroup_stat (NNTP_DATA *data)
4136 + unsigned int first, last;
4139 + if (data->lastMessage == 0 || data->firstMessage > data->lastMessage)
4142 + data->unread = data->lastMessage - data->firstMessage + 1;
4143 + for (i = 0; i < data->num; i++)
4145 + first = data->entries[i].first;
4146 + if (first < data->firstMessage)
4147 + first = data->firstMessage;
4148 + last = data->entries[i].last;
4149 + if (last > data->lastMessage)
4150 + last = data->lastMessage;
4151 + if (first <= last)
4152 + data->unread -= last - first + 1;
4156 +static int puti (char *line, int num)
4160 + for (p = s; num; )
4162 + *p++ = '0' + num % 10;
4166 + *line++ = *--p, num++;
4171 +static void nntp_create_newsrc_line (NNTP_DATA *data, char **buf, char **pline, size_t *buflen)
4173 + char *line = *pline;
4174 + size_t len = *buflen - (*pline - *buf);
4177 + if (len < LONG_STRING * 10)
4182 + safe_realloc (buf, *buflen);
4183 + line = *buf + (*pline - line);
4185 + strcpy (line, data->group);
4186 + len -= strlen (line) + 1;
4187 + line += strlen (line);
4188 + *line++ = data->subscribed ? ':' : '!';
4192 + for (x = 0; x < data->num; x++)
4194 + if (len < LONG_STRING)
4200 + safe_realloc (buf, *buflen);
4201 + line = *buf + (*pline - line);
4210 + if (data->entries[x].first == data->entries[x].last)
4211 + snprintf (line, len, "%d%n", data->entries[x].first, &i);
4213 + snprintf (line, len, "%d-%d%n",
4214 + data->entries[x].first, data->entries[x].last, &i);
4218 + i = puti (line, data->entries[x].first);
4219 + line +=i; len -= i;
4220 + if (data->entries[x].first != data->entries[x].last)
4224 + i = puti (line, data->entries[x].last);
4225 + line +=i; len -= i;
4234 +void newsrc_gen_entries (CONTEXT *ctx)
4236 + NNTP_DATA *data = (NNTP_DATA *)ctx->data;
4238 + unsigned int last = 0, first = 1;
4239 + int save_sort = SORT_ORDER;
4241 + if (Sort != SORT_ORDER)
4244 + Sort = SORT_ORDER;
4245 + mutt_sort_headers (ctx, 0);
4250 + data->entries = safe_calloc (5, sizeof (NEWSRC_ENTRY));
4255 + * Set up to fake initial sequence from 1 to the article before the
4256 + * first article in our list
4261 + for (x = 0; x < ctx->msgcount; x++)
4263 + if (series) /* search for first unread */
4266 + * We don't actually check sequential order, since we mark
4267 + * "missing" entries as read/deleted
4269 + last = ctx->hdrs[x]->article_num;
4270 + if (last >= data->firstMessage && !ctx->hdrs[x]->deleted &&
4271 + !ctx->hdrs[x]->read)
4273 + if (data->num >= data->max)
4275 + data->max = data->max * 2;
4276 + safe_realloc (&data->entries,
4277 + data->max * sizeof (NEWSRC_ENTRY));
4279 + data->entries[data->num].first = first;
4280 + data->entries[data->num].last = last - 1;
4285 + else /* search for first read */
4287 + if (ctx->hdrs[x]->deleted || ctx->hdrs[x]->read)
4292 + last = ctx->hdrs[x]->article_num;
4295 + if (series && first <= data->lastLoaded)
4297 + if (data->num >= data->max)
4299 + data->max = data->max * 2;
4300 + safe_realloc (&data->entries,
4301 + data->max * sizeof (NEWSRC_ENTRY));
4303 + data->entries[data->num].first = first;
4304 + data->entries[data->num].last = data->lastLoaded;
4308 + if (save_sort != Sort)
4311 + mutt_sort_headers (ctx, 0);
4315 +static int mutt_update_list_file (char *filename, char *section,
4316 + char *key, char *line)
4320 + char buf[HUGE_STRING];
4321 + char tmpfile[_POSIX_PATH_MAX];
4323 + int ext = 0, done = 0, r = 0;
4325 + /* if file not exist, create it */
4326 + if ((ifp = safe_fopen (filename, "a")))
4328 + dprint (1, (debugfile, "Opening %s\n", filename));
4329 + if (!(ifp = safe_fopen (filename, "r")))
4331 + mutt_error (_("Unable to open %s for reading"), filename);
4334 + if (mx_lock_file (filename, fileno (ifp), 0, 0, 1))
4337 + mutt_error (_("Unable to lock %s"), filename);
4340 + snprintf (tmpfile, sizeof(tmpfile), "%s.tmp", filename);
4341 + dprint (1, (debugfile, "Opening %s\n", tmpfile));
4342 + if (!(ofp = fopen (tmpfile, "w")))
4345 + mutt_error (_("Unable to open %s for writing"), tmpfile);
4351 + while (r != EOF && !done && fgets (buf, sizeof (buf), ifp))
4353 + r = fputs (buf, ofp);
4355 + while (*c && *c != '\n') c++;
4356 + c[0] = 0; /* strip EOL */
4357 + if (!strncmp (buf, "#: ", 3) && !mutt_strcasecmp (buf+3, section))
4360 + if (r != EOF && !done)
4362 + snprintf (buf, sizeof(buf), "#: %s\n", section);
4363 + r = fputs (buf, ofp);
4368 + while (r != EOF && fgets (buf, sizeof (buf), ifp))
4373 + while (*c && (*c != '\r') && (*c != '\n')) c++;
4375 + if (*c != '\\') ext = 0;
4377 + else if ((section && !strncmp (buf, "#: ", 3)))
4379 + if (!done && line)
4381 + fputs (line, ofp);
4382 + fputc ('\n', ofp);
4384 + r = fputs (buf, ofp);
4388 + else if (key && !strncmp (buf, key, strlen(key)) &&
4389 + (!*key || buf[strlen(key)] == ' '))
4393 + while (*c && (*c != '\r') && (*c != '\n')) c++;
4395 + if (*c == '\\') ext = 1;
4396 + if (!done && line)
4398 + r = fputs (line, ofp);
4400 + r = fputc ('\n', ofp);
4406 + r = fputs (buf, ofp);
4410 + while (r != EOF && fgets (buf, sizeof (buf), ifp))
4411 + r = fputs (buf, ofp);
4413 + /* If there wasn't a line to replace, put it on the end of the file */
4414 + if (r != EOF && !done && line)
4416 + fputs (line, ofp);
4417 + r = fputc ('\n', ofp);
4419 + mx_unlock_file (filename, fileno (ifp), 0);
4425 + mutt_error (_("Can't write %s"), tmpfile);
4428 + if (rename (tmpfile, filename) < 0)
4431 + mutt_error (_("Can't rename %s to %s"), tmpfile, filename);
4437 +int mutt_newsrc_update (NNTP_SERVER *news)
4447 + llen = len = 10 * LONG_STRING;
4448 + line = buf = safe_calloc (1, len);
4449 + /* we will generate full newsrc here */
4450 + for (tmp = news->list; tmp; tmp = tmp->next)
4452 + data = (NNTP_DATA *) tmp->data;
4453 + if (!data || !data->rc)
4455 + nntp_create_newsrc_line (data, &buf, &line, &llen);
4457 + dprint (2, (debugfile, "Added to newsrc: %s\n", line));
4458 + line += strlen (line);
4460 + /* newrc being fully rewritten */
4461 + if (news->newsrc &&
4462 + (r = mutt_update_list_file (news->newsrc, NULL, "", buf)) == 0)
4466 + stat (news->newsrc, &st);
4467 + news->size = st.st_size;
4468 + news->mtime = st.st_mtime;
4474 +static FILE *mutt_mkname (char *s)
4476 + char buf[_POSIX_PATH_MAX], *pc;
4480 + nntp_cache_expand (buf, s);
4481 + if ((fp = safe_fopen (buf, "w")))
4484 + nntp_cache_expand (buf, "cache-XXXXXX");
4485 + pc = buf + strlen (buf) - 12; /* positioning to "cache-XXXXXX" */
4486 + if ((fd = mkstemp (buf)) == -1)
4488 + strcpy (s, pc); /* generated name */
4489 + return fdopen (fd, "w");
4492 +/* Updates info into .index file: ALL or about selected newsgroup */
4493 +static int nntp_update_cacheindex (NNTP_SERVER *serv, NNTP_DATA *data)
4495 + char buf[LONG_STRING], *key = "ALL";
4496 + char file[_POSIX_PATH_MAX];
4498 + if (!serv || !serv->conn || !serv->conn->account.host)
4501 + if (data && data->group)
4503 + key = data->group;
4504 + snprintf (buf, sizeof (buf), "%s %s %d %d", key, data->cache,
4505 + data->firstMessage, data->lastLoaded);
4509 + strfcpy (file, serv->cache, sizeof (file));
4510 + snprintf (buf, sizeof (buf), "ALL %s 0 %d", file, (int)serv->newgroups_time);
4512 + nntp_cache_expand (file, ".index");
4513 + return mutt_update_list_file (file, serv->conn->account.host, key, buf);
4516 +/* Remove cache files of unsubscribed newsgroups */
4517 +void nntp_clear_cacheindex (NNTP_SERVER *news)
4522 + if (option (OPTSAVEUNSUB) || !news)
4525 + for (tmp = news->list; tmp; tmp = tmp->next)
4527 + data = (NNTP_DATA *) tmp->data;
4528 + if (!data || data->subscribed || !data->cache)
4530 + nntp_delete_cache (data);
4531 + dprint (2, (debugfile, "Removed from .index: %s\n", data->group));
4536 +int nntp_save_cache_index (NNTP_SERVER *news)
4538 + char buf[HUGE_STRING];
4539 + char file[_POSIX_PATH_MAX];
4544 + if (!news || !news->newsgroups)
4546 + if (!option (OPTNEWSCACHE))
4551 + nntp_cache_expand (file, news->cache);
4553 + f = safe_fopen (file, "w");
4557 + strfcpy (buf, news->conn->account.host, sizeof(buf));
4558 + f = mutt_mkname (buf);
4559 + news->cache = safe_strdup (buf);
4560 + nntp_cache_expand (file, buf);
4565 + for (l = news->list; l; l = l->next)
4567 + if ((d = (NNTP_DATA *)l->data) && !d->deleted)
4570 + snprintf (buf, sizeof(buf), "%s %d %d %c %s\n", d->group,
4571 + d->lastMessage, d->firstMessage, d->allowed ? 'y' : 'n',
4574 + snprintf (buf, sizeof(buf), "%s %d %d %c\n", d->group,
4575 + d->lastMessage, d->firstMessage, d->allowed ? 'y' : 'n');
4576 + if (fputs (buf, f) == EOF)
4586 + if (nntp_update_cacheindex (news, NULL))
4594 +int nntp_save_cache_group (CONTEXT *ctx)
4596 + char buf[HUGE_STRING], addr[STRING];
4597 + char file[_POSIX_PATH_MAX];
4601 + int i = 0, save = SORT_ORDER;
4604 + if (!option (OPTNEWSCACHE))
4606 + if (!ctx || !ctx->data || ctx->magic != M_NNTP)
4609 + if (((NNTP_DATA *)ctx->data)->cache)
4611 + nntp_cache_expand (file, ((NNTP_DATA *)ctx->data)->cache);
4613 + f = safe_fopen (file, "w");
4617 + snprintf (buf, sizeof(buf), "%s-%s",
4618 + ((NNTP_DATA *)ctx->data)->nserv->conn->account.host,
4619 + ((NNTP_DATA *)ctx->data)->group);
4620 + f = mutt_mkname (buf);
4621 + ((NNTP_DATA *)ctx->data)->cache = safe_strdup (buf);
4622 + nntp_cache_expand (file, buf);
4627 + if (Sort != SORT_ORDER)
4630 + Sort = SORT_ORDER;
4631 + mutt_sort_headers (ctx, 0);
4634 + /* Save only $nntp_context messages... */
4635 + ((NNTP_DATA *)ctx->data)->lastCached = 0;
4636 + if (NntpContext && ctx->msgcount > NntpContext)
4637 + i = ctx->msgcount - NntpContext;
4638 + for (; i < ctx->msgcount; i++)
4640 + if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->article_num != prev)
4644 + rfc822_write_address (addr, sizeof(addr), h->env->from, 0);
4645 + tm = gmtime (&h->date_sent);
4646 + snprintf (buf, sizeof(buf),
4647 + "%d\t%s\t%s\t%d %s %d %02d:%02d:%02d GMT\t%s\t",
4648 + h->article_num, h->env->subject, addr, tm->tm_mday,
4649 + Months[tm->tm_mon], tm->tm_year+1900, tm->tm_hour, tm->tm_min,
4650 + tm->tm_sec, h->env->message_id);
4652 + if (h->env->references)
4653 + mutt_write_references (h->env->references, f);
4654 + snprintf (buf, sizeof(buf), "\t%ld\t%d\tXref: %s\n", (long int) h->content->length,
4655 + (int) h->lines, NONULL(h->env->xref));
4656 + if (fputs (buf, f) == EOF)
4663 + prev = ctx->hdrs[i]->article_num;
4669 + mutt_sort_headers (ctx, 0);
4673 + if (nntp_update_cacheindex (((NNTP_DATA *)ctx->data)->nserv,
4674 + (NNTP_DATA *)ctx->data))
4679 + ((NNTP_DATA *)ctx->data)->lastCached = ((NNTP_DATA *)ctx->data)->lastLoaded;
4683 +void nntp_delete_cache (NNTP_DATA *data)
4685 + char buf[_POSIX_PATH_MAX];
4687 + if (!option (OPTNEWSCACHE) || !data || !data->cache || !data->nserv)
4690 + nntp_cache_expand (buf, data->cache);
4692 + FREE (&data->cache);
4693 + data->lastCached = 0;
4694 + nntp_cache_expand (buf, ".index");
4695 + mutt_update_list_file (buf, data->nserv->conn->account.host, data->group, NULL);
4698 +NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER *news, char *group)
4702 + if (!news || !news->newsgroups || !group || !*group)
4704 + if (!(data = (NNTP_DATA *)hash_find (news->newsgroups, group)))
4706 + data = (NNTP_DATA *) safe_calloc (1, sizeof (NNTP_DATA) + strlen (group) + 1);
4707 + data->group = (char *) data + sizeof (NNTP_DATA);
4708 + strcpy (data->group, group);
4709 + data->nserv = news;
4710 + data->deleted = 1;
4711 + if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
4712 + news->newsgroups = hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
4713 + hash_insert (news->newsgroups, data->group, data, 0);
4714 + nntp_add_to_list (news, data);
4716 + if (!data->subscribed)
4718 + data->subscribed = 1;
4724 +NNTP_DATA *mutt_newsgroup_unsubscribe (NNTP_SERVER *news, char *group)
4728 + if (!news || !news->newsgroups || !group || !*group ||
4729 + !(data = (NNTP_DATA *)hash_find (news->newsgroups, group)))
4731 + if (data->subscribed)
4733 + data->subscribed = 0;
4734 + if (!option (OPTSAVEUNSUB))
4740 +NNTP_DATA *mutt_newsgroup_catchup (NNTP_SERVER *news, char *group)
4744 + if (!news || !news->newsgroups || !group || !*group ||
4745 + !(data = (NNTP_DATA *)hash_find (news->newsgroups, group)))
4749 + data->entries = safe_calloc (5, sizeof (NEWSRC_ENTRY));
4753 + data->entries[0].first = 1;
4755 + data->entries[0].last = data->lastMessage;
4756 + if (Context && Context->data == data)
4760 + for (x = 0; x < Context->msgcount; x++)
4761 + mutt_set_flag (Context, Context->hdrs[x], M_READ, 1);
4766 +NNTP_DATA *mutt_newsgroup_uncatchup (NNTP_SERVER *news, char *group)
4770 + if (!news || !news->newsgroups || !group || !*group ||
4771 + !(data = (NNTP_DATA *)hash_find (news->newsgroups, group)))
4775 + data->entries = safe_calloc (5, sizeof (NEWSRC_ENTRY));
4779 + data->entries[0].first = 1;
4780 + data->entries[0].last = data->firstMessage - 1;
4781 + if (Context && Context->data == data)
4785 + data->unread = Context->msgcount;
4786 + for (x = 0; x < Context->msgcount; x++)
4787 + mutt_set_flag (Context, Context->hdrs[x], M_READ, 0);
4790 + data->unread = data->lastMessage - data->entries[0].last;
4794 +/* this routine gives the first newsgroup with new messages */
4795 +void nntp_buffy (char *s)
4799 + for (list = CurrentNewsSrv->list; list; list = list->next)
4801 + NNTP_DATA *data = (NNTP_DATA *) list->data;
4803 + if (data && data->subscribed && data->unread)
4805 + if (Context && Context->magic == M_NNTP &&
4806 + !mutt_strcmp (data->group, ((NNTP_DATA *) Context->data)->group))
4808 + unsigned int i, unread = 0;
4810 + for (i = 0; i < Context->msgcount; i++)
4811 + if (!Context->hdrs[i]->read && !Context->hdrs[i]->deleted)
4816 + strcpy (s, data->group);
4821 diff -udprP mutt-1.5.16.orig/nntp.c mutt-1.5.16/nntp.c
4822 --- mutt-1.5.16.orig/nntp.c 1970-01-01 03:00:00.000000000 +0300
4823 +++ mutt-1.5.16/nntp.c 2007-06-15 17:12:26.000000000 +0300
4826 + * Copyright (C) 1998 Brandon Long <blong@fiction.net>
4827 + * Copyright (C) 1999 Andrej Gritsenko <andrej@lucky.net>
4828 + * Copyright (C) 2000-2007 Vsevolod Volkov <vvv@mutt.org.ua>
4830 + * This program is free software; you can redistribute it and/or modify
4831 + * it under the terms of the GNU General Public License as published by
4832 + * the Free Software Foundation; either version 2 of the License, or
4833 + * (at your option) any later version.
4835 + * This program is distributed in the hope that it will be useful,
4836 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4837 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4838 + * GNU General Public License for more details.
4840 + * You should have received a copy of the GNU General Public License
4841 + * along with this program; if not, write to the Free Software
4842 + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4846 +# include "config.h"
4850 +#include "mutt_curses.h"
4854 +#include "rfc1524.h"
4855 +#include "rfc2047.h"
4856 +#include "mailbox.h"
4867 +#include <unistd.h>
4868 +#include <string.h>
4870 +#include <stdlib.h>
4872 +static unsigned int _checked = 0;
4875 +static void nntp_error (const char *where, const char *msg)
4877 + dprint (1, (debugfile, "nntp_error(): unexpected response in %s: %s\n", where, msg));
4881 +static int nntp_auth (NNTP_SERVER *serv)
4883 + CONNECTION *conn = serv->conn;
4885 + unsigned char flags = conn->account.flags;
4887 + if (mutt_account_getuser (&conn->account) || !conn->account.user[0] ||
4888 + mutt_account_getpass (&conn->account) || !conn->account.pass[0])
4890 + conn->account.flags = flags;
4894 + mutt_message _("Logging in...");
4896 + snprintf (buf, sizeof (buf), "AUTHINFO USER %s\r\n", conn->account.user);
4897 + mutt_socket_write (conn, buf);
4898 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
4900 + conn->account.flags = flags;
4905 + /* don't print the password unless we're at the ungodly debugging level */
4906 + if (debuglevel < M_SOCK_LOG_FULL)
4907 + dprint (M_SOCK_LOG_CMD, (debugfile, "> AUTHINFO PASS *\n"));
4909 + snprintf (buf, sizeof (buf), "AUTHINFO PASS %s\r\n", conn->account.pass);
4910 + mutt_socket_write_d (conn, buf, -1, M_SOCK_LOG_FULL);
4911 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
4913 + conn->account.flags = flags;
4917 + if (mutt_strncmp ("281", buf, 3))
4919 + conn->account.flags = flags;
4920 + mutt_error _("Login failed.");
4928 +static int nntp_connect_error (NNTP_SERVER *serv)
4930 + serv->status = NNTP_NONE;
4931 + mutt_socket_close (serv->conn);
4932 + mutt_error _("Server closed connection!");
4937 +static int nntp_connect_and_auth (NNTP_SERVER *serv)
4939 + CONNECTION *conn = serv->conn;
4943 + serv->status = NNTP_NONE;
4945 + if (mutt_socket_open (conn) < 0)
4948 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
4949 + return nntp_connect_error (serv);
4951 + if (!mutt_strncmp ("200", buf, 3))
4952 + mutt_message (_("Connected to %s. Posting ok."), conn->account.host);
4953 + else if (!mutt_strncmp ("201", buf, 3))
4954 + mutt_message (_("Connected to %s. Posting NOT ok."), conn->account.host);
4957 + mutt_socket_close (conn);
4958 + mutt_remove_trailing_ws (buf);
4959 + mutt_error ("%s", buf);
4966 + /* Tell INN to switch to mode reader if it isn't so. Ignore all
4967 + returned codes and messages. */
4968 + mutt_socket_write (conn, "MODE READER\r\n");
4969 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
4970 + return nntp_connect_error (serv);
4972 + mutt_socket_write (conn, "STAT\r\n");
4973 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
4974 + return nntp_connect_error (serv);
4976 + if (!(conn->account.flags & M_ACCT_USER) && mutt_strncmp ("480", buf, 3))
4978 + serv->status = NNTP_OK;
4982 + rc = nntp_auth (serv);
4984 + return nntp_connect_error (serv);
4987 + mutt_socket_close (conn);
4988 + serv->status = NNTP_BYE;
4993 + mutt_socket_close (conn);
4994 + mutt_error _("Login failed.");
4998 + serv->status = NNTP_OK;
5002 +static int nntp_attempt_features (NNTP_SERVER *serv)
5004 + char buf[LONG_STRING];
5005 + CONNECTION *conn = serv->conn;
5007 + mutt_socket_write (conn, "XOVER\r\n");
5008 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
5009 + return nntp_connect_error (serv);
5010 + if (mutt_strncmp ("500", buf, 3))
5011 + serv->hasXOVER = 1;
5013 + mutt_socket_write (conn, "XPAT\r\n");
5014 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
5015 + return nntp_connect_error (serv);
5016 + if (mutt_strncmp ("500", buf, 3))
5017 + serv->hasXPAT = 1;
5019 + mutt_socket_write (conn, "LISTGROUP\r\n");
5020 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
5021 + return nntp_connect_error (serv);
5022 + if (mutt_strncmp ("500", buf, 3))
5023 + serv->hasLISTGROUP = 1;
5025 + mutt_socket_write (conn, "XGTITLE +\r\n");
5026 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
5027 + return nntp_connect_error (serv);
5028 + if (mutt_strncmp ("500", buf, 3))
5029 + serv->hasXGTITLE = 1;
5031 + if (!mutt_strncmp ("282", buf, 3))
5035 + if (mutt_socket_readln (buf, sizeof (buf), conn) < 0)
5036 + return nntp_connect_error (serv);
5037 + } while (!(buf[0] == '.' && buf[1] == '\0'));
5043 +static int nntp_open_connection (NNTP_SERVER *serv)
5045 + if (serv->status == NNTP_OK)
5047 + if (serv->status == NNTP_BYE)
5049 + if (nntp_connect_and_auth (serv) < 0)
5051 + if (nntp_attempt_features (serv) < 0)
5056 +static int nntp_reconnect (NNTP_SERVER *serv)
5058 + char buf[SHORT_STRING];
5060 + mutt_socket_close (serv->conn);
5064 + if (nntp_connect_and_auth (serv) == 0)
5067 + snprintf (buf, sizeof (buf), _("Connection to %s lost. Reconnect?"),
5068 + serv->conn->account.host);
5069 + if (query_quadoption (OPT_NNTPRECONNECT, buf) != M_YES)
5071 + serv->status = NNTP_BYE;
5077 +/* Send data from line[LONG_STRING] and receive answer to same line */
5078 +static int mutt_nntp_query (NNTP_DATA *data, char *line, size_t linelen)
5080 + char buf[LONG_STRING];
5083 + if (data->nserv->status == NNTP_BYE)
5090 + mutt_socket_write (data->nserv->conn, line);
5092 + else if (data->group)
5094 + snprintf (buf, sizeof (buf), "GROUP %s\r\n", data->group);
5095 + mutt_socket_write (data->nserv->conn, buf);
5099 + if (mutt_socket_readln (buf, sizeof (buf), data->nserv->conn) < 0)
5101 + if (nntp_reconnect (data->nserv) < 0)
5106 + snprintf (buf, sizeof (buf), "GROUP %s\r\n", data->group);
5107 + mutt_socket_write (data->nserv->conn, buf);
5108 + if (mutt_socket_readln (buf, sizeof (buf), data->nserv->conn) < 0)
5114 + else if ((!mutt_strncmp ("480", buf, 3)) && nntp_auth (data->nserv) < 0)
5118 + strfcpy (line, buf, linelen);
5123 + * This function calls funct(*line, *data) for each received line,
5124 + * funct(NULL, *data) if rewind(*data) needs, exits when fail or done.
5127 + * 1 - correct but not performed (may be, have to be continued),
5128 + * -1 - conection lost,
5129 + * -2 - invalid command or execution error,
5130 + * -3 - error in funct(*line, *data).
5132 +static int mutt_nntp_fetch (NNTP_DATA *nntp_data, char *query, char *msg,
5133 + int (*funct) (char *, void *), void *data, int tagged)
5135 + char buf[LONG_STRING];
5139 + size_t lenbuf = 0;
5144 + strfcpy (buf, query, sizeof (buf));
5145 + if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0)
5147 + if (buf[0] == '5')
5149 + if (buf[0] != '2')
5154 + inbuf = safe_malloc (sizeof (buf));
5158 + chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
5164 + if (!lenbuf && buf[0] == '.')
5166 + if (buf[1] == '\0')
5171 + if (buf[1] == '.')
5175 + strfcpy (inbuf + lenbuf, p, sizeof (buf));
5177 + if (chunk >= sizeof (buf))
5179 + lenbuf += strlen (p);
5184 + if (msg && ReadInc && (line % ReadInc == 0)) {
5186 + mutt_message (_("%s (tagged: %d) %d"), msg, tagged, line);
5188 + mutt_message ("%s %d", msg, line);
5191 + if (ret == 0 && funct (inbuf, data) < 0)
5196 + safe_realloc (&inbuf, lenbuf + sizeof (buf));
5199 + funct (NULL, data);
5205 +static int nntp_read_tempfile (char *line, void *file)
5207 + FILE *f = (FILE *)file;
5214 + if (fputc ('\n', f) == EOF)
5220 +static void nntp_parse_xref (CONTEXT *ctx, char *group, char *xref, HEADER *h)
5222 + register char *p, *b;
5223 + register char *colon = NULL;
5228 + /* skip to next word */
5230 + while (*b && ((*b == ' ') || (*b == '\t'))) b++;
5233 + /* skip to end of word */
5234 + while (*p && (*p != ' ') && (*p != '\t'))
5249 + nntp_get_status (ctx, h, b, atoi(colon));
5250 + if (h && h->article_num == 0 && mutt_strcmp (group, b) == 0)
5251 + h->article_num = atoi(colon);
5259 + * 1 if article not found
5260 + * -1 if read or write error on tempfile or socket
5262 +static int nntp_read_header (CONTEXT *ctx, const char *msgid, int article_num)
5264 + NNTP_DATA *nntp_data = ((NNTP_DATA *)ctx->data);
5266 + char buf[LONG_STRING];
5267 + char tempfile[_POSIX_PATH_MAX];
5269 + HEADER *h = ctx->hdrs[ctx->msgcount];
5271 + mutt_mktemp (tempfile);
5272 + if (!(f = safe_fopen (tempfile, "w+")))
5276 + snprintf (buf, sizeof (buf), "HEAD %d\r\n", article_num);
5278 + snprintf (buf, sizeof (buf), "HEAD %s\r\n", msgid);
5280 + ret = mutt_nntp_fetch (nntp_data, buf, NULL, nntp_read_tempfile, f, 0);
5285 + dprint(1, (debugfile, "nntp_read_header: %s\n", buf));
5288 + unlink (tempfile);
5289 + return (ret == -1 ? -1 : 1);
5292 + h->article_num = article_num;
5293 + h->env = mutt_read_rfc822_header (f, h, 0, 0);
5295 + unlink (tempfile);
5297 + if (h->env->xref != NULL)
5298 + nntp_parse_xref (ctx, nntp_data->group, h->env->xref, h);
5299 + else if (h->article_num == 0 && msgid)
5301 + snprintf (buf, sizeof (buf), "STAT %s\r\n", msgid);
5302 + if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) == 0)
5303 + h->article_num = atoi (buf + 4);
5309 +static int parse_description (char *line, void *n)
5311 +#define news ((NNTP_SERVER *) n)
5312 + register char *d = line;
5317 + while (*d && *d != '\t' && *d != ' ') d++;
5320 + while (*d && (*d == '\t' || *d == ' ')) d++;
5321 + dprint (2, (debugfile, "group: %s, desc: %s\n", line, d));
5322 + if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
5323 + mutt_strcmp (d, data->desc))
5325 + FREE (&data->desc);
5326 + data->desc = safe_strdup (d);
5332 +static void nntp_get_desc (NNTP_DATA *data, char *mask, char *msg)
5336 + if (!option (OPTLOADDESC) || !data || !data->nserv)
5339 + /* Get newsgroup description, if we can */
5340 + if (data->nserv->hasXGTITLE)
5341 + snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
5343 + snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
5344 + if (mutt_nntp_fetch (data, buf, msg, parse_description, data->nserv, 0) != 0)
5347 + nntp_error ("nntp_get_desc()", buf);
5353 + * XOVER returns a tab separated list of:
5354 + * id|subject|from|date|Msgid|references|bytes|lines|xref
5356 + * This has to duplicate some of the functionality of
5357 + * mutt_read_rfc822_header(), since it replaces the call to that (albeit with
5358 + * a limited number of headers which are "parsed" by placement in the list)
5360 +static int nntp_parse_xover (CONTEXT *ctx, char *buf, HEADER *hdr)
5362 + NNTP_DATA *nntp_data = (NNTP_DATA *) ctx->data;
5366 + hdr->env = mutt_new_envelope();
5367 + hdr->env->newsgroups = safe_strdup (nntp_data->group);
5368 + hdr->content = mutt_new_body();
5369 + hdr->content->type = TYPETEXT;
5370 + hdr->content->subtype = safe_strdup ("plain");
5371 + hdr->content->encoding = ENC7BIT;
5372 + hdr->content->disposition = DISPINLINE;
5373 + hdr->content->length = -1;
5376 + for (x = 0; !done && x < 9; x++)
5378 + /* if from file, need to skip newline character */
5379 + while (*p && *p != '\n' && *p != '\t') p++;
5387 + hdr->article_num = atoi (b);
5388 + nntp_get_status (ctx, hdr, NULL, hdr->article_num);
5391 + hdr->env->subject = safe_strdup (b);
5392 + /* Now we need to do the things which would normally be done in
5393 + * mutt_read_rfc822_header() */
5394 + if (hdr->env->subject)
5396 + regmatch_t pmatch[1];
5398 + rfc2047_decode (&hdr->env->subject);
5400 + if (regexec (ReplyRegexp.rx, hdr->env->subject, 1, pmatch, 0) == 0)
5401 + hdr->env->real_subj = hdr->env->subject + pmatch[0].rm_eo;
5403 + hdr->env->real_subj = hdr->env->subject;
5407 + rfc822_free_address (&hdr->env->from);
5408 + hdr->env->from = rfc822_parse_adrlist (hdr->env->from, b);
5409 + rfc2047_decode_adrlist (hdr->env->from);
5412 + hdr->date_sent = mutt_parse_date (b, hdr);
5413 + hdr->received = hdr->date_sent;
5416 + FREE (&hdr->env->message_id);
5417 + hdr->env->message_id = safe_strdup (b);
5420 + mutt_free_list (&hdr->env->references);
5421 + hdr->env->references = mutt_parse_references (b, 0);
5424 + hdr->content->length = atoi (b);
5427 + hdr->lines = atoi (b);
5431 + FREE (&hdr->env->xref);
5432 + b = b + 6; /* skips the "Xref: " */
5433 + hdr->env->xref = safe_strdup (b);
5434 + nntp_parse_xref (ctx, nntp_data->group, b, hdr);
5446 + unsigned int base;
5447 + unsigned int first;
5448 + unsigned int last;
5449 + unsigned short *messages;
5453 +#define fc ((FETCH_CONTEXT *) c)
5454 +static int nntp_fetch_numbers (char *line, void *c)
5460 + num = atoi (line);
5461 + if (num < fc->base || num > fc->last)
5463 + fc->messages[num - fc->base] = 1;
5467 +static int add_xover_line (char *line, void *c)
5469 + unsigned int num, total;
5470 + CONTEXT *ctx = fc->ctx;
5471 + NNTP_DATA *data = (NNTP_DATA *)ctx->data;
5476 + if (ctx->msgcount >= ctx->hdrmax)
5477 + mx_alloc_memory (ctx);
5478 + ctx->hdrs[ctx->msgcount] = mutt_new_header ();
5479 + ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
5481 + nntp_parse_xover (ctx, line, ctx->hdrs[ctx->msgcount]);
5482 + num = ctx->hdrs[ctx->msgcount]->article_num;
5484 + if (num >= fc->first && num <= fc->last && fc->messages[num - fc->base])
5487 + if (num > data->lastLoaded)
5488 + data->lastLoaded = num;
5489 + num = num - fc->first + 1;
5490 + total = fc->last - fc->first + 1;
5491 + if (!ctx->quiet && fc->msg && ReadInc && (num % ReadInc == 0))
5492 + mutt_message ("%s %d/%d", fc->msg, num, total);
5495 + mutt_free_header (&ctx->hdrs[ctx->msgcount]); /* skip it */
5501 +static int nntp_fetch_headers (CONTEXT *ctx, unsigned int first,
5502 + unsigned int last)
5504 + char buf[HUGE_STRING];
5505 + char *msg = _("Fetching message headers...");
5506 + NNTP_DATA *nntp_data = ((NNTP_DATA *)ctx->data);
5510 + unsigned int current;
5514 + /* if empty group or nothing to do */
5515 + if (!last || first > last)
5518 + /* fetch list of articles */
5522 + fc.messages = safe_calloc (last - first + 1, sizeof (unsigned short));
5523 + if (nntp_data->nserv->hasLISTGROUP)
5525 + mutt_message _("Fetching list of articles...");
5526 + snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
5527 + if (mutt_nntp_fetch (nntp_data, buf, NULL, nntp_fetch_numbers, &fc, 0) != 0)
5529 + mutt_error (_("LISTGROUP command failed: %s"), buf);
5531 + nntp_error ("nntp_fetch_headers()", buf);
5533 + FREE (&fc.messages);
5539 + for (num = 0; num < last - first + 1; num++)
5540 + fc.messages[num] = 1;
5543 + /* CACHE: must be loaded xover cache here */
5544 + num = nntp_data->lastCached - first + 1;
5545 + if (option (OPTNEWSCACHE) && nntp_data->cache && num > 0)
5547 + nntp_cache_expand (buf, nntp_data->cache);
5548 + mutt_message _("Fetching headers from cache...");
5549 + if ((f = safe_fopen (buf, "r")))
5553 + /* counting number of lines */
5554 + while (fgets (buf, sizeof (buf), f) != NULL)
5557 + while (r > num && fgets (buf, sizeof (buf), f) != NULL)
5559 + oldmsgcount = ctx->msgcount;
5561 + fc.last = first + num - 1;
5563 + while (fgets (buf, sizeof (buf), f) != NULL)
5564 + add_xover_line (buf, &fc);
5566 + nntp_data->lastLoaded = fc.last;
5567 + first = fc.last + 1;
5568 + if (ctx->msgcount > oldmsgcount)
5569 + mx_update_context (ctx, ctx->msgcount - oldmsgcount);
5572 + nntp_delete_cache (nntp_data);
5574 + num = last - first + 1;
5577 + FREE (&fc.messages);
5582 + * Without XOVER, we have to fetch each article header and parse
5583 + * it. With XOVER, we ask for all of them
5585 + mutt_message (msg);
5586 + if (nntp_data->nserv->hasXOVER)
5588 + oldmsgcount = ctx->msgcount;
5592 + snprintf (buf, sizeof (buf), "XOVER %d-%d\r\n", first, last);
5593 + ret = mutt_nntp_fetch (nntp_data, buf, NULL, add_xover_line, &fc, 0);
5594 + if (ctx->msgcount > oldmsgcount)
5595 + mx_update_context (ctx, ctx->msgcount - oldmsgcount);
5598 + mutt_error (_("XOVER command failed: %s"), buf);
5600 + nntp_error ("nntp_fetch_headers()", buf);
5602 + FREE (&fc.messages);
5608 + for (current = first; current <= last; current++)
5612 + ret = current - first + 1;
5613 + mutt_message ("%s %d/%d", msg, ret, num);
5615 + if (!fc.messages[current - fc.base])
5618 + if (ctx->msgcount >= ctx->hdrmax)
5619 + mx_alloc_memory (ctx);
5620 + h = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
5621 + h->index = ctx->msgcount;
5623 + ret = nntp_read_header (ctx, NULL, current);
5624 + if (ret == 0) /* Got article. Fetch next header */
5626 + nntp_get_status (ctx, h, NULL, h->article_num);
5628 + mx_update_context (ctx, 1);
5631 + mutt_free_header (&h); /* skip it */
5634 + FREE (&fc.messages);
5638 + if (current > nntp_data->lastLoaded)
5639 + nntp_data->lastLoaded = current;
5641 + FREE (&fc.messages);
5642 + nntp_data->lastLoaded = last;
5643 + mutt_clear_error ();
5648 + * currently, nntp "mailbox" is "newsgroup"
5650 +int nntp_open_mailbox (CONTEXT *ctx)
5652 + NNTP_DATA *nntp_data;
5653 + NNTP_SERVER *serv;
5654 + char buf[HUGE_STRING];
5655 + char server[LONG_STRING];
5657 + unsigned int first;
5660 + if (nntp_parse_url (ctx->path, &acct, buf, sizeof (buf)) < 0 || !*buf)
5662 + mutt_error (_("%s is an invalid newsgroup specification!"), ctx->path);
5668 + nntp_expand_path (server, sizeof (server), &acct);
5669 + if (!(serv = mutt_select_newsserver (server)) || serv->status != NNTP_OK)
5672 + CurrentNewsSrv = serv;
5674 + /* create NNTP-specific state struct if nof found in list */
5675 + if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL)
5677 + nntp_data = safe_calloc (1, sizeof (NNTP_DATA) + strlen (buf) + 1);
5678 + nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
5679 + strcpy (nntp_data->group, buf);
5680 + hash_insert (serv->newsgroups, nntp_data->group, nntp_data, 0);
5681 + nntp_add_to_list (serv, nntp_data);
5683 + ctx->data = nntp_data;
5684 + ctx->mx_close = nntp_fastclose_mailbox;
5685 + nntp_data->nserv = serv;
5687 + mutt_message (_("Selecting %s..."), nntp_data->group);
5689 + if (!nntp_data->desc)
5691 + nntp_get_desc (nntp_data, nntp_data->group, NULL);
5692 + if (nntp_data->desc)
5693 + nntp_save_cache_index (serv);
5697 + if (mutt_nntp_query (nntp_data, buf, sizeof(buf)) < 0)
5700 + nntp_error ("nntp_open_mailbox()", buf);
5705 + if (mutt_strncmp ("211", buf, 3))
5707 + LIST *l = serv->list;
5709 + /* GROUP command failed */
5710 + if (!mutt_strncmp ("411", buf, 3))
5712 + mutt_error (_("Newsgroup %s not found on server %s"),
5713 + nntp_data->group, serv->conn->account.host);
5715 + /* CACHE: delete cache and line from .index */
5716 + nntp_delete_cache (nntp_data);
5717 + hash_delete (serv->newsgroups, nntp_data->group, NULL, nntp_delete_data);
5718 + while (l && l->data != (void *) nntp_data) l = l->next;
5728 + sscanf (buf + 4, "%d %u %u %s", &count, &nntp_data->firstMessage,
5729 + &nntp_data->lastMessage, buf);
5731 + nntp_data->deleted = 0;
5733 + time (&serv->check_time);
5736 + * Check for max adding context. If it is greater than $nntp_context,
5737 + * strip off extra articles
5739 + first = nntp_data->firstMessage;
5740 + if (NntpContext && nntp_data->lastMessage - first + 1 > NntpContext)
5741 + first = nntp_data->lastMessage - NntpContext + 1;
5743 + nntp_data->lastLoaded = first - 1;
5744 + return nntp_fetch_headers (ctx, first, nntp_data->lastMessage);
5747 +int nntp_fetch_message (MESSAGE *msg, CONTEXT *ctx, int msgno)
5749 + char buf[LONG_STRING];
5750 + char path[_POSIX_PATH_MAX];
5751 + NNTP_CACHE *cache;
5752 + char *m = _("Fetching message...");
5755 + /* see if we already have the message in our cache */
5756 + cache = &((NNTP_DATA *) ctx->data)->acache[ctx->hdrs[msgno]->index % NNTP_CACHE_LEN];
5758 + /* if everything is fine, assign msg->fp and return */
5759 + if (cache->path && cache->index == ctx->hdrs[msgno]->index &&
5760 + (msg->fp = fopen (cache->path, "r")))
5763 + /* clear the previous entry */
5764 + unlink (cache->path);
5765 + free (cache->path);
5769 + cache->index = ctx->hdrs[msgno]->index;
5770 + mutt_mktemp (path);
5771 + cache->path = safe_strdup (path);
5772 + if (!(msg->fp = safe_fopen (path, "w+")))
5774 + FREE (&cache->path);
5778 + if (ctx->hdrs[msgno]->article_num == 0)
5779 + snprintf (buf, sizeof (buf), "ARTICLE %s\r\n",
5780 + ctx->hdrs[msgno]->env->message_id);
5782 + snprintf (buf, sizeof (buf), "ARTICLE %d\r\n",
5783 + ctx->hdrs[msgno]->article_num);
5785 + ret = mutt_nntp_fetch ((NNTP_DATA *)ctx->data, buf, m, nntp_read_tempfile,
5786 + msg->fp, ctx->tagged);
5789 + mutt_error (_("Article %d not found on server"),
5790 + ctx->hdrs[msgno]->article_num);
5791 + dprint (1, (debugfile, "nntp_fetch_message: %s\n", buf));
5798 + FREE (&cache->path);
5802 + mutt_free_envelope (&ctx->hdrs[msgno]->env);
5803 + ctx->hdrs[msgno]->env = mutt_read_rfc822_header (msg->fp, ctx->hdrs[msgno], 0, 0);
5804 + /* fix content length */
5805 + fseek(msg->fp, 0, SEEK_END);
5806 + ctx->hdrs[msgno]->content->length = ftell (msg->fp) -
5807 + ctx->hdrs[msgno]->content->offset;
5809 + /* this is called in mutt before the open which fetches the message,
5810 + * which is probably wrong, but we just call it again here to handle
5811 + * the problem instead of fixing it.
5813 + mutt_parse_mime_message (ctx, ctx->hdrs[msgno]);
5815 + /* These would normally be updated in mx_update_context(), but the
5816 + * full headers aren't parsed with XOVER, so the information wasn't
5819 +#if defined(HAVE_PGP) || defined(HAVE_SMIME)
5820 + ctx->hdrs[msgno]->security = crypt_query (ctx->hdrs[msgno]->content);
5821 +#endif /* HAVE_PGP || HAVE_SMIME */
5823 + mutt_clear_error();
5830 +int nntp_post (const char *msg) {
5831 + char buf[LONG_STRING];
5834 + NNTP_DATA *nntp_data;
5836 + if (Context && Context->magic == M_NNTP)
5837 + nntp_data = (NNTP_DATA *)Context->data;
5840 + if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)) ||
5841 + !CurrentNewsSrv->list || !CurrentNewsSrv->list->data)
5843 + mutt_error (_("Can't post article. No connection to news server."));
5846 + nntp_data = (NNTP_DATA *)CurrentNewsSrv->list->data;
5849 + if (!(f = safe_fopen (msg, "r")))
5851 + mutt_error (_("Can't post article. Unable to open %s"), msg);
5855 + strfcpy (buf, "POST\r\n", sizeof (buf));
5856 + if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0)
5858 + mutt_error (_("Can't post article. Connection to %s lost."),
5859 + nntp_data->nserv->conn->account.host);
5862 + if (buf[0] != '3')
5864 + mutt_error (_("Can't post article: %s"), buf);
5870 + while (fgets (buf + 1, sizeof (buf) - 2, f) != NULL)
5872 + len = strlen (buf);
5873 + if (buf[len - 1] == '\n')
5875 + buf[len - 1] = '\r';
5880 + if (buf[1] == '.')
5881 + mutt_socket_write_d (nntp_data->nserv->conn, buf, -1, M_SOCK_LOG_HDR);
5883 + mutt_socket_write_d (nntp_data->nserv->conn, buf + 1, -1, M_SOCK_LOG_HDR);
5887 + if (buf[strlen (buf) - 1] != '\n')
5888 + mutt_socket_write_d (nntp_data->nserv->conn, "\r\n", -1, M_SOCK_LOG_HDR);
5889 + mutt_socket_write_d (nntp_data->nserv->conn, ".\r\n", -1, M_SOCK_LOG_HDR);
5890 + if (mutt_socket_readln (buf, sizeof (buf), nntp_data->nserv->conn) < 0)
5892 + mutt_error (_("Can't post article. Connection to %s lost."),
5893 + nntp_data->nserv->conn->account.host);
5896 + if (buf[0] != '2')
5898 + mutt_error (_("Can't post article: %s"), buf);
5905 +/* nntp_logout_all: close all open connections. */
5906 +void nntp_logout_all (void)
5908 + char buf[LONG_STRING];
5911 + conn = mutt_socket_head ();
5915 + CONNECTION *next = conn->next;
5917 + if (conn->account.type == M_ACCT_TYPE_NNTP)
5919 + mutt_message (_("Closing connection to %s..."), conn->account.host);
5920 + mutt_socket_write (conn, "QUIT\r\n");
5921 + mutt_socket_readln (buf, sizeof (buf), conn);
5922 + mutt_clear_error ();
5923 + mutt_socket_close (conn);
5924 + mutt_socket_free (conn);
5931 +static void nntp_free_acache (NNTP_DATA *data)
5935 + for (i = 0; i < NNTP_CACHE_LEN; i++)
5937 + if (data->acache[i].path)
5939 + unlink (data->acache[i].path);
5940 + FREE (&data->acache[i].path);
5945 +void nntp_delete_data (void *p)
5947 + NNTP_DATA *data = (NNTP_DATA *)p;
5951 + FREE (&data->entries);
5952 + FREE (&data->desc);
5953 + FREE (&data->cache);
5954 + nntp_free_acache (data);
5958 +int nntp_sync_mailbox (CONTEXT *ctx)
5960 + NNTP_DATA *data = ctx->data;
5962 + /* CACHE: update cache and .index files */
5963 + if ((option (OPTSAVEUNSUB) || data->subscribed))
5964 + nntp_save_cache_group (ctx);
5965 + nntp_free_acache (data);
5967 + data->nserv->check_time = 0; /* next nntp_check_mailbox() will really check */
5971 +int nntp_fastclose_mailbox (CONTEXT *ctx)
5973 + NNTP_DATA *data = (NNTP_DATA *) ctx->data, *tmp;
5977 + nntp_free_acache (data);
5978 + if (!data->nserv || !data->nserv->newsgroups || !data->group)
5980 + nntp_save_cache_index (data->nserv);
5981 + if ((tmp = hash_find (data->nserv->newsgroups, data->group)) == NULL
5983 + nntp_delete_data (data);
5987 +/* commit changes and terminate connection */
5988 +int nntp_close_mailbox (CONTEXT *ctx)
5992 + mutt_message _("Quitting newsgroup...");
5995 + NNTP_DATA *data = (NNTP_DATA *) ctx->data;
5998 + if (data->nserv && data->nserv->conn && ctx->unread)
6000 + ret = query_quadoption (OPT_CATCHUP, _("Mark all articles read?"));
6002 + mutt_newsgroup_catchup (data->nserv, data->group);
6007 + nntp_sync_mailbox (ctx);
6008 + if (ctx->data && ((NNTP_DATA *)ctx->data)->nserv)
6010 + NNTP_SERVER *news;
6012 + news = ((NNTP_DATA *)ctx->data)->nserv;
6013 + newsrc_gen_entries (ctx);
6014 + ((NNTP_DATA *)ctx->data)->unread = ctx->unread;
6015 + mutt_newsrc_update (news);
6017 + mutt_clear_error();
6021 +/* use the GROUP command to poll for new mail */
6022 +static int _nntp_check_mailbox (CONTEXT *ctx, NNTP_DATA *nntp_data)
6024 + char buf[LONG_STRING];
6027 + if (nntp_data->nserv->check_time + NewsPollTimeout > time (NULL))
6031 + if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0)
6034 + nntp_error ("nntp_check_mailbox()", buf);
6038 + if (mutt_strncmp ("211", buf, 3))
6041 + if (mutt_nntp_query (nntp_data, buf, sizeof (buf)) < 0)
6044 + nntp_error ("nntp_check_mailbox()", buf);
6049 + if (!mutt_strncmp ("211", buf, 3))
6054 + sscanf (buf + 4, "%d %d %d", &count, &first, &last);
6055 + nntp_data->firstMessage = first;
6056 + nntp_data->lastMessage = last;
6057 + if (ctx && last > nntp_data->lastLoaded)
6059 + nntp_fetch_headers (ctx, nntp_data->lastLoaded + 1, last);
6060 + time (&nntp_data->nserv->check_time);
6063 + if (!last || (!nntp_data->rc && !nntp_data->lastCached))
6064 + nntp_data->unread = count;
6066 + mutt_newsgroup_stat (nntp_data);
6067 + /* active was renumbered? */
6068 + if (last < nntp_data->lastLoaded)
6070 + if (!nntp_data->max)
6072 + nntp_data->entries = safe_calloc (5, sizeof (NEWSRC_ENTRY));
6073 + nntp_data->max = 5;
6075 + nntp_data->lastCached = 0;
6076 + nntp_data->num = 1;
6077 + nntp_data->entries[0].first = 1;
6078 + nntp_data->entries[0].last = 0;
6082 + time (&nntp_data->nserv->check_time);
6086 +int nntp_check_mailbox (CONTEXT *ctx)
6088 + return _nntp_check_mailbox (ctx, (NNTP_DATA *)ctx->data);
6091 +static int add_group (char *buf, void *serv)
6093 +#define s ((NNTP_SERVER *) serv)
6094 + char group[LONG_STRING], mod, desc[HUGE_STRING];
6096 + NNTP_DATA *nntp_data;
6099 + _checked = n; /* _checked have N, where N = number of groups */
6100 + if (!buf) /* at EOF must be zerouth */
6107 + sscanf (buf, "%s %d %d %c %[^\n]", group, &last, &first, &mod, desc);
6110 + if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL)
6113 + nntp_data = safe_calloc (1, sizeof (NNTP_DATA) + strlen (group) + 1);
6114 + nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
6115 + strcpy (nntp_data->group, group);
6116 + nntp_data->nserv = s;
6117 + if (s->newsgroups->nelem < s->newsgroups->curnelem * 2)
6118 + s->newsgroups = hash_resize (s->newsgroups, s->newsgroups->nelem * 2);
6119 + hash_insert (s->newsgroups, nntp_data->group, nntp_data, 0);
6120 + nntp_add_to_list (s, nntp_data);
6122 + nntp_data->deleted = 0;
6123 + nntp_data->firstMessage = first;
6124 + nntp_data->lastMessage = last;
6126 + nntp_data->allowed = 1;
6128 + nntp_data->allowed = 0;
6129 + if (nntp_data->desc)
6130 + FREE (&nntp_data->desc);
6132 + nntp_data->desc = safe_strdup (desc);
6133 + if (nntp_data->rc || nntp_data->lastCached)
6134 + mutt_newsgroup_stat (nntp_data);
6135 + else if (nntp_data->lastMessage &&
6136 + nntp_data->firstMessage <= nntp_data->lastMessage)
6137 + nntp_data->unread = nntp_data->lastMessage - nntp_data->firstMessage + 1;
6139 + nntp_data->unread = 0;
6145 +int nntp_check_newgroups (NNTP_SERVER *serv, int force)
6147 + char buf[LONG_STRING];
6148 + char msg[SHORT_STRING];
6149 + NNTP_DATA nntp_data;
6154 + unsigned int count = 0;
6155 + unsigned int total = 0;
6157 + if (!serv || !serv->newgroups_time)
6160 + if (nntp_open_connection (serv) < 0)
6163 + /* check subscribed groups for new news */
6164 + if (option (OPTSHOWNEWNEWS))
6166 + mutt_message _("Checking for new messages...");
6167 + for (l = serv->list; l; l = l->next)
6169 + serv->check_time = 0; /* really check! */
6170 + if (l->data && ((NNTP_DATA *) l->data)->subscribed)
6171 + _nntp_check_mailbox (NULL, (NNTP_DATA *) l->data);
6177 + mutt_message _("Checking for new newsgroups...");
6178 + now = serv->newgroups_time;
6179 + time (&serv->newgroups_time);
6180 + t = gmtime (&now);
6181 + snprintf (buf, sizeof (buf), "NEWGROUPS %02d%02d%02d %02d%02d%02d GMT\r\n",
6182 + (t->tm_year % 100), t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min,
6184 + nntp_data.nserv = serv;
6185 + if (Context && Context->magic == M_NNTP)
6186 + nntp_data.group = ((NNTP_DATA *)Context->data)->group;
6188 + nntp_data.group = NULL;
6190 + if (mutt_nntp_fetch (&nntp_data, buf, _("Adding new newsgroups..."),
6191 + add_group, serv, 0) != 0)
6194 + nntp_error ("nntp_check_newgroups()", buf);
6199 + strfcpy (msg, _("Loading descriptions..."), sizeof (msg));
6200 + mutt_message (msg);
6202 + emp.next = l->next;
6204 + emp.next = serv->list;
6209 + ((NNTP_DATA *) l->data)->new = 1;
6216 + nntp_get_desc ((NNTP_DATA *) l->data, ((NNTP_DATA *) l->data)->group, NULL);
6218 + if (ReadInc && (count % ReadInc == 0))
6219 + mutt_message ("%s %d/%d", msg, count, total);
6222 + nntp_save_cache_index (serv);
6223 + mutt_clear_error ();
6227 +/* Load list of all newsgroups from cache ALL */
6228 +int nntp_get_cache_all (NNTP_SERVER *serv)
6230 + char buf[HUGE_STRING];
6233 + nntp_cache_expand (buf, serv->cache);
6234 + if ((f = safe_fopen (buf, "r")))
6238 + while (fgets (buf, sizeof(buf), f) != NULL)
6240 + if (ReadInc && (i % ReadInc == 0))
6241 + mutt_message (_("Loading list from cache... %d"), i);
6242 + add_group (buf, serv);
6245 + add_group (NULL, NULL);
6247 + mutt_clear_error ();
6252 + FREE (&serv->cache);
6257 +/* Load list of all newsgroups from active */
6258 +int nntp_get_active (NNTP_SERVER *serv)
6260 + char msg[SHORT_STRING];
6261 + NNTP_DATA nntp_data;
6264 + if (nntp_open_connection (serv) < 0)
6267 + snprintf (msg, sizeof(msg), _("Loading list of all newsgroups on server %s..."),
6268 + serv->conn->account.host);
6269 + mutt_message (msg);
6270 + time (&serv->newgroups_time);
6271 + nntp_data.nserv = serv;
6272 + nntp_data.group = NULL;
6274 + if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, add_group, serv, 0) < 0)
6277 + nntp_error ("nntp_get_active()", "LIST\r\n");
6282 + strfcpy (msg, _("Loading descriptions..."), sizeof (msg));
6283 + mutt_message (msg);
6284 + nntp_get_desc (&nntp_data, "*", msg);
6286 + for (tmp = serv->list; tmp; tmp = tmp->next)
6288 + NNTP_DATA *data = (NNTP_DATA *)tmp->data;
6290 + if (data && data->deleted && !data->rc)
6292 + nntp_delete_cache (data);
6293 + hash_delete (serv->newsgroups, data->group, NULL, nntp_delete_data);
6297 + nntp_save_cache_index (serv);
6299 + mutt_clear_error ();
6304 + * returns -1 if error ocurred while retrieving header,
6305 + * number of articles which ones exist in context on success.
6307 +int nntp_check_msgid (CONTEXT *ctx, const char *msgid)
6311 + /* if msgid is already in context, don't reload them */
6312 + if (hash_find (ctx->id_hash, msgid))
6314 + if (ctx->msgcount == ctx->hdrmax)
6315 + mx_alloc_memory (ctx);
6316 + ctx->hdrs[ctx->msgcount] = mutt_new_header ();
6317 + ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
6319 + mutt_message (_("Fetching %s from server..."), msgid);
6320 + ret = nntp_read_header (ctx, msgid, 0);
6321 + /* since nntp_read_header() may set read flag, we must reset it */
6322 + ctx->hdrs[ctx->msgcount]->read = 0;
6324 + mutt_free_header (&ctx->hdrs[ctx->msgcount]);
6328 + mx_update_context (ctx, 1);
6339 + unsigned int *child;
6342 +static int check_children (char *s, void *c)
6344 +#define cc ((CHILD_CONTEXT *) c)
6345 + unsigned int i, n;
6347 + if (!s || (n = atoi (s)) == 0)
6349 + for (i = 0; i < cc->ctx->msgcount; i++)
6350 + if (cc->ctx->hdrs[i]->article_num == n)
6352 + if (cc->num >= cc->max)
6353 + safe_realloc (&cc->child, sizeof (unsigned int) * (cc->max += 25));
6354 + cc->child[cc->num++] = n;
6360 +int nntp_check_children (CONTEXT *ctx, const char *msgid)
6362 + NNTP_DATA *nntp_data = (NNTP_DATA *)ctx->data;
6364 + int i, ret = 0, tmp = 0;
6367 + if (!nntp_data || !nntp_data->nserv || !nntp_data->nserv->conn ||
6368 + !nntp_data->nserv->conn->account.host)
6370 + if (nntp_data->firstMessage > nntp_data->lastLoaded)
6372 + if (!nntp_data->nserv->hasXPAT)
6374 + mutt_error (_("Server %s does not support this operation!"),
6375 + nntp_data->nserv->conn->account.host);
6379 + snprintf (buf, sizeof (buf), "XPAT References %d-%d *%s*\r\n",
6380 + nntp_data->firstMessage, nntp_data->lastLoaded, msgid);
6385 + cc.child = safe_malloc (sizeof (unsigned int) * 25);
6386 + if (mutt_nntp_fetch (nntp_data, buf, NULL, check_children, &cc, 0))
6391 + /* dont try to read the xover cache. check_children() already
6392 + * made sure that we dont have the article, so we need to visit
6393 + * the server. Reading the cache at this point is also bad
6394 + * because it would duplicate messages */
6395 + if (option (OPTNEWSCACHE))
6398 + unset_option (OPTNEWSCACHE);
6400 + for (i = 0; i < cc.num; i++)
6402 + if ((ret = nntp_fetch_headers (ctx, cc.child[i], cc.child[i])))
6404 + if (ctx->msgcount &&
6405 + ctx->hdrs[ctx->msgcount - 1]->article_num == cc.child[i])
6406 + ctx->hdrs[ctx->msgcount - 1]->read = 0;
6409 + set_option (OPTNEWSCACHE);
6413 diff -udprP mutt-1.5.16.orig/nntp.h mutt-1.5.16/nntp.h
6414 --- mutt-1.5.16.orig/nntp.h 1970-01-01 03:00:00.000000000 +0300
6415 +++ mutt-1.5.16/nntp.h 2007-06-15 17:12:26.000000000 +0300
6418 + * Copyright (C) 1998 Brandon Long <blong@fiction.net>
6419 + * Copyright (C) 1999 Andrej Gritsenko <andrej@lucky.net>
6420 + * Copyright (C) 2000-2007 Vsevolod Volkov <vvv@mutt.org.ua>
6422 + * This program is free software; you can redistribute it and/or modify
6423 + * it under the terms of the GNU General Public License as published by
6424 + * the Free Software Foundation; either version 2 of the License, or
6425 + * (at your option) any later version.
6427 + * This program is distributed in the hope that it will be useful,
6428 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
6429 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6430 + * GNU General Public License for more details.
6432 + * You should have received a copy of the GNU General Public License
6433 + * along with this program; if not, write to the Free Software
6434 + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
6440 +#include "mutt_socket.h"
6441 +#include "mailbox.h"
6445 +#define NNTP_PORT 119
6446 +#define NNTP_SSL_PORT 563
6448 +/* number of entries in the hash table */
6449 +#define NNTP_CACHE_LEN 10
6466 + unsigned int hasXPAT : 1;
6467 + unsigned int hasXGTITLE : 1;
6468 + unsigned int hasXOVER : 1;
6469 + unsigned int hasLISTGROUP : 1;
6470 + unsigned int status : 3;
6476 + time_t newgroups_time;
6477 + time_t check_time;
6479 + LIST *list; /* list of newsgroups */
6480 + LIST *tail; /* last entry of list */
6486 + unsigned int index;
6492 + NEWSRC_ENTRY *entries;
6493 + unsigned int num; /* number of used entries */
6494 + unsigned int max; /* number of allocated entries */
6495 + unsigned int unread;
6496 + unsigned int firstMessage;
6497 + unsigned int lastMessage;
6498 + unsigned int lastLoaded;
6499 + unsigned int lastCached;
6500 + unsigned int subscribed : 1;
6501 + unsigned int rc : 1;
6502 + unsigned int new : 1;
6503 + unsigned int allowed : 1;
6504 + unsigned int deleted : 1;
6508 + NNTP_SERVER *nserv;
6509 + NNTP_CACHE acache[NNTP_CACHE_LEN];
6512 +/* internal functions */
6513 +int nntp_get_active (NNTP_SERVER *);
6514 +int nntp_get_cache_all (NNTP_SERVER *);
6515 +int nntp_save_cache_index (NNTP_SERVER *);
6516 +int nntp_check_newgroups (NNTP_SERVER *, int);
6517 +int nntp_save_cache_group (CONTEXT *);
6518 +int nntp_parse_url (const char *, ACCOUNT *, char *, size_t);
6519 +void newsrc_gen_entries (CONTEXT *);
6520 +void nntp_get_status (CONTEXT *, HEADER *, char *, int);
6521 +void mutt_newsgroup_stat (NNTP_DATA *);
6522 +void nntp_delete_cache (NNTP_DATA *);
6523 +void nntp_add_to_list (NNTP_SERVER *, NNTP_DATA *);
6524 +void nntp_cache_expand (char *, const char *);
6525 +void nntp_delete_data (void *);
6527 +/* exposed interface */
6528 +NNTP_SERVER *mutt_select_newsserver (char *);
6529 +NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER *, char *);
6530 +NNTP_DATA *mutt_newsgroup_unsubscribe (NNTP_SERVER *, char *);
6531 +NNTP_DATA *mutt_newsgroup_catchup (NNTP_SERVER *, char *);
6532 +NNTP_DATA *mutt_newsgroup_uncatchup (NNTP_SERVER *, char *);
6533 +void nntp_clear_cacheindex (NNTP_SERVER *);
6534 +int mutt_newsrc_update (NNTP_SERVER *);
6535 +int nntp_open_mailbox (CONTEXT *);
6536 +int nntp_sync_mailbox (CONTEXT *);
6537 +int nntp_check_mailbox (CONTEXT *);
6538 +int nntp_close_mailbox (CONTEXT *);
6539 +int nntp_fastclose_mailbox (CONTEXT *);
6540 +int nntp_fetch_message (MESSAGE *, CONTEXT *, int);
6541 +int nntp_post (const char *);
6542 +int nntp_check_msgid (CONTEXT *, const char *);
6543 +int nntp_check_children (CONTEXT *, const char *);
6544 +void nntp_buffy (char *);
6545 +void nntp_expand_path (char *, size_t, ACCOUNT *);
6546 +void nntp_logout_all ();
6547 +const char *nntp_format_str (char *, size_t, char, const char *, const char *,
6548 + const char *, const char *, unsigned long, format_flag);
6550 +NNTP_SERVER *CurrentNewsSrv INITVAL (NULL);
6552 +#endif /* _NNTP_H_ */
6553 diff -udprP mutt-1.5.16.orig/pager.c mutt-1.5.16/pager.c
6554 --- mutt-1.5.16.orig/pager.c 2007-04-16 02:56:26.000000000 +0300
6555 +++ mutt-1.5.16/pager.c 2007-06-15 17:12:26.000000000 +0300
6556 @@ -1055,6 +1055,11 @@ fill_buffer (FILE *f, LOFF_T *last_pos,
6566 static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
6567 int flags, ansi_attr *pa, int cnt,
6568 @@ -1490,6 +1495,16 @@ static struct mapping_t PagerHelpExtra[]
6573 +static struct mapping_t PagerNewsHelpExtra[] = {
6574 + { N_("Post"), OP_POST },
6575 + { N_("Followup"), OP_FOLLOWUP },
6576 + { N_("Del"), OP_DELETE },
6577 + { N_("Next"), OP_MAIN_NEXT_UNDELETED },
6584 /* This pager is actually not so simple as it once was. It now operates in
6585 @@ -1531,6 +1546,10 @@ mutt_pager (const char *banner, const ch
6586 int old_PagerIndexLines; /* some people want to resize it
6587 * while inside the pager... */
6590 + char *followup_to;
6593 if (!(flags & M_SHOWCOLOR))
6594 flags |= M_SHOWFLAT;
6596 @@ -1570,7 +1589,11 @@ mutt_pager (const char *banner, const ch
6597 if (IsHeader (extra))
6599 strfcpy (tmphelp, helpstr, sizeof (tmphelp));
6600 - mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER, PagerHelpExtra);
6601 + mutt_compile_help (buffer, sizeof (buffer), MENU_PAGER,
6603 + (Context && (Context->magic == M_NNTP)) ? PagerNewsHelpExtra :
6606 snprintf (helpstr, sizeof (helpstr), "%s %s", tmphelp, buffer);
6609 @@ -2398,6 +2421,15 @@ search_next:
6611 CHECK_ACL(M_ACL_WRITE, "flag message");
6614 + if (Context->magic == M_NNTP)
6617 + mutt_error _("Can't change 'important' flag on NNTP server.");
6622 mutt_set_flag (Context, extra->hdr, M_FLAG, !extra->hdr->flagged);
6623 redraw = REDRAW_STATUS | REDRAW_INDEX;
6624 if (option (OPTRESOLVE))
6625 @@ -2431,6 +2463,60 @@ search_next:
6626 redraw = REDRAW_FULL;
6631 + CHECK_MODE(IsHeader (extra) && !IsAttach (extra));
6633 + if (extra->ctx && extra->ctx->magic == M_NNTP &&
6634 + !((NNTP_DATA *)extra->ctx->data)->allowed &&
6635 + query_quadoption (OPT_TOMODERATED,_("Posting to this group not allowed, may be moderated. Continue?")) != M_YES)
6637 + ci_send_message (SENDNEWS, NULL, NULL, extra->ctx, NULL);
6638 + redraw = REDRAW_FULL;
6641 + case OP_FORWARD_TO_GROUP:
6642 + CHECK_MODE(IsHeader (extra) || IsMsgAttach (extra));
6644 + if (extra->ctx && extra->ctx->magic == M_NNTP &&
6645 + !((NNTP_DATA *)extra->ctx->data)->allowed &&
6646 + query_quadoption (OPT_TOMODERATED,_("Posting to this group not allowed, may be moderated. Continue?")) != M_YES)
6648 + if (IsMsgAttach (extra))
6649 + mutt_attach_forward (extra->fp, extra->hdr, extra->idx,
6650 + extra->idxlen, extra->bdy, SENDNEWS);
6652 + ci_send_message (SENDNEWS|SENDFORWARD, NULL, NULL, extra->ctx, extra->hdr);
6653 + redraw = REDRAW_FULL;
6657 + CHECK_MODE(IsHeader (extra) || IsMsgAttach (extra));
6660 + if (IsMsgAttach (extra))
6661 + followup_to = extra->bdy->hdr->env->followup_to;
6663 + followup_to = extra->hdr->env->followup_to;
6665 + if (!followup_to || mutt_strcasecmp (followup_to, "poster") ||
6666 + query_quadoption (OPT_FOLLOWUPTOPOSTER,_("Reply by mail as poster prefers?")) != M_YES)
6668 + if (extra->ctx && extra->ctx->magic == M_NNTP &&
6669 + !((NNTP_DATA *)extra->ctx->data)->allowed &&
6670 + query_quadoption (OPT_TOMODERATED,_("Posting to this group not allowed, may be moderated. Continue?")) != M_YES)
6672 + if (IsMsgAttach (extra))
6673 + mutt_attach_reply (extra->fp, extra->hdr, extra->idx,
6674 + extra->idxlen, extra->bdy, SENDNEWS|SENDREPLY);
6676 + ci_send_message (SENDNEWS|SENDREPLY, NULL, NULL,
6677 + extra->ctx, extra->hdr);
6678 + redraw = REDRAW_FULL;
6684 CHECK_MODE(IsHeader (extra) || IsMsgAttach (extra));
6686 @@ -2477,7 +2563,7 @@ search_next:
6688 if (IsMsgAttach (extra))
6689 mutt_attach_forward (extra->fp, extra->hdr, extra->idx,
6690 - extra->idxlen, extra->bdy);
6691 + extra->idxlen, extra->bdy, 0);
6693 ci_send_message (SENDFORWARD, NULL, NULL, extra->ctx, extra->hdr);
6694 redraw = REDRAW_FULL;
6695 diff -udprP mutt-1.5.16.orig/parse.c mutt-1.5.16/parse.c
6696 --- mutt-1.5.16.orig/parse.c 2007-04-02 00:58:56.000000000 +0300
6697 +++ mutt-1.5.16/parse.c 2007-06-15 17:12:26.000000000 +0300
6698 @@ -89,7 +89,7 @@ char *mutt_read_rfc822_line (FILE *f, ch
6702 -static LIST *mutt_parse_references (char *s, int in_reply_to)
6703 +LIST *mutt_parse_references (char *s, int in_reply_to)
6705 LIST *t, *lst = NULL;
6707 @@ -1068,6 +1068,17 @@ int mutt_parse_rfc822_line (ENVELOPE *e,
6708 e->from = rfc822_parse_adrlist (e->from, p);
6712 + else if (!mutt_strcasecmp (line+1, "ollowup-to"))
6714 + if (!e->followup_to)
6716 + mutt_remove_trailing_ws (p);
6717 + e->followup_to = safe_strdup (mutt_skip_whitespace (p));
6725 @@ -1152,6 +1163,27 @@ int mutt_parse_rfc822_line (ENVELOPE *e,
6731 + if (!mutt_strcasecmp (line + 1, "ewsgroups"))
6733 + FREE (&e->newsgroups);
6734 + mutt_remove_trailing_ws (p);
6735 + e->newsgroups = safe_strdup (mutt_skip_whitespace (p));
6742 + /* field `Organization:' saves only for pager! */
6743 + if (!mutt_strcasecmp (line + 1, "rganization"))
6745 + if (!e->organization && mutt_strcasecmp (p, "unknown"))
6746 + e->organization = safe_strdup (p);
6751 if (!ascii_strcasecmp (line + 1, "eferences"))
6753 @@ -1260,6 +1292,20 @@ int mutt_parse_rfc822_line (ENVELOPE *e,
6754 e->x_label = safe_strdup(p);
6758 + else if (!mutt_strcasecmp (line + 1, "-comment-to"))
6760 + if (!e->x_comment_to)
6761 + e->x_comment_to = safe_strdup (p);
6764 + else if (!mutt_strcasecmp (line + 1, "ref"))
6767 + e->xref = safe_strdup (p);
6774 diff -udprP mutt-1.5.16.orig/pattern.c mutt-1.5.16/pattern.c
6775 --- mutt-1.5.16.orig/pattern.c 2007-04-08 02:36:55.000000000 +0300
6776 +++ mutt-1.5.16/pattern.c 2007-06-15 17:12:26.000000000 +0300
6777 @@ -91,6 +91,9 @@ Flags[] =
6778 { 'U', M_UNREAD, 0, NULL },
6779 { 'v', M_COLLAPSED, 0, NULL },
6780 { 'V', M_CRYPT_VERIFIED, 0, NULL },
6782 + { 'w', M_NEWSGROUPS, 0, eat_regexp },
6784 { 'x', M_REFERENCE, 0, eat_regexp },
6785 { 'X', M_MIMEATTACH, 0, eat_range },
6786 { 'y', M_XLABEL, 0, eat_regexp },
6787 @@ -1214,6 +1217,10 @@ mutt_pattern_exec (struct pattern_t *pat
6789 case M_UNREFERENCED:
6790 return (pat->not ^ (h->thread && !h->thread->child));
6792 + case M_NEWSGROUPS:
6793 + return (pat->not ^ (h->env->newsgroups && patmatch (pat, h->env->newsgroups) == 0));
6796 mutt_error (_("error: unknown op %d (report this error)."), pat->op);
6798 @@ -1282,6 +1289,7 @@ int mutt_pattern_func (int op, char *pro
6799 progress_t progress;
6801 strfcpy (buf, NONULL (Context->pattern), sizeof (buf));
6802 + if (prompt || op != M_LIMIT)
6803 if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0 || !buf[0])
6806 diff -udprP mutt-1.5.16.orig/po/POTFILES.in mutt-1.5.16/po/POTFILES.in
6807 --- mutt-1.5.16.orig/po/POTFILES.in 2007-04-02 00:58:57.000000000 +0300
6808 +++ mutt-1.5.16/po/POTFILES.in 2007-06-15 17:12:26.000000000 +0300
6809 @@ -47,6 +47,8 @@ mutt_ssl_gnutls.c
6818 diff -udprP mutt-1.5.16.orig/postpone.c mutt-1.5.16/postpone.c
6819 --- mutt-1.5.16.orig/postpone.c 2007-04-02 00:58:57.000000000 +0300
6820 +++ mutt-1.5.16/postpone.c 2007-06-15 17:12:26.000000000 +0300
6821 @@ -126,15 +126,26 @@ int mutt_num_postponed (int force)
6823 if (LastModify < st.st_mtime)
6826 + int optnews = option (OPTNEWS);
6828 LastModify = st.st_mtime;
6830 if (access (Postponed, R_OK | F_OK) != 0)
6831 return (PostCount = 0);
6834 + unset_option (OPTNEWS);
6836 if (mx_open_mailbox (Postponed, M_NOSORT | M_QUIET, &ctx) == NULL)
6839 PostCount = ctx.msgcount;
6840 mx_fastclose_mailbox (&ctx);
6843 + set_option (OPTNEWS);
6848 diff -udprP mutt-1.5.16.orig/protos.h mutt-1.5.16/protos.h
6849 --- mutt-1.5.16.orig/protos.h 2007-04-16 02:56:26.000000000 +0300
6850 +++ mutt-1.5.16/protos.h 2007-06-15 17:12:26.000000000 +0300
6851 @@ -113,6 +113,7 @@ HASH *mutt_make_id_hash (CONTEXT *);
6852 HASH *mutt_make_subj_hash (CONTEXT *);
6854 LIST *mutt_make_references(ENVELOPE *e);
6855 +LIST *mutt_parse_references (char *, int);
6857 char *mutt_read_rfc822_line (FILE *, char *, size_t *);
6858 ENVELOPE *mutt_read_rfc822_header (FILE *, HEADER *, short, short);
6859 @@ -256,6 +257,7 @@ void mutt_unblock_signals_system (int);
6860 void mutt_update_encoding (BODY *a);
6861 void mutt_version (void);
6862 void mutt_view_attachments (HEADER *);
6863 +void mutt_write_references (LIST *, FILE *);
6864 void mutt_write_address_list (ADDRESS *adr, FILE *fp, int linelen, int display);
6865 void mutt_set_virtual (CONTEXT *);
6867 diff -udprP mutt-1.5.16.orig/recvattach.c mutt-1.5.16/recvattach.c
6868 --- mutt-1.5.16.orig/recvattach.c 2007-04-16 02:56:26.000000000 +0300
6869 +++ mutt-1.5.16/recvattach.c 2007-06-15 17:12:26.000000000 +0300
6870 @@ -1088,6 +1088,15 @@ void mutt_view_attachments (HEADER *hdr)
6875 + if (Context->magic == M_NNTP)
6878 + mutt_error _("Can't delete attachment from newsserver.");
6883 if (WithCrypto && hdr->security & ~PGP_TRADITIONAL_CHECKED)
6886 @@ -1179,10 +1188,33 @@ void mutt_view_attachments (HEADER *hdr)
6887 case OP_FORWARD_MESSAGE:
6889 mutt_attach_forward (fp, hdr, idx, idxlen,
6890 - menu->tagprefix ? NULL : idx[menu->current]->content);
6891 + menu->tagprefix ? NULL : idx[menu->current]->content, 0);
6892 menu->redraw = REDRAW_FULL;
6896 + case OP_FORWARD_TO_GROUP:
6898 + mutt_attach_forward (fp, hdr, idx, idxlen,
6899 + menu->tagprefix ? NULL : idx[menu->current]->content, SENDNEWS);
6900 + menu->redraw = REDRAW_FULL;
6906 + if (!idx[menu->current]->content->hdr->env->followup_to ||
6907 + mutt_strcasecmp (idx[menu->current]->content->hdr->env->followup_to, "poster") ||
6908 + query_quadoption (OPT_FOLLOWUPTOPOSTER,_("Reply by mail as poster prefers?")) != M_YES)
6910 + mutt_attach_reply (fp, hdr, idx, idxlen,
6911 + menu->tagprefix ? NULL : idx[menu->current]->content,
6912 + SENDNEWS|SENDREPLY);
6913 + menu->redraw = REDRAW_FULL;
6919 case OP_GROUP_REPLY:
6921 diff -udprP mutt-1.5.16.orig/recvcmd.c mutt-1.5.16/recvcmd.c
6922 --- mutt-1.5.16.orig/recvcmd.c 2007-04-02 00:58:57.000000000 +0300
6923 +++ mutt-1.5.16/recvcmd.c 2007-06-15 17:12:26.000000000 +0300
6924 @@ -377,7 +377,7 @@ static BODY ** copy_problematic_attachme
6925 static void attach_forward_bodies (FILE * fp, HEADER * hdr,
6926 ATTACHPTR ** idx, short idxlen,
6929 + short nattach, int flags)
6932 short mime_fwd_all = 0;
6933 @@ -523,7 +523,7 @@ _("Can't decode all tagged attachments.
6936 /* now that we have the template, send it. */
6937 - ci_send_message (0, tmphdr, tmpbody, NULL, parent);
6938 + ci_send_message (flags, tmphdr, tmpbody, NULL, parent);
6942 @@ -550,7 +550,7 @@ _("Can't decode all tagged attachments.
6945 static void attach_forward_msgs (FILE * fp, HEADER * hdr,
6946 - ATTACHPTR ** idx, short idxlen, BODY * cur)
6947 + ATTACHPTR ** idx, short idxlen, BODY * cur, int flags)
6949 HEADER *curhdr = NULL;
6951 @@ -655,23 +655,23 @@ static void attach_forward_msgs (FILE *
6953 mutt_free_header (&tmphdr);
6955 - ci_send_message (0, tmphdr, *tmpbody ? tmpbody : NULL,
6956 + ci_send_message (flags, tmphdr, *tmpbody ? tmpbody : NULL,
6961 void mutt_attach_forward (FILE * fp, HEADER * hdr,
6962 - ATTACHPTR ** idx, short idxlen, BODY * cur)
6963 + ATTACHPTR ** idx, short idxlen, BODY * cur, int flags)
6968 if (check_all_msg (idx, idxlen, cur, 0) == 0)
6969 - attach_forward_msgs (fp, hdr, idx, idxlen, cur);
6970 + attach_forward_msgs (fp, hdr, idx, idxlen, cur, flags);
6973 nattach = count_tagged (idx, idxlen);
6974 - attach_forward_bodies (fp, hdr, idx, idxlen, cur, nattach);
6975 + attach_forward_bodies (fp, hdr, idx, idxlen, cur, nattach, flags);
6979 @@ -729,28 +729,40 @@ attach_reply_envelope_defaults (ENVELOPE
6985 + if ((flags & SENDNEWS))
6987 - if (mutt_fetch_recips (env, curenv, flags) == -1)
6989 + /* in case followup set Newsgroups: with Followup-To: if it present */
6990 + if (!env->newsgroups && curenv &&
6991 + mutt_strcasecmp (curenv->followup_to, "poster"))
6992 + env->newsgroups = safe_strdup (curenv->followup_to);
6997 - for (i = 0; i < idxlen; i++)
7000 - if (idx[i]->content->tagged
7001 - && mutt_fetch_recips (env, idx[i]->content->hdr->env, flags) == -1)
7002 + if (mutt_fetch_recips (env, curenv, flags) == -1)
7007 + for (i = 0; i < idxlen; i++)
7009 + if (idx[i]->content->tagged
7010 + && mutt_fetch_recips (env, idx[i]->content->hdr->env, flags) == -1)
7015 + if ((flags & SENDLISTREPLY) && !env->to)
7017 + mutt_error _("No mailing lists found!");
7021 + mutt_fix_reply_recipients (env);
7024 - if ((flags & SENDLISTREPLY) && !env->to)
7026 - mutt_error _("No mailing lists found!");
7030 - mutt_fix_reply_recipients (env);
7031 mutt_make_misc_reply_headers (env, Context, curhdr, curenv);
7034 @@ -811,6 +823,13 @@ void mutt_attach_reply (FILE * fp, HEADE
7035 char prefix[SHORT_STRING];
7039 + if (flags & SENDNEWS)
7040 + set_option (OPTNEWSSEND);
7042 + unset_option (OPTNEWSSEND);
7045 if (check_all_msg (idx, idxlen, cur, 0) == -1)
7047 nattach = count_tagged (idx, idxlen);
7048 diff -udprP mutt-1.5.16.orig/rfc1524.c mutt-1.5.16/rfc1524.c
7049 --- mutt-1.5.16.orig/rfc1524.c 2007-04-02 00:58:58.000000000 +0300
7050 +++ mutt-1.5.16/rfc1524.c 2007-06-15 17:12:26.000000000 +0300
7051 @@ -569,13 +569,13 @@ int rfc1524_expand_filename (char *namet
7055 -int mutt_rename_file (char *oldfile, char *newfile)
7056 +int _mutt_rename_file (char *oldfile, char *newfile, int overwrite)
7060 if (access (oldfile, F_OK) != 0)
7062 - if (access (newfile, F_OK) == 0)
7063 + if (!overwrite && access (newfile, F_OK) == 0)
7065 if ((ofp = fopen (oldfile,"r")) == NULL)
7067 @@ -590,3 +590,8 @@ int mutt_rename_file (char *oldfile, cha
7068 mutt_unlink (oldfile);
7072 +int mutt_rename_file (char *oldfile, char *newfile)
7074 + return _mutt_rename_file (oldfile, newfile, 0);
7076 diff -udprP mutt-1.5.16.orig/rfc1524.h mutt-1.5.16/rfc1524.h
7077 --- mutt-1.5.16.orig/rfc1524.h 2007-04-02 00:58:58.000000000 +0300
7078 +++ mutt-1.5.16/rfc1524.h 2007-06-15 17:12:26.000000000 +0300
7079 @@ -40,5 +40,6 @@ int rfc1524_expand_command (BODY *, char
7080 int rfc1524_expand_filename (char *, char *, char *, size_t);
7081 int rfc1524_mailcap_lookup (BODY *, char *, rfc1524_entry *, int);
7082 int mutt_rename_file (char *, char *);
7083 +int _mutt_rename_file (char *, char *, int);
7085 #endif /* _RFC1524_H */
7086 diff -udprP mutt-1.5.16.orig/send.c mutt-1.5.16/send.c
7087 --- mutt-1.5.16.orig/send.c 2007-04-10 07:34:53.000000000 +0300
7088 +++ mutt-1.5.16/send.c 2007-06-15 17:12:26.000000000 +0300
7090 #include <sys/types.h>
7098 #include "remailer.h"
7100 @@ -214,17 +218,51 @@ static int edit_address (ADDRESS **a, /*
7104 -static int edit_envelope (ENVELOPE *en)
7105 +static int edit_envelope (ENVELOPE *en, int flags)
7107 char buf[HUGE_STRING];
7108 LIST *uh = UserHeader;
7110 - if (edit_address (&en->to, "To: ") == -1 || en->to == NULL)
7112 - if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1)
7114 - if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1)
7117 + if (option (OPTNEWSSEND))
7119 + if (en->newsgroups)
7120 + strfcpy (buf, en->newsgroups, sizeof (buf));
7123 + if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) != 0)
7125 + FREE (&en->newsgroups);
7126 + en->newsgroups = safe_strdup (buf);
7128 + if (en->followup_to)
7129 + strfcpy (buf, en->followup_to, sizeof (buf));
7132 + if (option (OPTASKFOLLOWUP) && mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) != 0)
7134 + FREE (&en->followup_to);
7135 + en->followup_to = safe_strdup (buf);
7137 + if (en->x_comment_to)
7138 + strfcpy (buf, en->x_comment_to, sizeof (buf));
7141 + if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO) && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
7143 + FREE (&en->x_comment_to);
7144 + en->x_comment_to = safe_strdup (buf);
7149 + if (edit_address (&en->to, "To: ") == -1 || en->to == NULL)
7151 + if (option (OPTASKCC) && edit_address (&en->cc, "Cc: ") == -1)
7153 + if (option (OPTASKBCC) && edit_address (&en->bcc, "Bcc: ") == -1)
7159 @@ -260,6 +298,14 @@ static int edit_envelope (ENVELOPE *en)
7164 +char *nntp_get_header (const char *s)
7167 + return safe_strdup (s);
7171 static void process_user_recips (ENVELOPE *env)
7173 LIST *uh = UserHeader;
7174 @@ -272,6 +318,14 @@ static void process_user_recips (ENVELOP
7175 env->cc = rfc822_parse_adrlist (env->cc, uh->data + 3);
7176 else if (ascii_strncasecmp ("bcc:", uh->data, 4) == 0)
7177 env->bcc = rfc822_parse_adrlist (env->bcc, uh->data + 4);
7179 + else if (ascii_strncasecmp ("newsgroups:", uh->data, 11) == 0)
7180 + env->newsgroups = nntp_get_header (uh->data + 11);
7181 + else if (ascii_strncasecmp ("followup-to:", uh->data, 12) == 0)
7182 + env->followup_to = nntp_get_header (uh->data + 12);
7183 + else if (ascii_strncasecmp ("x-comment-to:", uh->data, 13) == 0)
7184 + env->x_comment_to = nntp_get_header (uh->data + 13);
7189 @@ -302,6 +356,12 @@ static void process_user_header (ENVELOP
7190 else if (ascii_strncasecmp ("to:", uh->data, 3) != 0 &&
7191 ascii_strncasecmp ("cc:", uh->data, 3) != 0 &&
7192 ascii_strncasecmp ("bcc:", uh->data, 4) != 0 &&
7194 + ascii_strncasecmp ("newsgroups:", uh->data, 11) != 0 &&
7195 + ascii_strncasecmp ("followup-to:", uh->data, 12) != 0 &&
7196 + ascii_strncasecmp ("x-comment-to:", uh->data, 13) != 0 &&
7198 + ascii_strncasecmp ("supersedes:", uh->data, 11) != 0 &&
7199 ascii_strncasecmp ("subject:", uh->data, 8) != 0)
7202 @@ -645,6 +705,10 @@ void mutt_add_to_reference_headers (ENVE
7207 + if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
7208 + env->x_comment_to = safe_strdup (mutt_get_name (curenv->from));
7213 @@ -701,6 +765,16 @@ envelope_defaults (ENVELOPE *env, CONTEX
7215 if (flags & SENDREPLY)
7218 + if ((flags & SENDNEWS))
7220 + /* in case followup set Newsgroups: with Followup-To: if it present */
7221 + if (!env->newsgroups && curenv &&
7222 + mutt_strcasecmp (curenv->followup_to, "poster"))
7223 + env->newsgroups = safe_strdup (curenv->followup_to);
7230 @@ -847,7 +921,18 @@ void mutt_set_followup_to (ENVELOPE *e)
7231 * it hasn't already been set
7234 - if (option (OPTFOLLOWUPTO) && !e->mail_followup_to)
7235 + if (!option (OPTFOLLOWUPTO))
7238 + if (option (OPTNEWSSEND))
7240 + if (!e->followup_to && e->newsgroups && (strrchr (e->newsgroups, ',')))
7241 + e->followup_to = safe_strdup (e->newsgroups);
7246 + if (!e->mail_followup_to)
7248 if (mutt_is_list_cc (0, e->to, e->cc))
7250 @@ -1008,6 +1093,9 @@ static int send_message (HEADER *msg)
7255 + if (!option (OPTNEWSSEND))
7256 +#endif /* USE_NNTP */
7258 return mutt_smtp_send (msg->env->from, msg->env->to, msg->env->cc,
7259 msg->env->bcc, tempfile,
7260 @@ -1100,6 +1188,13 @@ ci_send_message (int flags, /* send mod
7265 + if (flags & SENDNEWS)
7266 + set_option (OPTNEWSSEND);
7268 + unset_option (OPTNEWSSEND);
7271 if (!flags && !msg && quadoption (OPT_RECALL) != M_NO &&
7272 mutt_num_postponed (1))
7274 @@ -1130,6 +1225,22 @@ ci_send_message (int flags, /* send mod
7276 if ((flags = mutt_get_postponed (ctx, msg, &cur, fcc, sizeof (fcc))) < 0)
7280 + * If postponed message is a news article, it have
7281 + * a "Newsgroups:" header line, then set appropriate flag.
7283 + if (msg->env->newsgroups)
7285 + flags |= SENDNEWS;
7286 + set_option (OPTNEWSSEND);
7290 + flags &= ~SENDNEWS;
7291 + unset_option (OPTNEWSSEND);
7296 if (flags & (SENDPOSTPONED|SENDRESEND))
7297 @@ -1237,11 +1348,16 @@ ci_send_message (int flags, /* send mod
7298 if (flags & SENDREPLY)
7299 mutt_fix_reply_recipients (msg->env);
7302 + if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP && !msg->env->newsgroups)
7303 + msg->env->newsgroups = safe_strdup (((NNTP_DATA *)ctx->data)->group);
7306 if (! (flags & SENDMAILX) &&
7307 ! (option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
7308 ! ((flags & SENDREPLY) && option (OPTFASTREPLY)))
7310 - if (edit_envelope (msg->env) == -1)
7311 + if (edit_envelope (msg->env, flags) == -1)
7315 @@ -1495,6 +1611,11 @@ main_loop:
7320 + if (flags & SENDNEWS)
7321 + mutt_message _("Article not posted.");
7324 mutt_message _("Mail not sent.");
7327 @@ -1527,6 +1648,9 @@ main_loop:
7332 + if (!(flags & SENDNEWS))
7334 if (!msg->env->to && !msg->env->cc && !msg->env->bcc)
7336 if (! (flags & SENDBATCH))
7337 @@ -1559,6 +1683,19 @@ main_loop:
7338 mutt_error _("No subject specified.");
7342 + if ((flags & SENDNEWS) && !msg->env->subject)
7344 + mutt_error _("No subject specified.");
7348 + if ((flags & SENDNEWS) && !msg->env->newsgroups)
7350 + mutt_error _("No newsgroup specified.");
7355 if (msg->content->next)
7356 msg->content = mutt_make_multipart (msg->content);
7357 @@ -1764,7 +1901,12 @@ full_fcc:
7360 else if (!option (OPTNOCURSES) && ! (flags & SENDMAILX))
7361 - mutt_message (i == 0 ? _("Mail sent.") : _("Sending in background."));
7362 + mutt_message (i != 0 ? _("Sending in background.") :
7364 + (flags & SENDNEWS) ? _("Article posted.") : _("Mail sent."));
7369 if (WithCrypto && (msg->security & ENCRYPT))
7371 diff -udprP mutt-1.5.16.orig/sendlib.c mutt-1.5.16/sendlib.c
7372 --- mutt-1.5.16.orig/sendlib.c 2007-06-10 01:12:38.000000000 +0300
7373 +++ mutt-1.5.16/sendlib.c 2007-06-15 17:12:26.000000000 +0300
7375 #include <sys/wait.h>
7382 #ifdef HAVE_SYSEXITS_H
7383 #include <sysexits.h>
7384 #else /* Make sure EX_OK is defined <philiph@pobox.com> */
7385 @@ -1525,7 +1529,7 @@ void mutt_write_address_list (ADDRESS *a
7386 /* need to write the list in reverse because they are stored in reverse order
7387 * when parsed to speed up threading
7389 -static void write_references (LIST *r, FILE *f)
7390 +void mutt_write_references (LIST *r, FILE *f)
7393 int refcnt = 0, refmax = 0;
7394 @@ -1750,6 +1754,9 @@ int mutt_write_rfc822_header (FILE *fp,
7395 LIST *tmp = env->userhdrs;
7396 int has_agent = 0; /* user defined user-agent header field exists */
7399 + if (!option (OPTNEWSSEND))
7401 if (mode == 0 && !privacy)
7402 fputs (mutt_make_date (buffer, sizeof(buffer)), fp);
7404 @@ -1776,6 +1783,9 @@ int mutt_write_rfc822_header (FILE *fp,
7405 mutt_write_address_list (env->to, fp, 4, 0);
7409 + if (!option (OPTNEWSSEND))
7411 fputs ("To: \n", fp);
7414 @@ -1784,6 +1794,9 @@ int mutt_write_rfc822_header (FILE *fp,
7415 mutt_write_address_list (env->cc, fp, 4, 0);
7419 + if (!option (OPTNEWSSEND))
7421 fputs ("Cc: \n", fp);
7424 @@ -1795,8 +1808,28 @@ int mutt_write_rfc822_header (FILE *fp,
7429 + if (!option (OPTNEWSSEND))
7431 fputs ("Bcc: \n", fp);
7434 + if (env->newsgroups)
7435 + fprintf (fp, "Newsgroups: %s\n", env->newsgroups);
7436 + else if (mode == 1 && option (OPTNEWSSEND))
7437 + fputs ("Newsgroups: \n", fp);
7439 + if (env->followup_to)
7440 + fprintf (fp, "Followup-To: %s\n", env->followup_to);
7441 + else if (mode == 1 && option (OPTNEWSSEND))
7442 + fputs ("Followup-To: \n", fp);
7444 + if (env->x_comment_to)
7445 + fprintf (fp, "X-Comment-To: %s\n", env->x_comment_to);
7446 + else if (mode == 1 && option (OPTNEWSSEND) && option (OPTXCOMMENTTO))
7447 + fputs ("X-Comment-To: \n", fp);
7451 mutt_write_one_header (fp, "Subject", env->subject, NULL, 0);
7453 @@ -1815,6 +1848,9 @@ int mutt_write_rfc822_header (FILE *fp,
7454 fputs ("Reply-To: \n", fp);
7456 if (env->mail_followup_to)
7458 + if (!option (OPTNEWSSEND))
7461 fputs ("Mail-Followup-To: ", fp);
7462 mutt_write_address_list (env->mail_followup_to, fp, 18, 0);
7463 @@ -1825,7 +1861,7 @@ int mutt_write_rfc822_header (FILE *fp,
7464 if (env->references)
7466 fputs ("References:", fp);
7467 - write_references (env->references, fp);
7468 + mutt_write_references (env->references, fp);
7472 @@ -1837,7 +1873,7 @@ int mutt_write_rfc822_header (FILE *fp,
7473 if (env->in_reply_to)
7475 fputs ("In-Reply-To:", fp);
7476 - write_references (env->in_reply_to, fp);
7477 + mutt_write_references (env->in_reply_to, fp);
7481 @@ -2153,11 +2189,30 @@ mutt_invoke_sendmail (ADDRESS *from, /*
7482 const char *msg, /* file containing message */
7483 int eightbit) /* message contains 8bit chars */
7485 - char *ps = NULL, *path = NULL, *s = safe_strdup (Sendmail), *childout = NULL;
7486 + char *ps = NULL, *path = NULL, *s = NULL, *childout = NULL;
7488 size_t argslen = 0, argsmax = 0;
7492 + if (option (OPTNEWSSEND))
7494 + char cmd[LONG_STRING];
7496 + mutt_FormatString (cmd, sizeof (cmd), 0, NONULL (Inews), nntp_format_str, 0, 0);
7499 + i = nntp_post (msg);
7504 + s = safe_strdup (cmd);
7508 + s = safe_strdup (Sendmail);
7512 while ((ps = strtok (ps, " ")))
7513 @@ -2181,6 +2236,10 @@ mutt_invoke_sendmail (ADDRESS *from, /*
7518 + if (!option (OPTNEWSSEND))
7521 if (eightbit && option (OPTUSE8BITMIME))
7522 args = add_option (args, &argslen, &argsmax, "-B8BITMIME");
7524 @@ -2212,6 +2271,9 @@ mutt_invoke_sendmail (ADDRESS *from, /*
7525 args = add_args (args, &argslen, &argsmax, to);
7526 args = add_args (args, &argslen, &argsmax, cc);
7527 args = add_args (args, &argslen, &argsmax, bcc);
7532 if (argslen == argsmax)
7533 safe_realloc (&args, sizeof (char *) * (++argsmax));
7534 @@ -2344,6 +2406,9 @@ void mutt_prepare_envelope (ENVELOPE *en
7535 rfc2047_encode_adrlist (env->reply_to, "Reply-To");
7539 + if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT))
7542 rfc2047_encode_string (&env->subject);
7544 @@ -2449,6 +2514,10 @@ int mutt_bounce_message (FILE *fp, HEADE
7546 rfc822_write_address (resent_from, sizeof (resent_from), from, 0);
7549 + unset_option (OPTNEWSSEND);
7552 ret = _mutt_bounce_message (fp, h, to, resent_from, from);
7554 rfc822_free_address (&from);
7555 diff -udprP mutt-1.5.16.orig/sort.c mutt-1.5.16/sort.c
7556 --- mutt-1.5.16.orig/sort.c 2007-06-06 19:02:56.000000000 +0300
7557 +++ mutt-1.5.16/sort.c 2007-06-15 17:12:26.000000000 +0300
7558 @@ -151,6 +151,15 @@ int compare_order (const void *a, const
7559 HEADER **ha = (HEADER **) a;
7560 HEADER **hb = (HEADER **) b;
7563 + if ((*ha)->article_num && (*hb)->article_num)
7565 + int result = (*ha)->article_num - (*hb)->article_num;
7566 + AUXSORT(result,a,b);
7567 + return (SORTCODE (result));
7571 /* no need to auxsort because you will never have equality here */
7572 return (SORTCODE ((*ha)->index - (*hb)->index));
7574 diff -udprP mutt-1.5.16.orig/url.c mutt-1.5.16/url.c
7575 --- mutt-1.5.16.orig/url.c 2007-04-11 02:15:42.000000000 +0300
7576 +++ mutt-1.5.16/url.c 2007-06-15 17:12:26.000000000 +0300
7577 @@ -39,6 +39,8 @@ static struct mapping_t UrlMap[] =
7578 { "imaps", U_IMAPS },
7581 + { "news", U_NNTP },
7582 + { "newss", U_NNTPS },
7583 { "mailto", U_MAILTO },
7585 { "smtps", U_SMTPS },
7586 diff -udprP mutt-1.5.16.orig/url.h mutt-1.5.16/url.h
7587 --- mutt-1.5.16.orig/url.h 2007-04-11 02:16:09.000000000 +0300
7588 +++ mutt-1.5.16/url.h 2007-06-15 17:12:26.000000000 +0300
7589 @@ -8,6 +8,8 @@ typedef enum url_scheme