noffle: src/configfile.c annotate

annotate src/configfile.c @ 288:c02c4eb95f95 noffle

[svn] * src/configfile.h,src/configfile.c,docs/noffle.conf.5: Add noffle-user and noffle-group configs. * src/configfile.c,src/fetch.c,src/fetchlist.c,src/protocol.c, src/server.c: Replace strcpy() with Utl_cpyStr() where appropriate. See Debian bug 168128. * src/control.c,src/configfile.c,src/noffle.c: Replace [s]scanf("%s") with [s]scanf(MAXCHAR_FMT). * src/noffle.c: Log warning if noffle.conf is world readable. * src/noffle.c: Restrict most options to news admins; i.e. those who are root or news on running Noffle. * Makefile.in,acconfig.h,aclocal.m4,config.h.in,configure,configure.in, docs/Makefile.in,docs/noffle.conf.5,packages/Makefile.in, packages/redhat/Makefile.in,src/Makefile.am,src/Makefile.in, src/authenticate.c,src/authenticate.h,src/noffle.c,src/server.c: Add basic authentication using either Noffle-specific user file or authenticating via PAM (service 'noffle'). PAM authentication needs to run as root, so a Noffle server that needs PAM must be started by root. Helpful (?) error messages will be logged if not. Noffle will switch ruid and euid to 'news' (or whatever is configured) ASAP. * src/noffle.c: Add uid checking.

author	bears
date	Fri, 10 Jan 2003 23:25:45 +0000
parents	01755687c565
children	f35a7d45efd5

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 configfile.c
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	3
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	4 The following macros must be set, when compiling this file:
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	5 CONFIGFILE
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	6 SPOOLDIR
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	7 VERSION
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	8
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	9 $Id: configfile.c 419 2003-01-10 23:11:43Z bears $
43 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
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	12 #if HAVE_CONFIG_H
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	13 #include <config.h>
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	14 #endif
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	15
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	16 #include <ctype.h>
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	17 #include <limits.h>
273 18d6c61ed4e7 [svn] * src/configfile.c: #include <regex.h> requires sys/types.h be included first. bears parents: 249 diff changeset	18 #include <sys/types.h>
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	19 #include <regex.h>
197 24d4cd032da5 [svn] * AUTHORS,INSTALL,NEWS,README,TODO,docs/NOTES,src/client.c,src/protocol.c, bears parents: 195 diff changeset	20 #include "configfile.h"
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	21 #include "filter.h"
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	22 #include "itemlist.h"
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	23 #include "log.h"
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	24 #include "util.h"
54 125d79c9e586 [svn] * src/client.c, src/configfile.c, src/content.c, src/control.c, uh1763 parents: 43 diff changeset	25 #include "portable.h"
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	26 #include "wildmat.h"
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	27
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	28 typedef struct
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	29 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	30 int numGroup;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	31 int maxGroup;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	32 char **groups;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	33 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	34 GroupEntry;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	35
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	36 struct GroupEnum
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	37 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	38 GroupEntry *groupEntry;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	39 int groupIdx;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	40 };
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	41
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	42 typedef struct
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	43 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	44 char *name;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	45 char *user;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	46 char *pass;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	47 GroupEntry getgroups;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	48 GroupEntry omitgroups;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	49 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	50 ServEntry;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	51
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	52 typedef struct
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	53 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	54 char *pattern;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	55 int days;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	56 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	57 ExpireEntry;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	58
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	59 typedef struct
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	60 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	61 char *pattern;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	62 char *mode;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	63 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	64 AutoSubscribeModeEntry;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	65
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	66 struct
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	67 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	68 /* Compile time options */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	69 const char *spoolDir;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	70 const char *version;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	71 /* Options from the config file */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	72 int maxFetch;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	73 int autoUnsubscribeDays;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	74 int threadFollowTime;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	75 int connectTimeout;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	76 Bool autoSubscribe;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	77 Bool autoUnsubscribe;
82 1eb0cdd17c76 [svn] info-always-unread config/doc/implementation bears parents: 54 diff changeset	78 Bool infoAlways;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	79 Bool replaceMsgId;
195 76460d98b2fb [svn] * noffle.conf.example,docs/noffle.conf.5,src/configfile.h,src/configfile.c, bears parents: 194 diff changeset	80 Str hostnameMsgId;
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	81 Bool postLocal;
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	82 Bool clientAuth;
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	83 Str defaultAutoSubscribeMode;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	84 Str mailTo;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	85 int defaultExpire;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	86 int numServ;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	87 int maxServ;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	88 ServEntry *serv;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	89 int servIdx; /* for server enumeration */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	90 int numExpire;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	91 int maxExpire;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	92 ExpireEntry *expire;
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	93 int numAutoSubscribeMode;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	94 int maxAutoSubscribeMode;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	95 AutoSubscribeModeEntry *autoSubscribeMode;
111 6f681d41734c [svn] path-header added. bears parents: 104 diff changeset	96 Str pathHeader;
150 1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	97 Str fromDomain;
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	98 Str organization;
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	99 Str noffleUser;
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	100 Str noffleGroup;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	101 } config =
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	102 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	103 SPOOLDIR, /* spoolDir */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	104 VERSION, /* version */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	105 300, /* maxFetch */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	106 30, /* autoUnsubscribeDays */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	107 7, /* threadFollowTime */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	108 30, /* connectTimeout */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	109 FALSE, /* autoSubscribe */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	110 FALSE, /* autoUnsubscribe */
82 1eb0cdd17c76 [svn] info-always-unread config/doc/implementation bears parents: 54 diff changeset	111 TRUE, /* infoAlways */
222 bf290632d29e [svn] * src/post.c: Always replace message ID in posted message if existing bears parents: 212 diff changeset	112 FALSE, /* replaceMsgId */
195 76460d98b2fb [svn] * noffle.conf.example,docs/noffle.conf.5,src/configfile.h,src/configfile.c, bears parents: 194 diff changeset	113 "", /* hostnameMsgId */
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	114 FALSE, /* postLocal */
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	115 FALSE, /* clientAuth */
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	116 "over", /* defaultAutoSubscribeMode */
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	117 "", /* mailTo */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	118 14, /* defaultExpire */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	119 0, /* numServ */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	120 0, /* maxServ */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	121 NULL, /* serv */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	122 0, /* servIdx */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	123 0, /* numExpire */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	124 0, /* maxExpire */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	125 NULL, /* expire */
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	126 0, /* numAutoSubscribeMode */
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	127 0, /* maxAutoSubscribeMode */
111 6f681d41734c [svn] path-header added. bears parents: 104 diff changeset	128 NULL, /* autoSubscribeMode */
150 1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	129 "", /* pathHeader */
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	130 "", /* fromDomain */
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	131 "", /* organization */
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	132 "news", /* user Noffle runs as */
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	133 "news" /* group Noffle runs as */
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	134 };
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	135
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	136 const char * Cfg_spoolDir( void ) { return config.spoolDir; }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	137 const char * Cfg_version( void ) { return config.version; }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	138
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	139 int Cfg_maxFetch( void ) { return config.maxFetch; }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	140 int Cfg_autoUnsubscribeDays( void ) { return config.autoUnsubscribeDays; }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	141 int Cfg_threadFollowTime( void ) { return config.threadFollowTime; }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	142 int Cfg_connectTimeout( void ) { return config.connectTimeout; }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	143 Bool Cfg_autoUnsubscribe( void ) { return config.autoUnsubscribe; }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	144 Bool Cfg_autoSubscribe( void ) { return config.autoSubscribe; }
82 1eb0cdd17c76 [svn] info-always-unread config/doc/implementation bears parents: 54 diff changeset	145 Bool Cfg_infoAlways( void ) { return config.infoAlways; }
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	146 Bool Cfg_replaceMsgId( void ) { return config.replaceMsgId; }
195 76460d98b2fb [svn] * noffle.conf.example,docs/noffle.conf.5,src/configfile.h,src/configfile.c, bears parents: 194 diff changeset	147 const char * Cfg_hostnameMsgId( void ) { return config.hostnameMsgId; }
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	148 Bool Cfg_postLocal( void ) { return config.postLocal; }
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	149 Bool Cfg_needClientAuth( void ) { return config.clientAuth; }
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	150 const char * Cfg_defaultAutoSubscribeMode( void ) {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	151 return config.defaultAutoSubscribeMode; }
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	152 const char * Cfg_mailTo( void ) { return config.mailTo; }
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	153 int Cfg_defaultExpire( void ) { return config.defaultExpire; }
111 6f681d41734c [svn] path-header added. bears parents: 104 diff changeset	154 const char * Cfg_pathHeader( void ) { return config.pathHeader; }
150 1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	155 const char * Cfg_fromDomain( void ) { return config.fromDomain; }
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	156 const char * Cfg_organization( void ) { return config.organization; }
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	157 const char * Cfg_noffleUser( void ) { return config.noffleUser; }
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	158 const char * Cfg_noffleGroup( void ) { return config.noffleGroup; }
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	159
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	160 void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	161 Cfg_beginServEnum( void )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	162 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	163 config.servIdx = 0;
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 Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	167 Cfg_nextServ( Str name )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	168 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	169 if ( config.servIdx >= config.numServ )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	170 return FALSE;
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	171 Utl_cpyStr( name, config.serv[ config.servIdx ].name );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	172 ++config.servIdx;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	173 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	174 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	175
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	176 static Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	177 searchServ( const char name, int idx )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	178 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	179 int i;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	180
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	181 for ( i = 0; i < config.numServ; ++i )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	182 if ( strcmp( name, config.serv[ i ].name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	183 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	184 *idx = i;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	185 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	186 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	187 return FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	188 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	189
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	190 Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	191 Cfg_servListContains( const char *name )
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 int idx;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	194
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	195 return searchServ( name, &idx );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	196 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	197
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	198 Bool
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	199 Cfg_servIsPreferential( const char name1, const char name2 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	200 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	201 Bool exists1, exists2;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	202 int idx1, idx2;
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 exists1 = searchServ( name1, &idx1 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	205 exists2 = searchServ( name2, &idx2 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	206 if ( exists1 && exists2 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	207 return ( idx1 < idx2 );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	208 if ( exists1 && ! exists2 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	209 return TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	210 /* ( ! exists1 && exists2 ) \|\| ( ! exists1 && ! exists2 ) */
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	211 return FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	212 }
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 void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	215 Cfg_authInfo( const char *name, Str user, Str pass )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	216 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	217 int idx;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	218
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	219 if ( searchServ( name, &idx ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	220 {
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	221 Utl_cpyStr( user, config.serv[ idx ].user );
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	222 Utl_cpyStr( pass, config.serv[ idx ].pass );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	223 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	224 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	225 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	226 user[ 0 ] = '\0';
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	227 pass[ 0 ] = '\0';
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	228 }
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
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	231 int
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	232 Cfg_expire( const char *grp )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	233 {
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	234 int i, res;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	235
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	236 for ( i = 0; i < config.numExpire; i++ )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	237 if ( Wld_match( grp, config.expire[ i ].pattern ) )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	238 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	239 res = config.expire[ i ].days;
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	240 Log_dbg( LOG_DBG_CONFIG,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	241 "Custom expire period %d for group %s",
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	242 res, grp );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	243 return res;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	244 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	245
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	246 return Cfg_defaultExpire();
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	247 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	248
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	249 const char *
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	250 Cfg_autoSubscribeMode( const char *grp )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	251 {
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	252 int i;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	253 const char *res;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	254
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	255 for ( i = 0; i < config.numAutoSubscribeMode; i++ )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	256 if ( Wld_match( grp, config.autoSubscribeMode[ i ].pattern ) )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	257 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	258 res = config.autoSubscribeMode[ i ].mode;
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	259 Log_dbg( LOG_DBG_CONFIG,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	260 "Custom auto subscribe mode %s for group %s",
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	261 res, grp );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	262 return res;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	263 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	264
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	265 return Cfg_defaultAutoSubscribeMode();
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	266 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	267
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	268 GroupEnum *
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	269 new_GetGrEn( const char *name )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	270 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	271 GroupEnum *res;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	272 int servIdx;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	273
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	274 res = (GroupEnum *) malloc( sizeof( GroupEnum ) );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	275 if ( res == NULL )
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	276 Log_fatal( "Malloc of GroupEnum failed." );
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	277 if ( ! searchServ( name, &servIdx ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	278 res->groupEntry = NULL;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	279 else
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	280 res->groupEntry = &config.serv[ servIdx ].getgroups;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	281 GrEn_first( res );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	282 return res;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	283 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	284
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	285 GroupEnum *
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	286 new_OmitGrEn( const char *name )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	287 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	288 GroupEnum *res;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	289 int servIdx;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	290
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	291 res = (GroupEnum *) malloc( sizeof( GroupEnum ) );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	292 if ( res == NULL )
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	293 Log_fatal( "Malloc of GroupEnum failed." );
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	294 if ( ! searchServ( name, &servIdx ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	295 res->groupEntry = NULL;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	296 else
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	297 res->groupEntry = &config.serv[ servIdx ].omitgroups;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	298 GrEn_first( res );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	299 return res;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	300 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	301
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	302 void
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	303 del_GrEn( GroupEnum *ge )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	304 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	305 free(ge);
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	306 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	307
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	308 void
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	309 GrEn_first( GroupEnum *ge )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	310 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	311 ge->groupIdx = 0;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	312 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	313
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	314 const char *
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	315 GrEn_next( GroupEnum *ge )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	316 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	317 if ( ge->groupEntry == NULL \|\|
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	318 ge->groupIdx >= ge->groupEntry->numGroup )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	319 return NULL;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	320 return ge->groupEntry->groups[ ge->groupIdx++ ];
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	321 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	322
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	323 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	324 logSyntaxErr( const char *line )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	325 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	326 Log_err( "Syntax error in config file: %s", line );
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
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	329 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	330 getBool( Bool variable, const char line )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	331 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	332 Str value, name, lowerLn;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	333
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	334 Utl_cpyStr( lowerLn, line );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	335 Utl_toLower( lowerLn );
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	336 if ( sscanf( lowerLn, MAXCHAR_FMT " " MAXCHAR_FMT, name, value ) != 2 )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	337 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	338 logSyntaxErr( line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	339 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	340 }
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 ( strcmp( value, "yes" ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	343 *variable = TRUE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	344 else if ( strcmp( value, "no" ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	345 *variable = FALSE;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	346 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	347 Log_err( "Error in config file %s must be yes or no", name );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	348 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	349
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	350 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	351 getInt( int variable, int min, int max, const char line )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	352 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	353 int value;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	354 Str name;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	355
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	356 if ( sscanf( line, MAXCHAR_FMT " %d", name, &value ) != 2 )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	357 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	358 logSyntaxErr( line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	359 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	360 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	361 if ( value < min \|\| value > max )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	362 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	363 Log_err( "Range error in config file %s [%d,%d]", name, min, max );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	364 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	365 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	366 *variable = value;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	367 }
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 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	370 getStr( char variable, const char line )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	371 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	372 Str dummy;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	373
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	374 if ( sscanf( line, MAXCHAR_FMT " " MAXCHAR_FMT, dummy, variable ) != 2 )
43 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 logSyntaxErr( line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	377 return;
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 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	380
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	381 static void
150 1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	382 getText( Str variable, const char *line )
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	383 {
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	384 const char *l;
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	385
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	386 /* Skip command */
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	387 l = Utl_restOfLn( line, 1 );
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	388 Utl_cpyStr( variable, l );
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	389 }
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	390
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	391 static void
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	392 getServ( const char *line )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	393 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	394 Str dummy, name, user, pass;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	395 int r, len;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	396 ServEntry entry;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	397
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	398 memset( &entry, 0, sizeof( entry ) );
190 47569cf4ad4a [svn] fix bug with missing initialization of user name and passwd enz parents: 185 diff changeset	399 user[ 0 ] = pass[ 0 ] = '\0';
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	400 r = sscanf( line,
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	401 MAXCHAR_FMT " " MAXCHAR_FMT " " MAXCHAR_FMT " " MAXCHAR_FMT,
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	402 dummy, name, user, pass );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	403 if ( r < 2 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	404 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	405 logSyntaxErr( line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	406 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	407 }
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	408 len = strlen( name );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	409 /* To make server name more definit, it is made lowercase and
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	410 port is removed, if it is the default port */
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	411 if ( len > 4 && strcmp( name + len - 4, ":119" ) == 0 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	412 name[ len - 4 ] = '\0';
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	413 Utl_toLower( name );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	414
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	415 Utl_allocAndCpy( &entry.name, name );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	416 Utl_allocAndCpy( &entry.user, user );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	417 Utl_allocAndCpy( &entry.pass, pass );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	418
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	419 if ( config.maxServ < config.numServ + 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	420 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	421 if ( ! ( config.serv = realloc( config.serv,
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	422 ( config.maxServ + 5 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	423 * sizeof( ServEntry ) ) ) )
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	424 Log_fatal( "Could not realloc server list" );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	425 config.maxServ += 5;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	426 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	427 config.serv[ config.numServ++ ] = entry;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	428 }
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 static void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	431 getExpire( const char *line )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	432 {
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	433 Str dummy, pattern;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	434 ExpireEntry entry;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	435 int days;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	436
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	437 if ( sscanf( line, MAXCHAR_FMT " " MAXCHAR_FMT " %d",
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	438 dummy, pattern, &days ) != 3 )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	439 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	440 logSyntaxErr( line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	441 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	442 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	443 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	444 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	445 if ( days < 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	446 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	447 Log_err( "Expire days error in '%s': must be integer > 0",
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	448 line, days );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	449 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	450 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	451
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	452 Utl_toLower( pattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	453 Utl_allocAndCpy( &entry.pattern, pattern );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	454 entry.days = days;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	455
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	456 if ( config.maxExpire < config.numExpire + 1 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	457 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	458 if ( ! ( config.expire = realloc( config.expire,
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	459 ( config.maxExpire + 5 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	460 * sizeof( ExpireEntry ) ) ) )
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	461 Log_fatal( "Could not realloc expire list" );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	462 config.maxExpire += 5;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	463 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	464 config.expire[ config.numExpire++ ] = entry;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	465 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	466 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	467
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	468 static void
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	469 getGroups( char *line, Bool isGet )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	470 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	471 const char *name;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	472 ItemList *patterns;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	473 const char *pattern;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	474
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	475 if ( config.numServ == 0 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	476 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	477 Log_err( "No current server in %s", line );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	478 return;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	479 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	480
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	481 name = line;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	482 /* Skip over name and terminate it */
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	483 while ( line[ 0 ] != '\0' && ! isspace( line[ 0 ] ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	484 line++;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	485 if ( line[ 0 ] == '\0' )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	486 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	487 logSyntaxErr( name );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	488 return;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	489 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	490 line[ 0 ] = '\0';
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	491 line++;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	492
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	493 patterns = new_Itl( line, " ," );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	494 for( pattern = Itl_first( patterns );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	495 pattern != NULL;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	496 pattern = Itl_next( patterns ) )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	497 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	498 GroupEntry *g;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	499
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	500 if ( isGet )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	501 g = &config.serv[ config.numServ - 1 ].getgroups;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	502 else
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	503 g = &config.serv[ config.numServ - 1 ].omitgroups;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	504 if ( g->maxGroup < g->numGroup + 1 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	505 {
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	506 if ( ! ( g->groups = realloc( g->groups,
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	507 ( g->maxGroup + 5 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	508 * sizeof( char * ) ) ) )
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	509 Log_fatal( "Could not realloc group list" );
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	510 g->maxGroup += 5;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	511 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	512 Utl_allocAndCpy( &g->groups[ g->numGroup++ ], pattern );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	513 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	514 del_Itl( patterns) ;
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	515 }
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	516
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	517 static void
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	518 getDebugMask( char *line )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	519 {
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	520 const char *name;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	521 ItemList *maskNames;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	522 const char *maskName;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	523 unsigned mask;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	524
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	525 name = line;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	526 /* Skip over name and terminate it */
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	527 while ( line[ 0 ] != '\0' && ! isspace( line[ 0 ] ) )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	528 line++;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	529 if ( line[ 0 ] == '\0' )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	530 {
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	531 logSyntaxErr( name );
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	532 return;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	533 }
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	534 line[ 0 ] = '\0';
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	535 line++;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	536
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	537 mask = LOG_DBG_NONE;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	538 maskNames = new_Itl( line, " ," );
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	539 for( maskName = Itl_first( maskNames );
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	540 maskName != NULL;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	541 maskName = Itl_next( maskNames ) )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	542 {
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	543 if ( strcmp( maskName, "all" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	544 mask = LOG_DBG_ALL;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	545 else if ( strcmp( maskName, "none" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	546 mask = LOG_DBG_NONE;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	547 else if ( strcmp( maskName, "config" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	548 mask \|= LOG_DBG_CONFIG;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	549 else if ( strcmp( maskName, "control" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	550 mask \|= LOG_DBG_CONTROL;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	551 else if ( strcmp( maskName, "expire" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	552 mask \|= LOG_DBG_EXPIRE;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	553 else if ( strcmp( maskName, "fetch" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	554 mask \|= LOG_DBG_FETCH;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	555 else if ( strcmp( maskName, "filter" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	556 mask \|= LOG_DBG_FILTER;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	557 else if ( strcmp( maskName, "newsbase" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	558 mask \|= LOG_DBG_NEWSBASE;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	559 else if ( strcmp( maskName, "noffle" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	560 mask \|= LOG_DBG_NOFFLE;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	561 else if ( strcmp( maskName, "post" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	562 mask \|= LOG_DBG_POST;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	563 else if ( strcmp( maskName, "protocol" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	564 mask \|= LOG_DBG_PROTOCOL;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	565 else if ( strcmp( maskName, "requests" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	566 mask \|= LOG_DBG_REQUESTS;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	567 else if ( strcmp( maskName, "server" ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	568 mask \|= LOG_DBG_SERVER;
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	569 else if ( strcmp( maskName, "auth" ) == 0 )
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	570 mask \|= LOG_DBG_AUTH;
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	571 else
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	572 logSyntaxErr( line );
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	573 }
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	574 del_Itl( maskNames) ;
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	575 Log_setDbgMask( mask );
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	576 }
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	577
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	578 static Bool
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	579 isValidAutoSubscribeMode( const char *mode )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	580 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	581 return strcmp( mode, "full" ) == 0
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	582 \|\| strcmp( mode, "thread" ) == 0
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	583 \|\| strcmp( mode, "over" ) == 0
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	584 \|\| strcmp( mode, "off" ) == 0;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	585 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	586
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	587 static void
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	588 getAutoSubscribeMode( const char *line )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	589 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	590 Str dummy, pattern, mode;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	591 AutoSubscribeModeEntry entry;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	592 int items;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	593
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	594 items = sscanf( line, MAXCHAR_FMT " " MAXCHAR_FMT " " MAXCHAR_FMT,
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	595 dummy, pattern, mode );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	596 if ( items == 2 )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	597 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	598 /* Backwards compat. default-auto-subscribe-mode */
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	599 Utl_cpyStr( mode, pattern );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	600 Utl_toLower( mode );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	601 if ( ! isValidAutoSubscribeMode( mode ) )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	602 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	603 logSyntaxErr( line );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	604 return;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	605 }
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	606 Utl_cpyStr( config.defaultAutoSubscribeMode, mode );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	607 return;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	608 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	609 else if ( items != 3 )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	610 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	611 logSyntaxErr( line );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	612 return;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	613 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	614
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	615 Utl_toLower( mode );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	616 if ( ! isValidAutoSubscribeMode( mode ) )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	617 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	618 logSyntaxErr( line );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	619 return;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	620 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	621
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	622 Utl_toLower( pattern );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	623 Utl_allocAndCpy( &entry.pattern, pattern );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	624 Utl_allocAndCpy( &entry.mode, mode );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	625
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	626 if ( config.maxAutoSubscribeMode < config.numAutoSubscribeMode + 1 )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	627 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	628 if ( ! ( config.autoSubscribeMode =
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	629 realloc( config.autoSubscribeMode,
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	630 ( config.maxAutoSubscribeMode + 5 )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	631 * sizeof( AutoSubscribeModeEntry ) ) ) )
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	632 Log_fatal( "Could not realloc auto subscribe mode list" );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	633 config.maxAutoSubscribeMode += 5;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	634 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	635 config.autoSubscribeMode[ config.numAutoSubscribeMode++ ] = entry;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	636 }
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	637
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	638 static const char *
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	639 getToken( const char *line, Str value )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	640 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	641 Bool isQuoted;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	642 char quoteChar;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	643 Bool seenEscape;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	644 char *maxVal;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	645
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	646 while ( line != '\0' && isspace( line ) )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	647 line++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	648 if ( *line == '\0' )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	649 return NULL;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	650
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	651 maxVal = &value[ MAXCHAR ];
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	652 isQuoted = ( line == '\'' \|\| line == '"' );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	653 if ( isQuoted )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	654 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	655 quoteChar = *line;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	656 line++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	657
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	658 seenEscape = FALSE;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	659 while ( *line != '\0'
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	660 && ( *line != quoteChar \|\| seenEscape )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	661 && value < maxVal )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	662 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	663 if ( seenEscape )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	664 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	665 value++ = line;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	666 seenEscape = FALSE;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	667 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	668 else
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	669 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	670 if ( *line == '\\' )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	671 seenEscape = TRUE;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	672 else
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	673 value++ = line;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	674 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	675 line++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	676 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	677
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	678 if ( *line == quoteChar )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	679 line++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	680 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	681 else
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	682 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	683 while ( line != '\0' && ! isspace( line ) && value < maxVal )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	684 value++ = line++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	685 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	686 *value = '\0';
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	687 return line;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	688 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	689
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	690 /* very simple date parser.
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	691 * examples:
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	692 * now+
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	693 */
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	694 static Bool
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	695 get_simpledate( time_t timeoffsetp, FilterRuleDateEnumType vartimep, const char *val)
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	696 {
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	697 float timef;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	698
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	699 if ( ! strncasecmp( val, "invalid", 7 ) )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	700 {
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	701 *vartimep = INVALID;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	702 return TRUE;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	703 }
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	704 else if ( ! strncasecmp( val, "now", 3 ) )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	705 {
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	706 val += 3;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	707 *vartimep = NOW;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	708 }
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	709 else if ( ! strncasecmp( val, "lastupdate", 10 ) )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	710 {
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	711 val += 10;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	712 *vartimep = LASTUPDATE;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	713 }
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	714 else
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	715 {
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	716 *vartimep = FIXED;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	717 *timeoffsetp = Utl_parseNewsDate( val );
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	718 if ( *timeoffsetp == (time_t) -1 )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	719 return FALSE;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	720 else
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	721 return TRUE;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	722 }
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	723 /* NOW, LASTUPDATE +/- number of days. */
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	724 timef = atof( val ) * 86400.0 ; /* 24 * 60 * 60 == 86400 */
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	725
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	726 /* let's assume more than 10 years of timeoffset are a mistake. */
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	727 if ( timef > 31536000.0 \|\| timef < -31536000.0 )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	728 return FALSE;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	729 *timeoffsetp = (time_t) timef;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	730 /* Todo: check if any garbage follows. */
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	731 return TRUE;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	732 }
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	733
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	734 static void
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	735 getFilter( const char *line )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	736 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	737 Str ruleBuf, value;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	738 const char *l;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	739 char p, ruleName;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	740 Filter *f;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	741 FilterRule rule;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	742 Bool seenAction;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	743
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	744 f = new_Filter();
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	745
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	746 /* Skip "filter" */
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	747 l = Utl_restOfLn( line, 1 );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	748 seenAction = FALSE;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	749
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	750 for(;;)
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	751 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	752 while ( l != '\0' && isspace( l ) )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	753 l++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	754
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	755 if ( *l == '\0' )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	756 break;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	757
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	758 /* Get the rule title */
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	759 p = ruleBuf;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	760 while ( l != '\0' && l != '=' && l != '<' && l != '>' )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	761 p++ = l++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	762 *p = '\0';
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	763 ruleName = Utl_stripWhiteSpace( ruleBuf );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	764 Utl_toLower( ruleName );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	765
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	766 if ( *ruleName == '\0' )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	767 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	768
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	769 /* Do we know this rule? */
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	770 if ( strcmp( ruleName, "group" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	771 rule.type = RULE_NEWSGROUP;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	772 else if ( strcmp( ruleName, "subject" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	773 rule.type = RULE_SUBJECT;
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	774 else if ( strcmp( ruleName, "reference" ) == 0 )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	775 rule.type = RULE_REFERENCE;
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	776 else if ( strcmp( ruleName, "from" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	777 rule.type = RULE_FROM;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	778 else if ( strcmp( ruleName, "msgid" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	779 rule.type = RULE_MSGID;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	780 else if ( strcmp( ruleName, "bytes" ) == 0 )
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	781 rule.type = RULE_BYTES_EQ;
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	782 else if ( strcmp( ruleName, "lines" ) == 0 )
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	783 rule.type = RULE_LINES_EQ;
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	784 else if ( strcmp( ruleName, "refs" ) == 0 )
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	785 rule.type = RULE_NOREFS_EQ;
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	786 else if ( strcmp( ruleName, "xposts" ) == 0 )
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	787 rule.type = RULE_XPOSTS_EQ;
212 21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	788 else if ( strcmp( ruleName, "post-status" ) == 0 )
21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	789 rule.type = RULE_POST_STATUS;
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	790 else if ( strcmp( ruleName, "date" ) == 0 )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	791 rule.type = RULE_DATE_EQ;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	792 /* date<lastupdate-12 equals older=lastupdate-12
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	793 * date>now+1.5 equals newer=now+1.5
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	794 * date=now equals older=now+1 AND newer=now-1
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	795 * Stupid people like Mirko keep making mistakes
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	796 * if they're forced using date< or date>.
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	797 */
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	798 else if ( strcmp( ruleName, "older" ) == 0 )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	799 rule.type = RULE_DATE_LT;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	800 else if ( strcmp( ruleName, "newer" ) == 0 )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	801 rule.type = RULE_DATE_GT;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	802
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	803 else if ( strcmp( ruleName, "action" ) != 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	804 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	805
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	806 if ( rule.type == RULE_BYTES_EQ \|\|
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	807 rule.type == RULE_LINES_EQ \|\|
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	808 rule.type == RULE_NOREFS_EQ \|\|
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	809 rule.type == RULE_XPOSTS_EQ \|\|
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	810 rule.type == RULE_DATE_EQ )
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	811 {
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	812 if ( *l == '<' )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	813 rule.type--;
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	814 else if ( *l == '>' )
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	815 rule.type++;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	816 else if ( *l != '=' )
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	817 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	818 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	819 else if ( *l != '=' )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	820 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	821
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	822 /* Skip past '=' (or '>' or '<') */
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	823 l++;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	824
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	825 /* OK, we now have a valid rule. What value? */
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	826 l = getToken( l, value );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	827 if ( l == NULL )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	828 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	829
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	830 if ( strcmp( ruleName, "action" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	831 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	832 if ( seenAction )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	833 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	834
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	835 Utl_toLower( value );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	836 if ( strcmp( value, "full" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	837 f->action = FILTER_FULL;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	838 else if ( strcmp( value, "over" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	839 f->action = FILTER_XOVER;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	840 else if ( strcmp( value, "thread" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	841 f->action = FILTER_THREAD;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	842 else if ( strcmp( value, "discard" ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	843 f->action = FILTER_DISCARD;
194 a4e9a20e50e5 [svn] * docs/noffle.conf.5,src/configfile.c,src/filter.h,src/filter.c: bears parents: 190 diff changeset	844 else if ( strcmp( value, "default" ) == 0 )
a4e9a20e50e5 [svn] * docs/noffle.conf.5,src/configfile.c,src/filter.h,src/filter.c: bears parents: 190 diff changeset	845 f->action = FILTER_DEFAULT;
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	846 seenAction = TRUE;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	847 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	848 else if ( rule.type == RULE_NEWSGROUP )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	849 Utl_allocAndCpy( &rule.data.grp, value );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	850 else if ( rule.type >= RULE_SUBJECT && rule.type <= RULE_MSGID )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	851 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	852 if ( regcomp( &rule.data.regex, value, REG_EXTENDED ) != 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	853 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	854 }
212 21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	855 else if (rule.type == RULE_POST_STATUS )
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	856 {
212 21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	857 if ( ( strcmp( value, "yes" ) == 0 ) \|\| \
21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	858 ( strcmp( value, "no" ) == 0 ) \|\| \
21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	859 ( strncmp( value, "mod", 3 ) == 0 ) )
21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	860 /* no need to type out "moderated" */
21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	861 rule.data.postAllow = value[0]; /* 'y','n' or 'm' */
21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	862 else
21200ce10e68 [svn] filter post-status=mod\|yes\|no. mirkol parents: 197 diff changeset	863 goto synErr;
249 0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	864 }
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	865 else if ( rule.type == RULE_DATE_LT \|\|
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	866 rule.type == RULE_DATE_EQ \|\|
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	867 rule.type == RULE_DATE_GT )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	868 {
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	869 if ( !get_simpledate( &rule.data.reftime.timeoffset, &rule.data.reftime.vartime, value ) )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	870 goto synErr;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	871 if ( rule.type != RULE_DATE_EQ &&
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	872 rule.data.reftime.vartime == INVALID )
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	873 goto synErr;
0340b9c17edc [svn] * empty log message * mirkol parents: 222 diff changeset	874 }
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	875 else
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	876 {
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	877 char * endVal;
134 7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	878 int suffix;
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	879
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	880 rule.data.amount = strtoul( value, &endVal, 0 );
134 7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	881 suffix = tolower( *endVal );
7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	882 if ( suffix == 'k' \|\| suffix == 'm' )
7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	883 {
7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	884 rule.data.amount *= 1024;
7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	885 if ( suffix == 'm' )
7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	886 rule.data.amount *= 1024;
7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	887 endVal++;
7dfbb1c20a81 [svn] k and m suffices on filter numbers bears parents: 128 diff changeset	888 }
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	889 if ( endVal != '\0' && ! isspace( endVal ) )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	890 goto synErr;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	891 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	892
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	893 if ( strcmp( ruleName, "action" ) != 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	894 {
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	895 Log_dbg( LOG_DBG_CONFIG,
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	896 "Adding rule type %d value %s",
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	897 rule.type, value );
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	898 Flt_addRule( f, rule );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	899 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	900 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	901
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	902 Log_dbg( LOG_DBG_CONFIG, "Adding filter, action %d", f->action );
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	903 Flt_addFilter( f );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	904 return;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	905
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	906 synErr:
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	907 logSyntaxErr( line );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	908 return;
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	909 }
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	910
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	911 void
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	912 Cfg_read( void )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	913 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	914 char *p;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	915 FILE *f;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	916 Str file, line, lowerLine, name, s;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	917
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	918 Utl_cpyStr( file, CONFIGFILE );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	919 if ( ! ( f = fopen( file, "r" ) ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	920 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	921 Log_err( "Cannot read %s", file );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	922 return;
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	923 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	924 while ( fgets( line, MAXCHAR, f ) )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	925 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	926 p = Utl_stripWhiteSpace( line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	927 Utl_stripComment( p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	928 Utl_cpyStr( lowerLine, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	929 Utl_toLower( lowerLine );
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	930 p = lowerLine;
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	931 if ( *p == '\0' )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	932 continue;
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	933 if ( sscanf( p, MAXCHAR_FMT, name ) != 1 )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	934 Log_err( "Syntax error in %s: %s", file, line );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	935 else if ( strcmp( "max-fetch", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	936 getInt( &config.maxFetch, 0, INT_MAX, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	937 else if ( strcmp( "auto-unsubscribe-days", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	938 getInt( &config.autoUnsubscribe, -1, INT_MAX, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	939 else if ( strcmp( "thread-follow-time", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	940 getInt( &config.threadFollowTime, 0, INT_MAX, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	941 else if ( strcmp( "connect-timeout", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	942 getInt( &config.connectTimeout, 0, INT_MAX, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	943 else if ( strcmp( "default-expire", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	944 getInt( &config.defaultExpire, 0, INT_MAX, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	945 else if ( strcmp( "auto-subscribe", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	946 getBool( &config.autoSubscribe, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	947 else if ( strcmp( "auto-unsubscribe", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	948 getBool( &config.autoUnsubscribe, p );
82 1eb0cdd17c76 [svn] info-always-unread config/doc/implementation bears parents: 54 diff changeset	949 else if ( strcmp( "info-always-unread", name ) == 0 )
1eb0cdd17c76 [svn] info-always-unread config/doc/implementation bears parents: 54 diff changeset	950 getBool( &config.infoAlways, p );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	951 else if ( strcmp( "replace-messageid", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	952 getBool( &config.replaceMsgId, p );
195 76460d98b2fb [svn] * noffle.conf.example,docs/noffle.conf.5,src/configfile.h,src/configfile.c, bears parents: 194 diff changeset	953 else if ( strcmp( "hostname", name ) == 0 )
76460d98b2fb [svn] * noffle.conf.example,docs/noffle.conf.5,src/configfile.h,src/configfile.c, bears parents: 194 diff changeset	954 /* use line, do not change to lowercase */
76460d98b2fb [svn] * noffle.conf.example,docs/noffle.conf.5,src/configfile.h,src/configfile.c, bears parents: 194 diff changeset	955 getStr( config.hostnameMsgId, line );
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	956 else if ( strcmp( "post-locally", name ) == 0 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	957 getBool( &config.postLocal, p );
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	958 else if ( strcmp( "authenticate-client", name ) == 0 )
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	959 getBool( &config.clientAuth, p );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	960 else if ( strcmp( "default-auto-subscribe-mode", name ) == 0 )
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	961 {
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	962 getStr( s, p );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	963 if ( ! isValidAutoSubscribeMode( s ) )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	964 {
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	965 logSyntaxErr( line );
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	966 return;
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	967 }
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	968 else
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	969 Utl_cpyStr( config.defaultAutoSubscribeMode, s );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	970 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	971 else if ( strcmp( "mail-to", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	972 getStr( config.mailTo, p );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	973 else if ( strcmp( "expire", name ) == 0 )
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	974 getExpire( p );
104 402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	975 else if ( strcmp( "auto-subscribe-mode", name ) == 0 )
402300614185 [svn] Remove expire enum, add Cfg_expire(grp). Rename Cfg_autoSubscribeMode() bears parents: 88 diff changeset	976 getAutoSubscribeMode( p );
185 fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	977 else if ( strcmp( "log-debug", name ) == 0 )
fed1334d766b [svn] * src/client.c: Change variable only used on constant to 'const'. bears parents: 150 diff changeset	978 getDebugMask( p );
88 1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	979 else if ( strcmp( "getgroups", name ) == 0 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	980 getGroups( p, TRUE );
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	981 else if ( strcmp( "omitgroups", name ) == 0 )
1fcdced0246e [svn] Move posting code to post.c, add command line posting bears parents: 82 diff changeset	982 getGroups( p, FALSE );
150 1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	983 else if ( strcmp( "path-header", name ) == 0 )
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	984 getStr( config.pathHeader, p );
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	985 else if ( strcmp( "from-domain", name ) == 0 )
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	986 getStr( config.fromDomain, p );
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	987 /* The following need line because they may have uppercase data */
150 1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	988 else if ( strcmp( "organization", name ) == 0 )
1c7303c71f66 [svn] * src/protocol.c: Fix bug in Prt_getLn if we should read a line bears parents: 134 diff changeset	989 getText( config.organization, line );
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	990 else if ( strcmp( "noffle-user", name ) == 0 )
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	991 getText( config.noffleUser, line );
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	992 else if ( strcmp( "noffle-group", name ) == 0 )
01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	993 getText( config.noffleUser, line );
128 8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	994 else if ( strcmp( "server", name ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	995 getServ( line );
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	996 else if ( strcmp( "filter", name ) == 0 )
8897b7e3b108 [svn] Add article filtering bears parents: 111 diff changeset	997 getFilter( line );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	998 else
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	999 Log_err( "Unknown config option: %s", name );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1000 }
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1001 fclose( f );
2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1002 if ( ! config.numServ )
287 01755687c565 [svn] * src/configfile.c: Change snprintf() to Utl_cpyStr(); bears parents: 273 diff changeset	1003 Log_fatal( "Config file contains no server" );
43 2842f50feb55 [svn] * client.c, client.h, common.h, config.c, config.h, content.c, content.h, uh1763 parents: diff changeset	1004 }

Mercurial > noffle

annotate src/configfile.c @ 288:c02c4eb95f95 noffle