snapshot of project "tin", label ctin961227

Author: ThomasDickey

CHANGES

@@ -1,3 +1,21 @@
+--unoff BETA release 961226 --
+
+260) Thomas E. Dickey <dickey@clark.net>
+     ADD. extends 'makecfg' to generate type-specific tables for string and
+          char pointers, getting rid of the void* casts in tincfg.h
+          modifies config.c and prompt.c accordingly.
+     ADD. fixes color.c to work in xterm (i.e., the XFree86 3.2 version, or
+          rxvt -- there's no point in fixing for color_xterm unless we
+          converted to using ncurses).
+     ADD. eliminates some of the clutter in post.c by using new utility
+          functions (I did that when seeing that the newline in a subject
+          wasn't stripped properly).
+     FIX. several supplied patches
+
+259) Urs Janssen <urs@akk.uni-karlsruhe.de>
+     ADD. minor code clean-up
+     FIX. several supplied patches
+
 --unoff BETA release 961225 --
 
 258) Roland Rosenfeld <roland@spinnaker.rhein.de>

MANIFEST

@@ -1,7 +1,7 @@
-MANIFEST for tin-1.3-unoff-BETA-961225 (Wed Dec 25 21:18:22 MET 1996)
+MANIFEST for tin-1.3-unoff-BETA-961227 (Sat Dec 28 04:37:15 MET 1996)
 ----------------------------------------------------
-  55652 ./CHANGES
-  13549 ./TODO
+  56438 ./CHANGES
+  13528 ./TODO
    5341 ./Makefile
   17216 ./INSTALL
    2260 ./MANIFEST
@@ -20,76 +20,76 @@ MANIFEST for tin-1.3-unoff-BETA-961225 (Wed Dec 25 21:18:22 MET 1996)
    2511 ./include/amiga.h
    2131 ./include/amigatcp.h
    8277 ./include/config.h
-  41562 ./include/extern.h
+  41665 ./include/extern.h
   12877 ./include/menukeys.h
     718 ./include/msmail.h
    4764 ./include/nntplib.h
    2233 ./include/os_2.h
-  29528 ./include/proto.h
+  29547 ./include/proto.h
    1376 ./include/stpwatch.h
-  44089 ./include/tin.h
+  44290 ./include/tin.h
     810 ./include/version.h
    4100 ./include/win32.h
     789 ./include/win32tcp.h
   19657 ./src/active.c
-   8119 ./src/actived.c
+   8046 ./src/actived.c
   13003 ./src/amiga.c
    4429 ./src/amigatcp.c
   37829 ./src/art.c
   23873 ./src/attrib.c
    8460 ./src/charset.c
-   4088 ./src/color.c
-  58136 ./src/config.c
+   4314 ./src/color.c
+  57985 ./src/config.c
   20325 ./src/curses.c
   12401 ./src/debug.c
    2278 ./src/envarg.c
   19436 ./src/feed.c
   39695 ./src/filter.c
   10935 ./src/getline.c
-  41516 ./src/group.c
+  41501 ./src/group.c
    3202 ./src/hashstr.c
    9523 ./src/help.c
   12146 ./src/inews.c
-  29896 ./src/init.c
-  56292 ./src/lang.c
+  29895 ./src/init.c
+  56402 ./src/lang.c
    1739 ./src/list.c
   11984 ./src/mail.c
-  19013 ./src/main.c
-   5124 ./src/makecfg.c
+  19517 ./src/main.c
+   8108 ./src/makecfg.c
    9471 ./src/memory.c
   48344 ./src/misc.c
    7228 ./src/msmail.c
   33605 ./src/newsrc.c
-  26312 ./src/nntplib.c
+  26548 ./src/nntplib.c
   31349 ./src/nntpw32.c
    6176 ./src/nrctbl.c
   28884 ./src/open.c
    6242 ./src/os_2.c
   35769 ./src/page.c
   24090 ./src/parsdate.y
    6631 ./src/pgp.c
-  77194 ./src/post.c
-   9094 ./src/prompt.c
+  75667 ./src/post.c
+   8982 ./src/prompt.c
     160 ./src/proto.sed
   22480 ./src/refs.c
    8741 ./src/rfc1521.c
-  17528 ./src/rfc1522.c
+  17513 ./src/rfc1522.c
   33849 ./src/save.c
    4573 ./src/screen.c
   10148 ./src/search.c
-  35521 ./src/select.c
+  35570 ./src/select.c
    5667 ./src/sigfile.c
   12442 ./src/signal.c
    5772 ./src/strftime.c
-  26178 ./src/thread.c
+  26155 ./src/thread.c
    4131 ./src/wildmat.c
   12575 ./src/win32.c
    2134 ./src/win32tcp.c
    6281 ./src/xref.c
    5552 ./src/vms.c
    7243 ./include/autoconf.hin
-  11137 ./src/Makefile.in
+  11142 ./src/Makefile.in
    4278 ./src/l1_next.tab
    4278 ./src/next_l1.tab
    3653 ./src/tincfg.tbl
-1607412 insgesamt
+1610697 insgesamt

Makefile

@@ -4,7 +4,7 @@ PROJECT		= tin
 EXE		= tin
 MANEXT		= 1
 LVER		= 1.3
-PVER		= 961225
+PVER		= 961227
 VER		= $(LVER)-unoff-BETA-$(PVER)
 MAIL_ADDR 	= "urs@akk.uni-karlsruhe.de"
 

TODO

@@ -7,7 +7,8 @@ o  if ((n > 9999) && (x > 9999)) n is truncated to the left most 4 digits
    (thread_x_of_n, group.c) (use tin_itoa would help)
 
 o  'From: "Lastname, Firstname" <netscape@luser.dau>' is not displayed
-   correct at all levels - it appears as '"Lastname' -> rewrite parse_from()
+   correct at all levels - it appears as '"Lastname'
+   -> rewrite parse_from()
 
 o  on x*n+1 articles (n=articles on one screen) - <end> does not work
    correctly (it jumps to the (x*n)th artilce - f.e. 22 articles, 21 per
@@ -44,18 +45,13 @@ o  if postings fails tin rereads the article numbers for the group you
    useless!
 
 o  Followup-To: line is not examined weather the mentioned group(s) are valid
-   on this server (btw. with nntp_only & tin -n this feature is useless
-   cause it may lead to wrong results (on the other hand, posting in a
-   newsgroup which one isn't subscribed to is not very useful))
+   on this server.
 
 o  Newsgroup: and Followup-To: stripping should be done before Followup-To:
    is examined weather it contains several groups...
 
 o  if a colored signature wraps over a page-break, the coloring gets lost
 
-o  'D' deleted article flag (thread selection level) is not showing up.
-   (is it still needed?!)
-
 o  tin does not warn you if you try to save into a directory and not into
    a file. 
 
@@ -109,8 +105,6 @@ o  unique newsgroups after editing article
 
 o  add feature save selected/tagged files sequentially to the same file
 
-o  rewrite NGLIMIT handling (post.c)
-
 o  add feature Cc:
 
 o  sender-patch
@@ -143,6 +137,9 @@ o  Additions to the thread menu :
 	'S' (autosave tagged)
 	'U' (untag all)
 	'M' (option menu)
+	'w' (post an article)
+	'r' (reply to) /* not 'R' cause it conflicts with mail_bugreport */
+	'f' (post a followup)
 	keys to goto previous/next thread
 
 o  Add 'l' (goto thread menu) to the article pager
@@ -163,9 +160,11 @@ o  if Newsgroups:-line has groups in it which are not present in the users
 o  fix built-in inews to truncate signature > 4 lines
    (compile-time option?)
 
-o  bring up a warning on a long newsgroup/followup line (>=5 groups) and
-   force the user to confirm every single group he wants to post in.
-   (N/y)
+o  bring up a warning on a long newsgroup (>=5) line and
+   force the user to confirm every single group he wants to post (or
+   redirect followups to) in. (N/y)
+   rewrite NGLIMIT handling (post.c)
+   (not just truncate Newsgroups:-line after the NGLIMITth newsgroup)
 
 o  bring up a warning when trying to f'up into a binaries group
    (Warning, sending a followup to a binaries group is undesired, post it
@@ -356,3 +355,5 @@ o  marking latest article with 'K' does not jump to top of newsgroup if
 
 o  when resizing an xterm (on SunOS, at least), tin will repaint the screen
    when the user is actually in an editor spawned by tin.
+
+o  check where tin_done() should be called instead of using exit()

include/extern.h

@@ -199,6 +199,8 @@ extern char *optarg;
  */
 
 extern FILE *note_fp;				/* body of current article */
+extern char *OPT_CHAR_list[];
+extern char *OPT_STRING_list[];
 extern char *glob_art_group;
 extern char *glob_group;
 extern char *glob_page_group;
@@ -210,6 +212,11 @@ extern char *nntp_server;
 extern char *pgpopts;
 extern char active_times_file[PATH_LEN];
 extern char add_addr[LEN];
+extern char art_marked_deleted;
+extern char art_marked_inrange;
+extern char art_marked_return;
+extern char art_marked_selected;
+extern char art_marked_unread;
 extern char article[PATH_LEN];
 extern char bug_addr[LEN];
 extern char ch_post_process[];
@@ -911,6 +918,7 @@ extern constext txt_warn_cancel_forgery[];
 extern constext txt_warn_difficulties[];
 extern constext txt_warn_followup_to_several_groups[];
 extern constext txt_warn_missing_followup_to[];
+extern constext txt_warn_not_in_newsrc[];
 extern constext txt_warn_not_valid_newsgroup[];
 extern constext txt_warn_posting_etiquette[];
 extern constext txt_writing_attributes_file[];
@@ -926,11 +934,6 @@ extern int NOTESLINES;
 extern int RIGHT_POS;
 extern int _hp_glitch;
 extern int actual_option_page;
-extern int art_marked_deleted;
-extern int art_marked_inrange;
-extern int art_marked_return;
-extern int art_marked_selected;
-extern int art_marked_unread;
 extern int auto_bcc;
 extern int auto_cc;
 extern int auto_list_thread;
@@ -995,6 +998,7 @@ extern int last_subj_on_screen;
 extern int local_filtered_articles;
 extern int local_index;
 extern int mail_8bit_header;
+extern int mail_mime_encoding;
 extern int mail_news_to_posted;
 extern int mail_news;
 extern int mark_saved_read;
@@ -1023,6 +1027,7 @@ extern int num_spooldir;
 extern int pos_first_unread;
 extern int post_8bit_header;
 extern int post_article_and_exit;
+extern int post_mime_encoding;
 extern int print_header;
 extern int process_id;
 extern int process_only_unread;
@@ -1082,8 +1087,6 @@ extern long *base;
 extern long head_next;
 extern long note_mark[MAX_PAGES];	/* ftells on beginnings of pages */
 extern long note_size;
-extern size_t mail_mime_encoding;
-extern size_t post_mime_encoding;
 extern struct passwd *myentry;
 extern struct t_article *arts;
 extern struct t_attribute glob_attributes;

include/proto.h

@@ -339,7 +339,7 @@ extern void vNewsrcTestHarness P_((void));
 extern char *getserverbyfile P_((char *file));
 extern int server_init P_((char *machine, char *service, int port));
 extern int get_tcp_socket P_((char *machine, char *service, unsigned port));
-extern int handle_server_response P_((int response, char *nntpserver));
+/*extern int handle_server_response P_((int response, char *nntpserver));*/ /* not used */
 extern void u_put_server P_((char *string));
 extern void put_server P_((char *string));
 extern int get_server P_((char *string, int size));

include/tin.h

@@ -30,10 +30,10 @@
 #	define SMALL_MEMORY_MACHINE
 #	define DONT_REREAD_ACTIVE_FILE
 #	ifndef __GNUC__
-#		undef  M_UNIX
+#		undef M_UNIX
 #		define M_AMIGA
-#		define  SIG_ARGS /*nothing, since compiler doesn't handle it*/
-#		undef   DECL_SIG_CONST
+#		define SIG_ARGS /*nothing, since compiler doesn't handle it*/
+#		undef DECL_SIG_CONST
 #	endif
 #endif
 
@@ -490,9 +490,13 @@ extern char *get_uaf_fullname();
 #		define	DEFAULT_SHELL	"/bin/sh"
 #	endif
 #	ifndef DEFAULT_MAILBOX
-#		define	DEFAULT_MAILBOX "/usr/mail"
+#		define	DEFAULT_MAILBOX "/usr/mail" 
 #	endif
 #	ifndef DEFAULT_MAILER
+/*
+** sure that we want to fall-back to /bin/mail instead of
+** /usr/lib/sendmail on SysV-style systems?
+*/
 #		define	DEFAULT_MAILER	"/bin/mail"
 #	endif
 #	ifndef DEFAULT_PRINTER
@@ -693,6 +697,12 @@ extern char *get_uaf_fullname();
 #	define	MARK_INRANGE	'#'	/* group/art within a range (# command) */
 #endif
 
+/*
+ * position of the unread/will_return/hot-mark
+ * (used in group.c/thread.c)
+ */
+#define	MARK_OFFSET	9
+
 #define			SELECT_MISC_COLS	21
 #ifdef USE_INVERSE_HACK
 #	define		BLANK_GROUP_COLS	2
@@ -713,7 +723,6 @@ extern char *get_uaf_fullname();
 #define		MAX_COLOR	15
 #define		MAX_BACKCOLOR	7
 
-#define 	SCREEN_READ_UNREAD	6		/* position for "  +" / "   " */
 #define 	INDEX_TOP	2
 
 #ifdef NO_REGEX
@@ -1357,8 +1366,9 @@ struct t_newnews
  */
 
 struct t_option {
-	void *variable;		/* ptr to variable to change */
-	int var_type;		/* type of variable (see conf.h) */
+	int var_type;		/* type of variable (see tincfg.h) */
+	int var_index;		/* index in corresponding table */
+	int *variable;		/* ptr to variable to change */
 	char **opt_list;	/* ptr to list entries if OPT_LIST */
 	int opt_count;		/* no. of list entries if OPT_LIST */
 	char *option_text;	/* text to print as information on option */

include/version.h

@@ -17,7 +17,7 @@
  */
 
 #define VERSION		"1.3 unoff BETA"
-#define RELEASEDATE	"961225"
+#define RELEASEDATE	"961227"
 
 #ifdef M_AMIGA
 #	define	OS	"AMIGA"

makefile.in

@@ -4,7 +4,7 @@ PROJECT		= tin
 EXE		= tin
 MANEXT		= 1
 LVER		= 1.3
-PVER		= 961225
+PVER		= 961227
 VER		= $(LVER)-unoff-BETA-$(PVER)
 MAIL_ADDR 	= "urs@akk.uni-karlsruhe.de"
 

src/Makefile.in

@@ -287,7 +287,7 @@ clean:
 	@-$(RM) -f $(OBJDIR)/parsdate.c
 	@-$(RM) -f LINT *.ln
 	@-$(RM) -f makecfg makecfg.o tincfg.h
-	@-$(RM) -f *~
+	@-$(RM) -f core *~
 	@-$(RM) -f $(EXE) $(EXED)
 
 distclean \

src/actived.c

@@ -27,19 +27,15 @@
 
 #include	"tin.h"
 
-#ifndef S_ISDIR
-#define S_ISDIR(m)  ((m & S_IFMT) == S_IFDIR)
-#endif
-
 char	acHomeDir[PATH_LEN];
 char	acMailActiveFile[PATH_LEN];
 char	acSaveActiveFile[PATH_LEN];
 char	acTempActiveFile[PATH_LEN];
 char	acMailDir[PATH_LEN];
 char	acSaveDir[PATH_LEN];
-int		iAllGrps;
-int		iRecursive;
-int		iVerbose;
+int	iAllGrps;
+int	iRecursive;
+int	iVerbose;
 
 #ifndef M_AMIGA
 struct	passwd *psPwd;