Skip to content

Commit f1df8cd

Browse files
committed
snapshot of project "tin", label ctin961227
1 parent e60e6bc commit f1df8cd

24 files changed

+498
-287
lines changed

CHANGES

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
--unoff BETA release 961226 --
2+
3+
260) Thomas E. Dickey <dickey@clark.net>
4+
ADD. extends 'makecfg' to generate type-specific tables for string and
5+
char pointers, getting rid of the void* casts in tincfg.h
6+
modifies config.c and prompt.c accordingly.
7+
ADD. fixes color.c to work in xterm (i.e., the XFree86 3.2 version, or
8+
rxvt -- there's no point in fixing for color_xterm unless we
9+
converted to using ncurses).
10+
ADD. eliminates some of the clutter in post.c by using new utility
11+
functions (I did that when seeing that the newline in a subject
12+
wasn't stripped properly).
13+
FIX. several supplied patches
14+
15+
259) Urs Janssen <urs@akk.uni-karlsruhe.de>
16+
ADD. minor code clean-up
17+
FIX. several supplied patches
18+
119
--unoff BETA release 961225 --
220

321
258) Roland Rosenfeld <roland@spinnaker.rhein.de>

MANIFEST

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
MANIFEST for tin-1.3-unoff-BETA-961225 (Wed Dec 25 21:18:22 MET 1996)
1+
MANIFEST for tin-1.3-unoff-BETA-961227 (Sat Dec 28 04:37:15 MET 1996)
22
----------------------------------------------------
3-
55652 ./CHANGES
4-
13549 ./TODO
3+
56438 ./CHANGES
4+
13528 ./TODO
55
5341 ./Makefile
66
17216 ./INSTALL
77
2260 ./MANIFEST
@@ -20,76 +20,76 @@ MANIFEST for tin-1.3-unoff-BETA-961225 (Wed Dec 25 21:18:22 MET 1996)
2020
2511 ./include/amiga.h
2121
2131 ./include/amigatcp.h
2222
8277 ./include/config.h
23-
41562 ./include/extern.h
23+
41665 ./include/extern.h
2424
12877 ./include/menukeys.h
2525
718 ./include/msmail.h
2626
4764 ./include/nntplib.h
2727
2233 ./include/os_2.h
28-
29528 ./include/proto.h
28+
29547 ./include/proto.h
2929
1376 ./include/stpwatch.h
30-
44089 ./include/tin.h
30+
44290 ./include/tin.h
3131
810 ./include/version.h
3232
4100 ./include/win32.h
3333
789 ./include/win32tcp.h
3434
19657 ./src/active.c
35-
8119 ./src/actived.c
35+
8046 ./src/actived.c
3636
13003 ./src/amiga.c
3737
4429 ./src/amigatcp.c
3838
37829 ./src/art.c
3939
23873 ./src/attrib.c
4040
8460 ./src/charset.c
41-
4088 ./src/color.c
42-
58136 ./src/config.c
41+
4314 ./src/color.c
42+
57985 ./src/config.c
4343
20325 ./src/curses.c
4444
12401 ./src/debug.c
4545
2278 ./src/envarg.c
4646
19436 ./src/feed.c
4747
39695 ./src/filter.c
4848
10935 ./src/getline.c
49-
41516 ./src/group.c
49+
41501 ./src/group.c
5050
3202 ./src/hashstr.c
5151
9523 ./src/help.c
5252
12146 ./src/inews.c
53-
29896 ./src/init.c
54-
56292 ./src/lang.c
53+
29895 ./src/init.c
54+
56402 ./src/lang.c
5555
1739 ./src/list.c
5656
11984 ./src/mail.c
57-
19013 ./src/main.c
58-
5124 ./src/makecfg.c
57+
19517 ./src/main.c
58+
8108 ./src/makecfg.c
5959
9471 ./src/memory.c
6060
48344 ./src/misc.c
6161
7228 ./src/msmail.c
6262
33605 ./src/newsrc.c
63-
26312 ./src/nntplib.c
63+
26548 ./src/nntplib.c
6464
31349 ./src/nntpw32.c
6565
6176 ./src/nrctbl.c
6666
28884 ./src/open.c
6767
6242 ./src/os_2.c
6868
35769 ./src/page.c
6969
24090 ./src/parsdate.y
7070
6631 ./src/pgp.c
71-
77194 ./src/post.c
72-
9094 ./src/prompt.c
71+
75667 ./src/post.c
72+
8982 ./src/prompt.c
7373
160 ./src/proto.sed
7474
22480 ./src/refs.c
7575
8741 ./src/rfc1521.c
76-
17528 ./src/rfc1522.c
76+
17513 ./src/rfc1522.c
7777
33849 ./src/save.c
7878
4573 ./src/screen.c
7979
10148 ./src/search.c
80-
35521 ./src/select.c
80+
35570 ./src/select.c
8181
5667 ./src/sigfile.c
8282
12442 ./src/signal.c
8383
5772 ./src/strftime.c
84-
26178 ./src/thread.c
84+
26155 ./src/thread.c
8585
4131 ./src/wildmat.c
8686
12575 ./src/win32.c
8787
2134 ./src/win32tcp.c
8888
6281 ./src/xref.c
8989
5552 ./src/vms.c
9090
7243 ./include/autoconf.hin
91-
11137 ./src/Makefile.in
91+
11142 ./src/Makefile.in
9292
4278 ./src/l1_next.tab
9393
4278 ./src/next_l1.tab
9494
3653 ./src/tincfg.tbl
95-
1607412 insgesamt
95+
1610697 insgesamt

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PROJECT = tin
44
EXE = tin
55
MANEXT = 1
66
LVER = 1.3
7-
PVER = 961225
7+
PVER = 961227
88
VER = $(LVER)-unoff-BETA-$(PVER)
99
MAIL_ADDR = "urs@akk.uni-karlsruhe.de"
1010

TODO

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ o if ((n > 9999) && (x > 9999)) n is truncated to the left most 4 digits
77
(thread_x_of_n, group.c) (use tin_itoa would help)
88

99
o 'From: "Lastname, Firstname" <netscape@luser.dau>' is not displayed
10-
correct at all levels - it appears as '"Lastname' -> rewrite parse_from()
10+
correct at all levels - it appears as '"Lastname'
11+
-> rewrite parse_from()
1112

1213
o on x*n+1 articles (n=articles on one screen) - <end> does not work
1314
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
4445
useless!
4546

4647
o Followup-To: line is not examined weather the mentioned group(s) are valid
47-
on this server (btw. with nntp_only & tin -n this feature is useless
48-
cause it may lead to wrong results (on the other hand, posting in a
49-
newsgroup which one isn't subscribed to is not very useful))
48+
on this server.
5049

5150
o Newsgroup: and Followup-To: stripping should be done before Followup-To:
5251
is examined weather it contains several groups...
5352

5453
o if a colored signature wraps over a page-break, the coloring gets lost
5554

56-
o 'D' deleted article flag (thread selection level) is not showing up.
57-
(is it still needed?!)
58-
5955
o tin does not warn you if you try to save into a directory and not into
6056
a file.
6157

@@ -109,8 +105,6 @@ o unique newsgroups after editing article
109105

110106
o add feature save selected/tagged files sequentially to the same file
111107

112-
o rewrite NGLIMIT handling (post.c)
113-
114108
o add feature Cc:
115109

116110
o sender-patch
@@ -143,6 +137,9 @@ o Additions to the thread menu :
143137
'S' (autosave tagged)
144138
'U' (untag all)
145139
'M' (option menu)
140+
'w' (post an article)
141+
'r' (reply to) /* not 'R' cause it conflicts with mail_bugreport */
142+
'f' (post a followup)
146143
keys to goto previous/next thread
147144

148145
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
163160
o fix built-in inews to truncate signature > 4 lines
164161
(compile-time option?)
165162

166-
o bring up a warning on a long newsgroup/followup line (>=5 groups) and
167-
force the user to confirm every single group he wants to post in.
168-
(N/y)
163+
o bring up a warning on a long newsgroup (>=5) line and
164+
force the user to confirm every single group he wants to post (or
165+
redirect followups to) in. (N/y)
166+
rewrite NGLIMIT handling (post.c)
167+
(not just truncate Newsgroups:-line after the NGLIMITth newsgroup)
169168

170169
o bring up a warning when trying to f'up into a binaries group
171170
(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
356355

357356
o when resizing an xterm (on SunOS, at least), tin will repaint the screen
358357
when the user is actually in an editor spawned by tin.
358+
359+
o check where tin_done() should be called instead of using exit()

include/extern.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ extern char *optarg;
199199
*/
200200

201201
extern FILE *note_fp; /* body of current article */
202+
extern char *OPT_CHAR_list[];
203+
extern char *OPT_STRING_list[];
202204
extern char *glob_art_group;
203205
extern char *glob_group;
204206
extern char *glob_page_group;
@@ -210,6 +212,11 @@ extern char *nntp_server;
210212
extern char *pgpopts;
211213
extern char active_times_file[PATH_LEN];
212214
extern char add_addr[LEN];
215+
extern char art_marked_deleted;
216+
extern char art_marked_inrange;
217+
extern char art_marked_return;
218+
extern char art_marked_selected;
219+
extern char art_marked_unread;
213220
extern char article[PATH_LEN];
214221
extern char bug_addr[LEN];
215222
extern char ch_post_process[];
@@ -911,6 +918,7 @@ extern constext txt_warn_cancel_forgery[];
911918
extern constext txt_warn_difficulties[];
912919
extern constext txt_warn_followup_to_several_groups[];
913920
extern constext txt_warn_missing_followup_to[];
921+
extern constext txt_warn_not_in_newsrc[];
914922
extern constext txt_warn_not_valid_newsgroup[];
915923
extern constext txt_warn_posting_etiquette[];
916924
extern constext txt_writing_attributes_file[];
@@ -926,11 +934,6 @@ extern int NOTESLINES;
926934
extern int RIGHT_POS;
927935
extern int _hp_glitch;
928936
extern int actual_option_page;
929-
extern int art_marked_deleted;
930-
extern int art_marked_inrange;
931-
extern int art_marked_return;
932-
extern int art_marked_selected;
933-
extern int art_marked_unread;
934937
extern int auto_bcc;
935938
extern int auto_cc;
936939
extern int auto_list_thread;
@@ -995,6 +998,7 @@ extern int last_subj_on_screen;
995998
extern int local_filtered_articles;
996999
extern int local_index;
9971000
extern int mail_8bit_header;
1001+
extern int mail_mime_encoding;
9981002
extern int mail_news_to_posted;
9991003
extern int mail_news;
10001004
extern int mark_saved_read;
@@ -1023,6 +1027,7 @@ extern int num_spooldir;
10231027
extern int pos_first_unread;
10241028
extern int post_8bit_header;
10251029
extern int post_article_and_exit;
1030+
extern int post_mime_encoding;
10261031
extern int print_header;
10271032
extern int process_id;
10281033
extern int process_only_unread;
@@ -1082,8 +1087,6 @@ extern long *base;
10821087
extern long head_next;
10831088
extern long note_mark[MAX_PAGES]; /* ftells on beginnings of pages */
10841089
extern long note_size;
1085-
extern size_t mail_mime_encoding;
1086-
extern size_t post_mime_encoding;
10871090
extern struct passwd *myentry;
10881091
extern struct t_article *arts;
10891092
extern struct t_attribute glob_attributes;

include/proto.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ extern void vNewsrcTestHarness P_((void));
339339
extern char *getserverbyfile P_((char *file));
340340
extern int server_init P_((char *machine, char *service, int port));
341341
extern int get_tcp_socket P_((char *machine, char *service, unsigned port));
342-
extern int handle_server_response P_((int response, char *nntpserver));
342+
/*extern int handle_server_response P_((int response, char *nntpserver));*/ /* not used */
343343
extern void u_put_server P_((char *string));
344344
extern void put_server P_((char *string));
345345
extern int get_server P_((char *string, int size));

include/tin.h

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
# define SMALL_MEMORY_MACHINE
3131
# define DONT_REREAD_ACTIVE_FILE
3232
# ifndef __GNUC__
33-
# undef M_UNIX
33+
# undef M_UNIX
3434
# define M_AMIGA
35-
# define SIG_ARGS /*nothing, since compiler doesn't handle it*/
36-
# undef DECL_SIG_CONST
35+
# define SIG_ARGS /*nothing, since compiler doesn't handle it*/
36+
# undef DECL_SIG_CONST
3737
# endif
3838
#endif
3939

@@ -490,9 +490,13 @@ extern char *get_uaf_fullname();
490490
# define DEFAULT_SHELL "/bin/sh"
491491
# endif
492492
# ifndef DEFAULT_MAILBOX
493-
# define DEFAULT_MAILBOX "/usr/mail"
493+
# define DEFAULT_MAILBOX "/usr/mail"
494494
# endif
495495
# ifndef DEFAULT_MAILER
496+
/*
497+
** sure that we want to fall-back to /bin/mail instead of
498+
** /usr/lib/sendmail on SysV-style systems?
499+
*/
496500
# define DEFAULT_MAILER "/bin/mail"
497501
# endif
498502
# ifndef DEFAULT_PRINTER
@@ -693,6 +697,12 @@ extern char *get_uaf_fullname();
693697
# define MARK_INRANGE '#' /* group/art within a range (# command) */
694698
#endif
695699

700+
/*
701+
* position of the unread/will_return/hot-mark
702+
* (used in group.c/thread.c)
703+
*/
704+
#define MARK_OFFSET 9
705+
696706
#define SELECT_MISC_COLS 21
697707
#ifdef USE_INVERSE_HACK
698708
# define BLANK_GROUP_COLS 2
@@ -713,7 +723,6 @@ extern char *get_uaf_fullname();
713723
#define MAX_COLOR 15
714724
#define MAX_BACKCOLOR 7
715725

716-
#define SCREEN_READ_UNREAD 6 /* position for " +" / " " */
717726
#define INDEX_TOP 2
718727

719728
#ifdef NO_REGEX
@@ -1357,8 +1366,9 @@ struct t_newnews
13571366
*/
13581367

13591368
struct t_option {
1360-
void *variable; /* ptr to variable to change */
1361-
int var_type; /* type of variable (see conf.h) */
1369+
int var_type; /* type of variable (see tincfg.h) */
1370+
int var_index; /* index in corresponding table */
1371+
int *variable; /* ptr to variable to change */
13621372
char **opt_list; /* ptr to list entries if OPT_LIST */
13631373
int opt_count; /* no. of list entries if OPT_LIST */
13641374
char *option_text; /* text to print as information on option */

include/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
#define VERSION "1.3 unoff BETA"
20-
#define RELEASEDATE "961225"
20+
#define RELEASEDATE "961227"
2121

2222
#ifdef M_AMIGA
2323
# define OS "AMIGA"

makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PROJECT = tin
44
EXE = tin
55
MANEXT = 1
66
LVER = 1.3
7-
PVER = 961225
7+
PVER = 961227
88
VER = $(LVER)-unoff-BETA-$(PVER)
99
MAIL_ADDR = "urs@akk.uni-karlsruhe.de"
1010

src/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ clean:
287287
@-$(RM) -f $(OBJDIR)/parsdate.c
288288
@-$(RM) -f LINT *.ln
289289
@-$(RM) -f makecfg makecfg.o tincfg.h
290-
@-$(RM) -f *~
290+
@-$(RM) -f core *~
291291
@-$(RM) -f $(EXE) $(EXED)
292292

293293
distclean \

src/actived.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,15 @@
2727

2828
#include "tin.h"
2929

30-
#ifndef S_ISDIR
31-
#define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
32-
#endif
33-
3430
char acHomeDir[PATH_LEN];
3531
char acMailActiveFile[PATH_LEN];
3632
char acSaveActiveFile[PATH_LEN];
3733
char acTempActiveFile[PATH_LEN];
3834
char acMailDir[PATH_LEN];
3935
char acSaveDir[PATH_LEN];
40-
int iAllGrps;
41-
int iRecursive;
42-
int iVerbose;
36+
int iAllGrps;
37+
int iRecursive;
38+
int iVerbose;
4339

4440
#ifndef M_AMIGA
4541
struct passwd *psPwd;

0 commit comments

Comments
 (0)