noffle: src/client.c annotate

annotate src/client.c @ 223:ffb1848a39db noffle

[svn] * src/util.c: Improve (correct) error detection when updating timestamp file. * src/content.h, src/content.c: Return Boolean success/fail from Cont_write. Also ensure cont.first isn't polluted in the event of a failed update. * src/client.c,src/control.c,src/fetch.c,src/noffle.c,src/post.c, src/pseudo.c: If Cont_write fails, don't do actions that need it to have worked. Typically, don't update first and last article numbers in group database. * src/server.c: If groupinfo.lastupdate is unreadable or corrupt, spot this and report it and give an explicit error when processing NNTP NEWGROUPS command.

author	bears
date	Sun, 09 Dec 2001 12:31:57 +0000
parents	7a2b488e258d
children	1ad2602f57db

rev	line source
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1 /*
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	2 client.c
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	3
223 ffb1848a39db [svn] * src/util.c: Improve (correct) error detection when updating bears parents: 215 diff changeset	4 $Id: client.c 342 2001-12-09 12:31:57Z bears $
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	5 */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	6
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	7 #if HAVE_CONFIG_H
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	8 #include <config.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	9 #endif
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	10
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	11 #include <stdio.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	12 #include <arpa/inet.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	13 #include <ctype.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	14 #include <netdb.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	15 #include <netinet/in.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	16 #include <signal.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	17 #include <stdarg.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	18 #include <sys/socket.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	19 #include <unistd.h>
197 24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	20 #include "client.h"
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	21 #include "configfile.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	22 #include "content.h"
95 c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	23 #include "control.h"
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	24 #include "dynamicstring.h"
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	25 #include "filter.h"
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	26 #include "group.h"
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	27 #include "itemlist.h"
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	28 #include "lock.h"
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	29 #include "log.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	30 #include "over.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	31 #include "protocol.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	32 #include "pseudo.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	33 #include "request.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	34 #include "util.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	35 #include "wildmat.h"
54 125d79c9e586 [svn] * src/client.c, src/configfile.c, src/content.c, src/control.c, uh1763 parents: 48 diff changeset	36 #include "portable.h"
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	37
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	38 /*
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	39 Some newsgroups names are reserved for server-specific or server
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	40 pseudo groups. We don't want to fetch them. For example, INN
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	41 keeps all its control messages in a 'control' hierarchy, and
103 f782184db8bc [svn] 1.0pre6 merge plus variable rename bears parents: 102 diff changeset	42 used the "to." hierarchy for dark and mysterious purposes I think
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	43 are to do with newsfeeds. The recommended restrictions are documented
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	44 in C.Lindsay, "News Article Format", <draft-ietf-usefor-article-03.txt>.
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	45 */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	46
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	47 struct ForbiddenGroupName
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	48 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	49 const char *pattern;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	50 Bool match;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	51 } forbiddenGroupNames[] =
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	52 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	53 { ".", FALSE }, /* Single component */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	54 { "control.", TRUE }, / control.* groups */
103 f782184db8bc [svn] 1.0pre6 merge plus variable rename bears parents: 102 diff changeset	55 { "to.", TRUE }, / to.* groups */
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	56 { ".all", TRUE }, / 'all' as a component */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	57 { ".all.", TRUE },
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	58 { "all.*", TRUE },
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	59 { ".ctl", TRUE }, / 'ctl' as a component */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	60 { ".ctl.", TRUE },
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	61 { "ctl.*", TRUE }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	62 };
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	63
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	64 struct
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	65 {
197 24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	66 FILE* in; /* Receiving socket from server */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	67 FILE* out; /* Sending socket to server */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	68 Str lastCmd; /* Last command line */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	69 Str lastStat; /* Response from server to last command */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	70 Str grp; /* Selected group */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	71 int rmtFirst; /* First article of current group at server */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	72 int rmtLast; /* Last article of current group at server */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	73 Bool auth; /* Authentication already done? */
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	74 Str serv; /* Remote server name */
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	75 } client = { NULL, NULL, "", "", "", 1, 0, FALSE, "" };
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	76
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	77 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	78 logBreakDown( void )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	79 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	80 Log_err( "Connection to remote server lost "
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	81 "(article numbers could be inconsistent)" );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	82 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	83
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	84 static Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	85 getLn( Str line )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	86 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	87 Bool r;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	88
144 8b9366fc1361 [svn] Added timeout to Prt_getLn to avoid Noffle hanging if the enz parents: 130 diff changeset	89 r = Prt_getLn( line, client.in, Cfg_connectTimeout() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	90 if ( ! r )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	91 logBreakDown();
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	92 return r;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	93 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	94
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	95 static Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	96 getTxtLn( Str line, Bool *err )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	97 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	98 Bool r;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	99
144 8b9366fc1361 [svn] Added timeout to Prt_getLn to avoid Noffle hanging if the enz parents: 130 diff changeset	100 r = Prt_getTxtLn( line, err, client.in, Cfg_connectTimeout() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	101 if ( *err )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	102 logBreakDown();
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	103 return r;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	104 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	105
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	106 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	107 putTxtBuf( const char *buf )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	108 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	109 Prt_putTxtBuf( buf, client.out );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	110 fflush( client.out );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	111 Log_dbg( LOG_DBG_PROTOCOL, "[S FLUSH]" );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	112 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	113
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	114 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	115 putEndOfTxt( void )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	116 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	117 Prt_putEndOfTxt( client.out );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	118 fflush( client.out );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	119 Log_dbg( LOG_DBG_PROTOCOL, "[S FLUSH]" );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	120 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	121
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	122 static Bool
157 976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	123 putCmdLn( const char *line )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	124 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	125 Bool err;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	126 unsigned int n;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	127
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	128 strcpy( client.lastCmd, line );
157 976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	129 strcpy( client.lastStat, "[no status available]" );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	130 Log_dbg( LOG_DBG_PROTOCOL, "[S] %s", line );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	131 n = fprintf( client.out, "%s\r\n", line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	132 err = ( n != strlen( line ) + 2 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	133 if ( err )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	134 logBreakDown();;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	135 return ! err;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	136 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	137
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	138 static Bool
157 976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	139 putCmd( const char *fmt, ... )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	140 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	141 Str line;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	142 va_list ap;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	143
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	144 va_start( ap, fmt );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	145 vsnprintf( line, MAXCHAR, fmt, ap );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	146 va_end( ap );
157 976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	147 if ( ! putCmdLn( line ) )
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	148 return FALSE;
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	149 fflush( client.out );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	150 Log_dbg( LOG_DBG_PROTOCOL, "[S FLUSH]" );
157 976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	151 return TRUE;
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	152 }
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	153
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	154 static Bool
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	155 putCmdNoFlush( const char *fmt, ... )
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	156 {
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	157 Str line;
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	158 va_list ap;
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	159
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	160 va_start( ap, fmt );
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	161 vsnprintf( line, MAXCHAR, fmt, ap );
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	162 va_end( ap );
976ff791c7ec [svn] Extract common code from putCmd and putCmdNoFlush, enz parents: 144 diff changeset	163 return putCmdLn( line );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	164 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	165
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	166 static int getStat( void );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	167
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	168 static int
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	169 performAuth( void )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	170 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	171 int stat;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	172 Str user, pass;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	173
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	174 Cfg_authInfo( client.serv, user, pass );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	175 if ( strcmp( user, "" ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	176 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	177 Log_err( "No username for authentication set" );
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	178 return STAT_AUTH_REQUIRED;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	179 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	180 putCmd( "AUTHINFO USER %s", user );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	181 stat = getStat();
187 166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	182 if ( stat == STAT_AUTH_ACCEPTED
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	183 \|\| stat == STAT_AUTH_ACCEPTED_DEPREC )
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	184 return stat;
187 166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	185 else if ( stat != STAT_MORE_AUTH_REQUIRED_DEPREC
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	186 && stat != STAT_AUTH_REQUIRED )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	187 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	188 Log_err( "Username rejected. Server stat: %s", client.lastStat );
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	189 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	190 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	191 if ( strcmp( pass, "" ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	192 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	193 Log_err( "No password for authentication set" );
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	194 return STAT_AUTH_REQUIRED;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	195 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	196 putCmd( "AUTHINFO PASS %s", pass );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	197 stat = getStat();
187 166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	198 if ( stat != STAT_AUTH_ACCEPTED
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	199 && stat != STAT_AUTH_ACCEPTED_DEPREC)
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	200 Log_err( "Password rejected. Server status: %s", client.lastStat );
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	201 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	202 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	203
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	204 static int
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	205 getStat( void )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	206 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	207 int result;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	208 Str lastCmd;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	209
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	210 if ( ! getLn( client.lastStat ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	211 result = STAT_CONNECTION_LOST;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	212 else if ( sscanf( client.lastStat, "%d", &result ) != 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	213 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	214 Log_err( "Invalid server status: %s", client.lastStat );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	215 result = STAT_PROGRAM_FAULT;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	216 }
187 166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	217 if ( ( result == STAT_AUTH_REQUIRED
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	218 \|\| result == STAT_AUTH_REQUIRED_DEPREC )
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	219 && ! client.auth )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	220 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	221 client.auth = TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	222 strcpy( lastCmd, client.lastCmd );
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	223 result = performAuth();
187 166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	224 if ( result == STAT_AUTH_ACCEPTED
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	225 \|\| result == STAT_AUTH_ACCEPTED_DEPREC )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	226 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	227 putCmd( lastCmd );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	228 return getStat();
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	229 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	230 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	231 return result;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	232 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	233
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	234 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	235 connectAlarm( int sig )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	236 {
74 c7df2cc65cc1 [svn] Introduce UNUSED(x) macro bears parents: 71 diff changeset	237 UNUSED( sig );
c7df2cc65cc1 [svn] Introduce UNUSED(x) macro bears parents: 71 diff changeset	238
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	239 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	240 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	241
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	242 static Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	243 connectWithTimeout( int sock, const struct sockaddr *servAddr,
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	244 socklen_t addrLen )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	245 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	246 sig_t oldHandler;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	247 int r, to;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	248
164 94f2e5607772 [svn] * src/client.c,src/protocol.c,src/util.h,src/util.c: Common up bears parents: 157 diff changeset	249 oldHandler = Utl_installSignalHandler( SIGALRM, connectAlarm );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	250 if ( oldHandler == SIG_ERR )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	251 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	252 Log_err( "client.c:connectWithTimeout: signal failed." );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	253 return FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	254 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	255 to = Cfg_connectTimeout();
74 c7df2cc65cc1 [svn] Introduce UNUSED(x) macro bears parents: 71 diff changeset	256 if ( alarm( ( unsigned int ) to ) != 0 )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	257 Log_err( "client.c:connectWithTimeout: Alarm was already set." );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	258 r = connect( sock, servAddr, addrLen );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	259 alarm( 0 );
164 94f2e5607772 [svn] * src/client.c,src/protocol.c,src/util.h,src/util.c: Common up bears parents: 157 diff changeset	260 Utl_installSignalHandler( SIGALRM, oldHandler );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	261 return ( r >= 0 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	262 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	263
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	264 static DynStr *
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	265 collectTxt( void )
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	266 {
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	267 DynStr *res;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	268 Str line;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	269 Bool err;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	270
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	271 res = new_DynStr(2048);
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	272 if ( res == NULL )
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	273 return NULL;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	274
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	275 while ( getTxtLn( line, &err ) && ! err )
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	276 DynStr_appLn( res, line );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	277
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	278 if ( err )
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	279 {
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	280 del_DynStr( res );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	281 return NULL;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	282 }
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	283 else
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	284 return res;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	285 }
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	286
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	287 Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	288 Client_connect( const char *serv )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	289 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	290 unsigned short int port;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	291 int sock, i;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	292 unsigned int stat;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	293 struct hostent *hp;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	294 char pStart, pColon;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	295 Str host, s;
187 166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	296 Str user, pass;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	297 struct sockaddr_in sIn;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	298
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	299 ASSERT( client.in == NULL && client.out == NULL );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	300 client.auth = FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	301 Utl_cpyStr( s, serv );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	302 pStart = Utl_stripWhiteSpace( s );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	303 pColon = strstr( pStart, ":" );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	304 if ( pColon == NULL )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	305 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	306 strcpy( host, pStart );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	307 port = 119;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	308 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	309 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	310 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	311 *pColon = '\0';
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	312 strcpy( host, pStart );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	313 if ( sscanf( pColon + 1, "%hi", &port ) != 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	314 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	315 Log_err( "Syntax error in server name: '%s'", serv );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	316 return FALSE;;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	317 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	318 if ( port <= 0 \|\| port > 65535 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	319 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	320 Log_err( "Invalid port number %hi. Must be in [1, 65535]", port );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	321 return FALSE;;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	322 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	323 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	324 memset( (void *)&sIn, 0, sizeof( sIn ) );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	325 hp = gethostbyname( host );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	326 if ( hp )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	327 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	328 for ( i = 0; (hp->h_addr_list)[ i ]; ++i )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	329 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	330 sIn.sin_family = hp->h_addrtype;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	331 sIn.sin_port = htons( port );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	332 sIn.sin_addr = ( (struct in_addr )hp->h_addr_list[ i ] );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	333 sock = socket( AF_INET, SOCK_STREAM, 0 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	334 if ( sock < 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	335 break;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	336 if ( ! connectWithTimeout( sock, (struct sockaddr *)&sIn,
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	337 sizeof( sIn ) ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	338 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	339 close( sock );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	340 break;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	341 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	342 if ( ! ( client.out = fdopen( sock, "w" ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	343 \|\| ! ( client.in = fdopen( dup( sock ), "r" ) ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	344 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	345 if ( client.out != NULL )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	346 fclose( client.out );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	347 close( sock );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	348 client.in = client.out = NULL;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	349 break;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	350 }
172 0ce333d046b9 [svn] Fix bug. Server name was not yet initialized enz parents: 164 diff changeset	351 Utl_cpyStr( client.serv, serv );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	352 stat = getStat();
197 24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	353 switch( stat )
24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 191 diff changeset	354 {
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	355 case STAT_READY_POST_ALLOW:
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	356 case STAT_READY_NO_POST_ALLOW:
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	357 Log_inf( "Connected to %s:%d",
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	358 inet_ntoa( sIn.sin_addr ), port );
187 166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	359 /* INN needs a MODE READER before it will permit POST. */
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	360 putCmd( "MODE READER" );
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	361 getStat();
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	362 Cfg_authInfo( client.serv, user, pass );
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	363 if ( strcmp( user, "" ) != 0 )
166008a80f03 [svn] src/client.c,src/protocol.h: perform authentication at connect time, enz parents: 185 diff changeset	364 performAuth();
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	365 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	366 default:
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	367 Log_err( "Bad server stat %d", stat );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	368 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	369 shutdown( fileno( client.out ), 0 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	370 fclose( client.in );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	371 fclose( client.out );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	372 close( sock );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	373 client.in = client.out = NULL;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	374 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	375 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	376 return FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	377 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	378
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	379 static Bool
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	380 isGetGroup( const char *name )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	381 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	382 GroupEnum *ge;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	383 Bool emptyList;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	384 const char *pattern;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	385
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	386 emptyList = TRUE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	387 ge = new_GetGrEn( client.serv );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	388 while ( ( pattern = GrEn_next( ge ) ) != NULL )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	389 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	390 emptyList = FALSE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	391 if ( Wld_match( name, pattern ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	392 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	393 del_GrEn( ge );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	394 return TRUE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	395 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	396 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	397
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	398 del_GrEn( ge );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	399 return emptyList;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	400 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	401
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	402 static Bool
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	403 isOmitGroup( const char *name )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	404 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	405 GroupEnum *ge;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	406 const char *pattern;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	407
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	408 ge = new_OmitGrEn( client.serv );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	409 while ( ( pattern = GrEn_next( ge ) ) != NULL )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	410 if ( Wld_match( name, pattern ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	411 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	412 del_GrEn( ge );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	413 return TRUE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	414 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	415
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	416 del_GrEn( ge );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	417 return FALSE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	418 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	419
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	420 static Bool
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	421 isForbiddenGroupName( const char *name )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	422 {
58 b4e6f7f96135 [svn] Add some intermediate variables for easier debugging in needsMark(). enz parents: 57 diff changeset	423 size_t i;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	424
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	425 for ( i = 0;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	426 i < sizeof( forbiddenGroupNames ) /
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	427 sizeof( struct ForbiddenGroupName );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	428 i++ )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	429 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	430 /* Negate result of Wld_match to ensure it is 1 or 0. */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	431 if ( forbiddenGroupNames[i].match !=
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	432 ( ! Wld_match( name, forbiddenGroupNames[i].pattern ) ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	433 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	434 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	435
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	436 return FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	437 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	438
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	439 static void
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	440 processGrps( const char *lines, Bool noServerPattern )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	441 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	442 char postAllow;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	443 int first, last;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	444 Str grp, line, file;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	445 Bool groupupdate;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	446
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	447 ASSERT( ! Lock_gotLock() );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	448 if ( ! Lock_openDatabases() )
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	449 return;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	450
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	451 groupupdate = FALSE;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	452 while ( ( lines = Utl_getLn( line, lines) ) != NULL )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	453 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	454 if ( sscanf( line, "%s %d %d %c",
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	455 grp, &last, &first, &postAllow ) != 4 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	456 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	457 Log_err( "Unknown reply to LIST or NEWGROUPS: %s", line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	458 continue;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	459 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	460 if ( isForbiddenGroupName( grp ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	461 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	462 Log_inf( "Group %s forbidden", grp );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	463 continue;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	464 }
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	465 if ( noServerPattern && ! isGetGroup( grp ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	466 continue;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	467 if ( isOmitGroup( grp ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	468 continue;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	469 if ( ! Grp_exists( grp ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	470 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	471 Log_inf( "Registering new group '%s'", grp );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	472 Grp_create( grp );
48 21d3102dbc37 [svn] Revert setting of initial article number bears parents: 43 diff changeset	473 /* Start local numbering with remote first number to avoid
21d3102dbc37 [svn] Revert setting of initial article number bears parents: 43 diff changeset	474 new numbering at the readers if noffle is re-installed */
21d3102dbc37 [svn] Revert setting of initial article number bears parents: 43 diff changeset	475 if ( first != 0 )
21d3102dbc37 [svn] Revert setting of initial article number bears parents: 43 diff changeset	476 Grp_setFirstLast( grp, first, first - 1 );
21d3102dbc37 [svn] Revert setting of initial article number bears parents: 43 diff changeset	477 else
21d3102dbc37 [svn] Revert setting of initial article number bears parents: 43 diff changeset	478 Grp_setFirstLast( grp, 1, 0 );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	479 Grp_setServ( grp, client.serv );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	480 Grp_setPostAllow( grp, postAllow );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	481 groupupdate = TRUE;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	482 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	483 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	484 {
215 7a2b488e258d [svn] Bugfix at processGrps() mirkol parents: 197 diff changeset	485 if ( ! Grp_local( grp ) && \
7a2b488e258d [svn] Bugfix at processGrps() mirkol parents: 197 diff changeset	486 Cfg_servIsPreferential( client.serv, Grp_server( grp ) ) )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	487 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	488 Log_inf( "Changing server for '%s': '%s'->'%s'",
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	489 grp, Grp_server( grp ), client.serv );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	490 Grp_setServ( grp, client.serv );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	491 Grp_setRmtNext( grp, first );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	492 Grp_setPostAllow( grp, postAllow );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	493 groupupdate = TRUE;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	494 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	495 else
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	496 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	497 "Group %s is already fetched from %s",
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	498 grp, Grp_server( grp ) );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	499 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	500 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	501
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	502 snprintf( file, MAXCHAR, "%s/lastupdate.%s",
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	503 Cfg_spoolDir(), client.serv );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	504 Utl_stamp( file );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	505 if ( groupupdate )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	506 {
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	507 snprintf( file, MAXCHAR, "%s/groupinfo.lastupdate",
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	508 Cfg_spoolDir() );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	509 Utl_stamp( file );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	510 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	511 Lock_closeDatabases();
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	512 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	513
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	514 void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	515 Client_disconnect( void )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	516 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	517 if ( putCmd( "QUIT" ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	518 getStat();
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	519 fclose( client.in );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	520 fclose( client.out );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	521 client.in = client.out = NULL;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	522 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	523
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	524 static int
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	525 doGetGrps( const char pattern, Bool noServerPattern )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	526 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	527 Str cmd;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	528 int stat;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	529 DynStr *response;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	530
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	531 Utl_cpyStr( cmd, "LIST ACTIVE" );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	532 if ( pattern[ 0 ] != '\0' )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	533 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	534 Utl_catStr( cmd, " " );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	535 Utl_catStr( cmd, pattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	536 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	537
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	538 *noServerPattern = FALSE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	539 if ( ! putCmd( cmd ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	540 return STAT_CONNECTION_LOST;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	541 stat = getStat();
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	542 if ( IS_FATAL( stat ) )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	543 return stat;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	544
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	545 /*
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	546 * Try LIST instead of LIST ACTIVE in case server doesn't
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	547 * support LIST ACTIVE.
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	548 */
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	549 if ( pattern[ 0 ] != '\0' && stat != STAT_GRPS_FOLLOW )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	550 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	551 *noServerPattern = TRUE;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	552 if ( ! putCmd( "LIST" ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	553 return STAT_CONNECTION_LOST;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	554 stat = getStat();
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	555 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	556 if ( stat != STAT_GRPS_FOLLOW )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	557 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	558 Log_err( "%s failed: %s", cmd, client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	559 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	560 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	561
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	562 response = collectTxt();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	563 if ( response == NULL )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	564 return STAT_CONNECTION_LOST;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	565
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	566 processGrps( DynStr_str( response ), *noServerPattern );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	567 del_DynStr( response );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	568 return STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	569 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	570
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	571 int
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	572 Client_getGrps( void )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	573 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	574 GroupEnum *ge;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	575 const char *pattern;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	576 Bool doneOne, noServerPattern;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	577 int res;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	578
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	579 Log_inf( "Getting groups" );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	580
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	581 doneOne = FALSE;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	582 res = STAT_OK;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	583 ge = new_GetGrEn( client.serv );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	584 while ( res == STAT_OK && ( pattern = GrEn_next( ge ) ) != NULL )
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	585 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	586 res = doGetGrps( pattern, &noServerPattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	587 doneOne = TRUE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	588 if ( noServerPattern )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	589 break;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	590 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	591
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	592 if ( ! doneOne )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	593 res = doGetGrps( "", &noServerPattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	594
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	595 del_GrEn( ge );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	596 return res;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	597 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	598
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	599 static int
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	600 doGetDsc( const char pattern, Bool noServerPattern )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	601 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	602 Str name, line, dsc, cmd;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	603 int stat;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	604 DynStr *response;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	605 const char *lines;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	606 Bool result;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	607
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	608 ASSERT( ! Lock_gotLock() );
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	609 Utl_cpyStr( cmd, "LIST NEWSGROUPS" );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	610 if ( pattern[ 0 ] != '\0' )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	611 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	612 Utl_catStr( cmd, " " );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	613 Utl_catStr( cmd, pattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	614 }
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	615
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	616 *noServerPattern = FALSE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	617 if ( ! putCmd( cmd ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	618 return STAT_CONNECTION_LOST;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	619 stat = getStat();
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	620 if ( IS_FATAL( stat ) )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	621 return stat;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	622
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	623 /* Try without pattern in case server doesn't support patterns. */
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	624 if ( pattern[ 0 ] != '\0' && stat != STAT_GRPS_FOLLOW )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	625 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	626 *noServerPattern = TRUE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	627 if ( !putCmd( "LIST NEWSGROUPS" ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	628 return STAT_CONNECTION_LOST;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	629 stat = getStat();
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	630 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	631 if ( stat != STAT_GRPS_FOLLOW )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	632 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	633 Log_err( "%s failed: %s", cmd, client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	634 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	635 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	636
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	637 response = collectTxt();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	638 if ( response == NULL )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	639 return STAT_CONNECTION_LOST;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	640
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	641 if ( ! Lock_openDatabases() )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	642 return STAT_NEWSBASE_FATAL;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	643
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	644 lines = DynStr_str( response );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	645 result = STAT_OK;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	646 while ( ( lines = Utl_getLn( line, lines) ) != NULL )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	647 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	648 if ( sscanf( line, "%s", name ) != 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	649 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	650 Log_err( "Unknown reply to LIST NEWSGROUPS: %s", line );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	651 result = STAT_PROGRAM_FAULT;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	652 break;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	653 }
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	654 if ( *noServerPattern && ! isGetGroup( name ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	655 continue;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	656 strcpy( dsc, Utl_restOfLn( line, 1 ) );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	657 if ( Grp_exists( name ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	658 {
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	659 Log_dbg( LOG_DBG_FETCH, "Description of %s: %s", name, dsc );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	660 Grp_setDsc( name, dsc );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	661 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	662 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	663 Lock_closeDatabases();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	664 del_DynStr( response );
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	665 return result;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	666 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	667
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	668 int
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	669 Client_getDsc( void )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	670 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	671 GroupEnum *ge;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	672 const char *pattern;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	673 Bool doneOne, noServerPattern;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	674 int res;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	675
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	676 Log_inf( "Querying group descriptions" );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	677
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	678 doneOne = FALSE;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	679 res = STAT_OK;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	680 ge = new_GetGrEn( client.serv );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	681 while ( res == STAT_OK && ( pattern = GrEn_next( ge ) ) != NULL )
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	682 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	683 res = doGetDsc( pattern, &noServerPattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	684 doneOne = TRUE;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	685 if ( noServerPattern )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	686 break;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	687 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	688
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	689 if ( ! doneOne )
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	690 res = doGetDsc( "", &noServerPattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	691
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	692 del_GrEn( ge );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	693 return res;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	694 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	695
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	696 int
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	697 Client_getNewgrps( const time_t *lastTime )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	698 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	699 Str s;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	700 const char *p;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	701 DynStr *response;
182 a43a528cfbe7 [svn] * src/client.c: Only return failure getting NEWGROUPS if the connection bears parents: 180 diff changeset	702 int stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	703
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	704 ASSERT( *lastTime > 0 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	705 strftime( s, MAXCHAR, "%Y%m%d %H%M00", gmtime( lastTime ) );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	706 /*
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	707 Do not use century for working with old server software until 2000.
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	708 According to newest IETF draft, this is still valid after 2000.
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	709 (directly using %y in fmt string causes a Y2K compiler warning)
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	710 */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	711 p = s + 2;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	712 if ( ! putCmd( "NEWGROUPS %s GMT", p ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	713 return STAT_CONNECTION_LOST;
182 a43a528cfbe7 [svn] * src/client.c: Only return failure getting NEWGROUPS if the connection bears parents: 180 diff changeset	714 stat = getStat();
a43a528cfbe7 [svn] * src/client.c: Only return failure getting NEWGROUPS if the connection bears parents: 180 diff changeset	715 if ( stat != STAT_NEW_GRP_FOLLOW )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	716 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	717 Log_err( "NEWGROUPS command failed: %s", client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	718 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	719 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	720
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	721 response = collectTxt();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	722 if ( response == NULL )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	723 return STAT_CONNECTION_LOST;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	724
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	725 processGrps( DynStr_str( response ), TRUE );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	726 del_DynStr( response );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	727 return STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	728 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	729
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	730 static const char *
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	731 readField( Str result, const char *p )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	732 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	733 size_t len;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	734 char *r;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	735
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	736 if ( ! p )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	737 return NULL;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	738 r = result;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	739 *r = '\0';
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	740 len = 0;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	741 while ( p != '\t' && p != '\n' )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	742 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	743 if ( ! *p )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	744 return p;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	745 (r++) = (p++);
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	746 ++len;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	747 if ( len >= MAXCHAR - 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	748 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	749 *r = '\0';
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	750 Log_err( "Field in overview too long: %s", r );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	751 return ++p;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	752 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	753 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	754 *r = '\0';
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	755 return ++p;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	756 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	757
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	758 static Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	759 parseOvLn( Str line, int *numb, Str subj, Str from,
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	760 Str date, Str msgId, Str ref, size_t bytes, size_t lines )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	761 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	762 const char *p;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	763 Str t;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	764
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	765 p = readField( t, line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	766 if ( sscanf( t, "%d", numb ) != 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	767 return FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	768 p = readField( subj, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	769 p = readField( from, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	770 p = readField( date, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	771 p = readField( msgId, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	772 p = readField( ref, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	773 p = readField( t, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	774 *bytes = 0;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	775 *lines = 0;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	776 if ( sscanf( t, "%d", bytes ) != 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	777 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	778 p = readField( t, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	779 if ( sscanf( t, "%d", lines ) != 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	780 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	781 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	782 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	783
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	784 static const char*
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	785 nextXref( const char pXref, Str grp, int numb )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	786 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	787 Str s;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	788 const char pColon, src;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	789 char *dst;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	790
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	791 src = pXref;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	792 while ( src && isspace( src ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	793 ++src;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	794 dst = s;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	795 while ( src && ! isspace( src ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	796 (dst++) = (src++);
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	797 *dst = '\0';
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	798 if ( strlen( s ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	799 return NULL;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	800 pColon = strstr( s, ":" );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	801 if ( ! pColon \|\| sscanf( pColon + 1, "%d", numb ) != 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	802 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	803 Log_err( "Corrupt Xref at position '%s'", pXref );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	804 return NULL;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	805 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	806 Utl_cpyStrN( grp, s, pColon - s );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	807 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	808 "client.c: nextXref: grp '%s' numb %lu",
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	809 grp, numb );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	810 return src;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	811 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	812
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	813 static Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	814 needsMark( const char *ref )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	815 {
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	816 Bool interesting, result;
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	817 const char *msgId;
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	818 int status;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	819 time_t lastAccess, nowTime;
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	820 double threadFollowTime, maxTime, timeSinceLastAccess;
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	821 ItemList *itl;
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	822 const double secPerDay = 24.0 * 3600.0;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	823
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	824 ASSERT( Lock_gotLock() );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	825 Log_dbg( LOG_DBG_FETCH, "Checking references '%s' for thread mode", ref );
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	826 result = FALSE;
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	827 itl = new_Itl( ref, " \t" );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	828 nowTime = time( NULL );
57 84e32c84666b [svn] add some intermediate variables for easier debugging enz parents: 54 diff changeset	829 threadFollowTime = (double)Cfg_threadFollowTime();
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	830 maxTime = threadFollowTime * secPerDay;
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	831 Log_dbg( LOG_DBG_FETCH, "Max time = %.0f", maxTime );
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	832 for ( msgId = Itl_first( itl ); msgId != NULL; msgId = Itl_next( itl ) )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	833 {
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	834 /*
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	835 References does not have to contain only Message IDs,
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	836 but often it does, so we look up every item in the database.
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	837 */
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	838 if ( Db_contains( msgId ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	839 {
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	840 status = Db_status( msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	841 lastAccess = Db_lastAccess( msgId );
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	842 interesting = ( status & DB_INTERESTING );
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	843 timeSinceLastAccess = difftime( nowTime, lastAccess );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	844 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	845 "Msg ID '%s': since last access = %.0f, interesting = %s",
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	846 msgId, timeSinceLastAccess, ( interesting ? "y" : "n" ) );
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	847 if ( interesting && timeSinceLastAccess <= maxTime )
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	848 {
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	849 result = TRUE;
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	850 break;
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	851 }
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	852 }
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	853 else
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	854 {
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	855 Log_dbg( LOG_DBG_FETCH, "MsgID '%s': not in database.", msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	856 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	857 }
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	858 del_Itl( itl );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	859 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	860 "Article %s marking for download.",
67 2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	861 ( result ? "needs" : "doesn't need" ) );
2e47992d7f5c [svn] Rewrote needsMark(): use itemlist.h, more debugging output. enz parents: 61 diff changeset	862 return result;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	863 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	864
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	865 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	866 prepareEntry( Over *ov )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	867 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	868 Str g, t;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	869 const char msgId, p, *xref;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	870 int n;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	871
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	872 ASSERT( Lock_gotLock() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	873 msgId = Ov_msgId( ov );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	874 if ( Pseudo_isGeneralInfo( msgId ) )
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	875 Log_dbg( LOG_DBG_FETCH, "Skipping general info '%s'", msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	876 else if ( Db_contains( msgId ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	877 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	878 xref = Db_xref( msgId );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	879 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	880 "Entry '%s' already in db with Xref '%s'",
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	881 msgId, xref );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	882 p = nextXref( xref, g, &n );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	883 if ( p == NULL )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	884 Log_err( "Overview with no group in Xref '%s'", msgId );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	885 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	886 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	887 /* TODO: This code block seems unnessesary. Can we remove it? */
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	888 if ( Cfg_servIsPreferential( client.serv, Grp_server( g ) ) )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	889 {
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	890 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	891 "Changing first server for '%s' from '%s' to '%s'",
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	892 msgId, Grp_server( g ), client.serv );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	893 snprintf( t, MAXCHAR, "%s:%d %s",
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	894 client.grp, Ov_numb( ov ), xref );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	895 Db_setXref( msgId, t );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	896 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	897 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	898 {
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	899 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	900 "Adding '%s' to Xref of '%s'", g, msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	901 snprintf( t, MAXCHAR, "%s %s:%d",
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	902 xref, client.grp, Ov_numb( ov ) );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	903 Db_setXref( msgId, t );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	904 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	905 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	906 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	907 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	908 {
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	909 Log_dbg( LOG_DBG_FETCH, "Preparing '%s' in database", msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	910 Db_prepareEntry( ov, client.grp, Ov_numb( ov ) );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	911 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	912 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	913
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	914 int
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	915 Client_getOver( const char *grp, int rmtFirst, int rmtLast, FetchMode mode )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	916 {
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	917 size_t nbytes, nlines;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	918 int rmtNumb, groupsNumb, oldLast, cntMarked;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	919 Over *ov;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	920 Str line, subj, from, date, msgId, ref, groups;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	921 DynStr response, newsgroups;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	922 const char lines, groupLines;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	923 char *p;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	924 FilterAction action;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	925 int stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	926
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	927 ASSERT( ! Lock_gotLock() );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	928 ASSERT( strcmp( grp, "" ) != 0 );
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	929
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	930 /* Do we need the article Newsgroups: for filtering? */
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	931 if ( Flt_getNewsgroups() )
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	932 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	933 if ( ! putCmd( "XHDR Newsgroups %lu-%lu", rmtFirst, rmtLast ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	934 return STAT_CONNECTION_LOST;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	935 stat = getStat();
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	936 if ( stat != STAT_HEAD_FOLLOWS )
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	937 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	938 Log_err( "XHDR command failed: %s", client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	939 return stat;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	940 }
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	941
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	942 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	943 "Requesting Newsgroups headers for remote %lu-%lu",
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	944 rmtFirst, rmtLast );
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	945
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	946 newsgroups = collectTxt();
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	947 if ( newsgroups == NULL )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	948 return STAT_CONNECTION_LOST;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	949
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	950 groupLines = DynStr_str( newsgroups );
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	951 }
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	952 else
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	953 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	954 groupLines = NULL;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	955 newsgroups = NULL;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	956 }
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	957
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	958 if ( ! putCmd( "XOVER %lu-%lu", rmtFirst, rmtLast ) )
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	959 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	960 del_DynStr( newsgroups );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	961 return STAT_CONNECTION_LOST;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	962 }
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	963
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	964 stat = getStat();
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	965 if ( stat != STAT_OVERS_FOLLOW )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	966 {
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	967 del_DynStr( newsgroups );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	968 Log_err( "XOVER command failed: %s", client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	969 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	970 }
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	971 Log_dbg( LOG_DBG_FETCH,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	972 "Requesting overview for remote %lu-%lu",
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	973 rmtFirst, rmtLast );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	974
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	975 response = collectTxt();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	976 if ( response == NULL )
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	977 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	978 del_DynStr( newsgroups );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	979 return STAT_CONNECTION_LOST;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	980 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	981
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	982 if ( ! Lock_openDatabases() )
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	983 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	984 del_DynStr( newsgroups );
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	985 del_DynStr( response );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	986 return STAT_NEWSBASE_FATAL;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	987 }
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	988
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	989 Cont_read( grp );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	990 oldLast = Cont_last();
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	991 cntMarked = 0;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	992 lines = DynStr_str( response );
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	993 while ( ( lines = Utl_getLn( line, lines ) ) != NULL )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	994 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	995 if ( ! parseOvLn( line, &rmtNumb, subj, from, date, msgId, ref,
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	996 &nbytes, &nlines ) )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	997 Log_err( "Bad overview line: %s", line );
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	998 else if ( Cont_find( msgId ) >= 0 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 74 diff changeset	999 Log_inf( "Already have '%s'", msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1000 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1001 {
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1002 ov = new_Over( subj, from, date, msgId, ref, nbytes, nlines );
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1003 groupsNumb = 0;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1004 p = NULL;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1005 if ( groupLines != NULL )
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1006 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1007 do
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1008 {
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1009 groupLines = Utl_getLn( groups, groupLines );
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1010 groupsNumb = strtoul( groups, &p, 10 );
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1011 } while ( groupLines != NULL
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1012 && p > groups
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1013 && groupsNumb < rmtNumb );
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1014 if ( groupsNumb != rmtNumb )
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1015 p = NULL;
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1016 }
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1017
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1018 action = Flt_checkFilters( grp, p, ov, mode );
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1019 if ( action == FILTER_DISCARD )
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1020 continue;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1021 Cont_app( ov );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1022 prepareEntry( ov );
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1023 if ( action == FILTER_FULL
d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1024 \|\| ( action == FILTER_THREAD && needsMark( ref ) ) )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1025 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1026 Req_add( client.serv, msgId );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1027 ++cntMarked;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1028 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1029 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1030 Grp_setRmtNext( client.grp, rmtNumb + 1 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1031 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1032 if ( oldLast != Cont_last() )
191 28488e0e3630 [svn] * src/group.h,src/group.c,src/noffle.c,src/server.c: Grp_setLastAccess is bears parents: 188 diff changeset	1033 {
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1034 Log_inf( "Added %s %lu-%lu", client.grp, oldLast + 1, Cont_last() );
191 28488e0e3630 [svn] * src/group.h,src/group.c,src/noffle.c,src/server.c: Grp_setLastAccess is bears parents: 188 diff changeset	1035 Log_inf( "%u articles marked for download in %s",
28488e0e3630 [svn] * src/group.h,src/group.c,src/noffle.c,src/server.c: Grp_setLastAccess is bears parents: 188 diff changeset	1036 cntMarked, client.grp );
223 ffb1848a39db [svn] * src/util.c: Improve (correct) error detection when updating bears parents: 215 diff changeset	1037 if ( Cont_write() )
ffb1848a39db [svn] * src/util.c: Improve (correct) error detection when updating bears parents: 215 diff changeset	1038 Grp_setFirstLast( grp, Cont_first(), Cont_last() );
191 28488e0e3630 [svn] * src/group.h,src/group.c,src/noffle.c,src/server.c: Grp_setLastAccess is bears parents: 188 diff changeset	1039 Grp_setLastPostTime( grp );
28488e0e3630 [svn] * src/group.h,src/group.c,src/noffle.c,src/server.c: Grp_setLastAccess is bears parents: 188 diff changeset	1040 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1041 Lock_closeDatabases();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1042 del_DynStr( response );
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1043 del_DynStr( newsgroups );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1044 return STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1045 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1046
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1047 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1048 retrievingFailed( const char* msgId, const char *reason )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1049 {
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	1050 int status;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1051
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1052 ASSERT( ! Lock_gotLock() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1053 Log_err( "Retrieving of %s failed: %s", msgId, reason );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1054 if ( ! Lock_openDatabases() )
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1055 return;
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	1056 status = Db_status( msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1057 Pseudo_retrievingFailed( msgId, reason );
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	1058 Db_setStatus( msgId, status \| DB_RETRIEVING_FAILED );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1059 Lock_closeDatabases();
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1060 return;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1061 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1062
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1063 static int
120 05f50c1761d9 [svn] Applied patch from Matija Nalis: enz parents: 112 diff changeset	1064 retrieveAndStoreArt( const char *msgId, int artcnt, int artmax )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1065 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1066 Bool err;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1067 DynStr *s = NULL;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1068
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1069 ASSERT( ! Lock_gotLock() );
120 05f50c1761d9 [svn] Applied patch from Matija Nalis: enz parents: 112 diff changeset	1070 Log_inf( "[%d/%d] Retrieving %s", artcnt, artmax, msgId );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1071 err = TRUE;
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1072
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1073 s = collectTxt();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1074 if ( s != NULL )
95 c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1075 {
c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1076 const char *txt;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1077
95 c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1078 txt = DynStr_str( s );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1079 if ( ! Lock_openDatabases() )
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1080 {
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1081 del_DynStr( s );
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1082 retrievingFailed( msgId, "Can't open message base" );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1083 return STAT_NEWSBASE_FATAL;
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1084 }
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1085
95 c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1086 err = ! Db_storeArt( msgId, txt );
c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1087 if ( ! err )
c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1088 {
102 38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1089 Str supersedeIds;
38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1090
38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1091 if ( Prt_searchHeader( txt, "Supersedes", supersedeIds ) )
38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1092 {
38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1093 ItemList *ids;
103 f782184db8bc [svn] 1.0pre6 merge plus variable rename bears parents: 102 diff changeset	1094 const char *supersededMsgId;
95 c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1095
102 38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1096 ids = new_Itl( supersedeIds, " \n\t" );
103 f782184db8bc [svn] 1.0pre6 merge plus variable rename bears parents: 102 diff changeset	1097 for ( supersededMsgId = Itl_first( ids );
f782184db8bc [svn] 1.0pre6 merge plus variable rename bears parents: 102 diff changeset	1098 supersededMsgId != NULL;
f782184db8bc [svn] 1.0pre6 merge plus variable rename bears parents: 102 diff changeset	1099 supersededMsgId = Itl_next( ids ) )
f782184db8bc [svn] 1.0pre6 merge plus variable rename bears parents: 102 diff changeset	1100 Ctrl_cancel( supersededMsgId );
102 38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1101 del_Itl( ids );
38b0a1532a37 [svn] Only track remote message no when subscribed bears parents: 95 diff changeset	1102 }
95 c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1103 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1104 Lock_closeDatabases();
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1105 del_DynStr( s );
95 c3312022e657 [svn] Observe Supersedes: header bears parents: 88 diff changeset	1106 }
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1107 else
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1108 {
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1109 retrievingFailed( msgId, "Connection broke down" );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1110 return STAT_CONNECTION_LOST;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1111 }
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1112 return err ? STAT_NEWSBASE_FATAL : STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1113 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1114
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1115 int
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1116 Client_retrieveArt( const char *msgId )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1117 {
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1118 int res;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1119
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1120 ASSERT( Lock_gotLock() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1121 if ( ! Db_contains( msgId ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1122 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1123 Log_err( "Article '%s' not prepared in database. Skipping.", msgId );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1124 return STAT_PROGRAM_FAULT;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1125 }
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	1126 if ( ! ( Db_status( msgId ) & DB_NOT_DOWNLOADED ) )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1127 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1128 Log_inf( "Article '%s' already retrieved. Skipping.", msgId );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1129 return STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1130 }
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1131
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1132 Lock_closeDatabases();
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1133 if ( ! putCmd( "ARTICLE %s", msgId ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1134 {
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1135 retrievingFailed( msgId, "Connection broke down" );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1136 res = STAT_CONNECTION_LOST;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1137 }
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1138 else if ( ( res = getStat() ) != STAT_ART_FOLLOWS )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1139 retrievingFailed( msgId, client.lastStat );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1140 else
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1141 res = retrieveAndStoreArt( msgId, 0, 0 );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1142 if ( ! Lock_openDatabases() )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1143 res = STAT_NEWSBASE_FATAL;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1144 return res;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1145 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1146
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1147 int
120 05f50c1761d9 [svn] Applied patch from Matija Nalis: enz parents: 112 diff changeset	1148 Client_retrieveArtList( const char list, int artcnt, int artmax )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1149 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1150 Str msgId;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1151 DynStr *s;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1152 const char *p;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1153 int res, msgStat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1154
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1155 ASSERT( Lock_gotLock() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1156 Log_inf( "Retrieving article list" );
58 b4e6f7f96135 [svn] Add some intermediate variables for easier debugging in needsMark(). enz parents: 57 diff changeset	1157 s = new_DynStr( (int)strlen( list ) );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1158 p = list;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1159 res = STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1160 while ( ( p = Utl_getLn( msgId, p ) ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1161 if ( ! Db_contains( msgId ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1162 {
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1163 Log_err( "[%d/%d] Skipping retrieving of %s "
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1164 "(not prepared in database)",
123 ec190bad201b [svn] Applied patch from M.Nalis for fixing a small problem with enz parents: 120 diff changeset	1165 ++(*artcnt), artmax, msgId );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1166 res = STAT_PROGRAM_FAULT;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1167 }
61 adf0af5152f7 [svn] Renamed some variables and function names, because they caused compiler enz parents: 58 diff changeset	1168 else if ( ! ( Db_status( msgId ) & DB_NOT_DOWNLOADED ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1169 Log_inf( "[%d/%d] Skipping %s (already retrieved)",
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1170 ++(*artcnt), artmax, msgId );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1171 else if ( ! putCmdNoFlush( "ARTICLE %s", msgId ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1172 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1173 retrievingFailed( msgId, "Connection broke down" );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1174 del_DynStr( s );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1175 return STAT_CONNECTION_LOST;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1176 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1177 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1178 DynStr_appLn( s, msgId );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1179
3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1180 Lock_closeDatabases();
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1181 fflush( client.out );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 183 diff changeset	1182 Log_dbg( LOG_DBG_PROTOCOL, "[S FLUSH]" );
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1183
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1184 /*
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1185 * We got something. Try to process all messages and return the
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1186 * 'worst' error encountered (note we may have already hit a
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1187 * STAT_PROGRAM_FAULT).
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1188 */
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1189 p = DynStr_str( s );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1190 while ( ! IS_FATAL( res ) && ( p = Utl_getLn( msgId, p ) ) )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1191 {
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1192 msgStat = getStat();
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1193 if ( msgStat == STAT_ART_FOLLOWS )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1194 msgStat = retrieveAndStoreArt( msgId, ++(*artcnt), artmax );
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1195 else
183 c912e8288164 [svn] * src/client.c: Only bail out of fetching multiple articles if the bears parents: 182 diff changeset	1196 retrievingFailed( msgId, client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1197
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1198 if ( res == STAT_OK \|\| ( ! IS_FATAL( res ) && IS_FATAL( msgStat ) ) )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1199 res = msgStat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1200 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1201 del_DynStr( s );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1202 if ( ! Lock_openDatabases() && ! IS_FATAL( res ) )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1203 res = STAT_NEWSBASE_FATAL;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1204 return res;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1205 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1206
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1207 int
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1208 Client_changeToGrp( const char* name )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1209 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1210 unsigned int stat;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1211 int estimatedNumb, first, last, res;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1212
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1213 ASSERT( Lock_gotLock() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1214 if ( ! Grp_exists( name ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1215 return STAT_NEWSBASE_FATAL;
130 d6c006a27ffe [svn] Add article fetching and fix potential lock bug bears parents: 127 diff changeset	1216 Lock_closeDatabases();
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1217 stat = STAT_OK;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1218 if ( ! putCmd( "GROUP %s", name ) )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1219 res = STAT_CONNECTION_LOST;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1220 if ( stat == STAT_OK )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1221 stat = getStat();
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1222 if ( ! Lock_openDatabases() )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1223 return STAT_NEWSBASE_FATAL;
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1224 if ( stat != STAT_GRP_SELECTED )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1225 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1226 if ( sscanf( client.lastStat, "%u %d %d %d",
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1227 &stat, &estimatedNumb, &first, &last ) != 4 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1228 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1229 Log_err( "Bad server response to GROUP: %s", client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1230 return STAT_PROGRAM_FAULT;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1231 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1232 Utl_cpyStr( client.grp, name );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1233 client.rmtFirst = first;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1234 client.rmtLast = last;
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1235 return STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1236 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1237
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1238 void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1239 Client_rmtFirstLast( int first, int last )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1240 {
127 3c71e28c8eef [svn] Release-1-0 mergedocs/NOTES bears parents: 123 diff changeset	1241 ASSERT( Lock_gotLock() );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1242 *first = client.rmtFirst;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1243 *last = client.rmtLast;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1244 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1245
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1246 int
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1247 Client_postArt( const char msgId, const char artTxt, Str errStr )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1248 {
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1249 int stat;
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1250
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1251 errStr[0] = '\0';
09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1252
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1253 if ( ! putCmd( "POST" ) )
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1254 return STAT_CONNECTION_LOST;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1255 stat = getStat();
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1256 if ( IS_FATAL( stat ) )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1257 return stat;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1258 else if ( stat != STAT_SEND_ART )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1259 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1260 Log_err( "Posting of %s not allowed: %s", msgId, client.lastStat );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1261 strcpy( errStr, client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1262 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1263 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1264 putTxtBuf( artTxt );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1265 putEndOfTxt();
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1266 stat = getStat();
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1267 if ( IS_FATAL( stat ) )
f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1268 return stat;
180 09ca6eb5c7ff [svn] * TODO,src/client.c,src/client.h,src/fetch.c,src/fetch.h,src/noffle.c: bears parents: 172 diff changeset	1269 else if ( stat != STAT_POST_OK )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1270 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1271 Log_err( "Posting of %s failed: %s", msgId, client.lastStat );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1272 strcpy( errStr, client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1273 return stat;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1274 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1275 Log_inf( "Posted %s (Status: %s)", msgId, client.lastStat );
188 f1bacee93ca6 [svn] * src/client.c,src/client.h,src/fetch.c,src/noffle.c,src/server.c: bears parents: 187 diff changeset	1276 return STAT_OK;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1277 }

Mercurial > noffle

annotate src/client.c @ 223:ffb1848a39db noffle