ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/init.C
(Generate patch)

Comparing deliantra/server/common/init.C (file contents):
Revision 1.4 by root, Sun Sep 3 07:57:54 2006 UTC vs.
Revision 1.10 by root, Sun Sep 10 16:00:23 2006 UTC

1
1/* 2/*
2 * static char *rcsid_init_c = 3 * static char *rcsid_init_c =
3 * "$Id: init.C,v 1.4 2006/09/03 07:57:54 root Exp $"; 4 * "$Id: init.C,v 1.10 2006/09/10 16:00:23 root Exp $";
4 */ 5 */
5 6
6/* 7/*
7 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
8 9
… …
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 26
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 27 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/ 28*/
28 29
29#define EXTERN 30#define EXTERN // horrible hack
30#define INIT_C 31
31#include <global.h> 32#include <global.h>
32#include <object.h> 33#include <object.h>
33 34
35extern const char *const attacktype_desc[NROFATTACKS] = {
36#define def(uc, lc, name, plus, change) # name,
37#include "attackinc.h"
38#undef def
39};
40
41extern const keyword resist_save[NROFATTACKS] = {
42#define def(uc, lc, name, plus, change) KW_resist_ ## lc,
43#include "attackinc.h"
44#undef def
45};
46
47extern const char *const resist_plus[NROFATTACKS] = {
48#define def(uc, lc, name, plus, change) # plus,
49#include "attackinc.h"
50#undef def
51};
52
53extern const char *const change_resist_msg[NROFATTACKS] = {
54#define def(uc, lc, name, plus, change) # change,
55#include "attackinc.h"
56#undef def
57};
58
59int resist_table[NROFATTACKS] = {
60#define def(uc, lc, name, plus, change) ATNR_ ## uc,
61#include "attackinc.h"
62#undef def
63};
64
34/* You unforunately need to looking in include/global.h to see what these 65/* You unforunately need to looking in include/global.h to see what these
35 * correspond to. 66 * correspond to.
36 */ 67 */
37struct Settings settings = { 68struct Settings settings = {
38LOGFILE, /* Logfile */ 69 LOGFILE, /* Logfile */
39CSPORT, /* Client/server port */ 70 CSPORT, /* Client/server port */
40 71
41/* Debug level */ 72/* Debug level */
42#ifdef DEBUG 73#ifdef DEBUG
43 llevDebug, 74 llevDebug,
44#else 75#else
45 llevInfo, 76 llevInfo,
46#endif 77#endif
47 78
480, NULL, 0, /* dumpvalues, dumparg, daemonmode */ 79 0, NULL, 0, /* dumpvalues, dumparg, daemonmode */
490, /* argc */ 80 0, /* argc */
50NULL, /* argv */ 81 NULL, /* argv */
51CONFDIR, 82 CONFDIR,
52DATADIR, 83 DATADIR,
53LOCALDIR, 84 LOCALDIR,
54PLAYERDIR, MAPDIR, ARCHETYPES,REGIONS,TREASURES, 85 PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
55UNIQUE_DIR, TEMPLATE_DIR, 86 UNIQUE_DIR, TEMPLATE_DIR,
56TMPDIR, 87 TMPDIR,
57STAT_LOSS_ON_DEATH, 88 STAT_LOSS_ON_DEATH,
58PK_LUCK_PENALTY, 89 PK_LUCK_PENALTY,
59PERMANENT_EXPERIENCE_RATIO, 90 PERMANENT_EXPERIENCE_RATIO,
60DEATH_PENALTY_RATIO, 91 DEATH_PENALTY_RATIO,
61DEATH_PENALTY_LEVEL, 92 DEATH_PENALTY_LEVEL,
62BALANCED_STAT_LOSS, 93 BALANCED_STAT_LOSS,
63NOT_PERMADETH, 94 NOT_PERMADETH,
64SIMPLE_EXP, 95 SIMPLE_EXP,
65RESET_LOCATION_TIME, 96 RESET_LOCATION_TIME,
66SET_TITLE, 97 SET_TITLE,
67RESURRECTION, 98 RESURRECTION,
68SEARCH_ITEMS, 99 SEARCH_ITEMS,
69SPELL_ENCUMBRANCE, 100 SPELL_ENCUMBRANCE,
70SPELL_FAILURE_EFFECTS, 101 SPELL_FAILURE_EFFECTS,
71CASTING_TIME, 102 CASTING_TIME,
72REAL_WIZ, 103 REAL_WIZ,
73RECYCLE_TMP_MAPS, 104 RECYCLE_TMP_MAPS,
74EXPLORE_MODE, 105 EXPLORE_MODE,
75SPELLPOINT_LEVEL_DEPEND, 106 SPELLPOINT_LEVEL_DEPEND,
76SET_FRIENDLY_FIRE, 107 SET_FRIENDLY_FIRE,
77"", /* Who format specifier */ 108 "", /* Who format specifier */
78"", /* who wiz format specifier */ 109 "", /* who wiz format specifier */
79MOTD, 110 MOTD,
80"rules", 111 "rules",
81"news", 112 "news",
82"", /* DM_MAIL */ 113 "", /* DM_MAIL */
830, /* This and the next 3 values are metaserver values */ 114 0, /* This and the next 3 values are metaserver values */
84"", 115 "",
85"", 116 "",
860, 117 0,
87"", 118 "",
880,0,0,0,0,0,0,0, /* worldmap settings*/ 119 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
89EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 120 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
900, 121 0,
911.0, 122 1.0,
123
92/* Armor enchantment stuff */ 124/* Armor enchantment stuff */
93ARMOR_MAX_ENCHANT, 125 ARMOR_MAX_ENCHANT,
94ARMOR_WEIGHT_REDUCTION, 126 ARMOR_WEIGHT_REDUCTION,
95ARMOR_WEIGHT_LINEAR, 127 ARMOR_WEIGHT_LINEAR,
96ARMOR_SPEED_IMPROVEMENT, 128 ARMOR_SPEED_IMPROVEMENT,
97ARMOR_SPEED_LINEAR, 129 ARMOR_SPEED_LINEAR,
981, /* no_player_stealing */ 130 1, /* no_player_stealing */
991, /* create_home_portals */ 131 1, /* create_home_portals */
100}; 132};
101 133
102/* perhaps not the best place for this, but needs to be 134/* perhaps not the best place for this, but needs to be
103 * in some file in the common area so that standalone 135 * in some file in the common area so that standalone
104 * programs, like the random map generator, can be built. 136 * programs, like the random map generator, can be built.
105 */ 137 */
106const char* const spellpathnames[NRSPELLPATHS] = { 138const char *const spellpathnames[NRSPELLPATHS] = {
107 "Protection", 139 "Protection",
108 "Fire", 140 "Fire",
109 "Frost", 141 "Frost",
110 "Electricity", 142 "Electricity",
111 "Missiles", 143 "Missiles",
112 "Self", 144 "Self",
113 "Summoning", 145 "Summoning",
114 "Abjuration", 146 "Abjuration",
115 "Restoration", 147 "Restoration",
116 "Detonation", 148 "Detonation",
117 "Mind", 149 "Mind",
118 "Creation", 150 "Creation",
119 "Teleportation", 151 "Teleportation",
120 "Information", 152 "Information",
121 "Transmutation", 153 "Transmutation",
122 "Transferrence", 154 "Transferrence",
123 "Turning", 155 "Turning",
124 "Wounding", 156 "Wounding",
125 "Death", 157 "Death",
126 "Light" 158 "Light"
127}; 159};
128 160
129 161
130/* This loads the emergency map information from a 162/* This loads the emergency map information from a
131 * .emergency file in the map directory. Doing this makes 163 * .emergency file in the map directory. Doing this makes
132 * it easier to switch between map distributions (don't need 164 * it easier to switch between map distributions (don't need
133 * to recompile. Note that there is no reason I see that 165 * to recompile. Note that there is no reason I see that
134 * this could not be re-loaded during play, but it seems 166 * this could not be re-loaded during play, but it seems
135 * like there should be little reason to do that. 167 * like there should be little reason to do that.
136 */ 168 */
169static void
137static void init_emergency_mappath(void) 170init_emergency_mappath (void)
138{ 171{
139 char filename[MAX_BUF], tmpbuf[MAX_BUF]; 172 char filename[MAX_BUF], tmpbuf[MAX_BUF];
140 FILE *fp; 173 FILE *fp;
141 int online=0; 174 int online = 0;
142 175
143 /* If this file doesn't exist, not a big deal */ 176 /* If this file doesn't exist, not a big deal */
144 sprintf(filename,"%s/%s/.emergency",settings.datadir, settings.mapdir); 177 sprintf (filename, "%s/%s/.emergency", settings.datadir, settings.mapdir);
145 if ((fp = fopen(filename, "r"))!=NULL) { 178 if ((fp = fopen (filename, "r")) != NULL)
179 {
146 while (fgets(tmpbuf, MAX_BUF-1, fp)) { 180 while (fgets (tmpbuf, MAX_BUF - 1, fp))
147 if (tmpbuf[0] == '#') continue; /* ignore comments */ 181 {
182 if (tmpbuf[0] == '#')
183 continue; /* ignore comments */
184
185 if (online == 0)
148 186 {
149 if (online == 0) {
150 tmpbuf[strlen(tmpbuf)-1] = 0; /* kill newline */ 187 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
151 settings.emergency_mapname = strdup_local(tmpbuf); 188 settings.emergency_mapname = strdup_local (tmpbuf);
152 } 189 }
153 else if (online == 1) { 190 else if (online == 1)
191 {
154 settings.emergency_x = atoi(tmpbuf); 192 settings.emergency_x = atoi (tmpbuf);
155 } 193 }
156 194
157 else if (online == 2) { 195 else if (online == 2)
196 {
158 settings.emergency_y = atoi(tmpbuf); 197 settings.emergency_y = atoi (tmpbuf);
159 } 198 }
160 online++; 199 online++;
161 if (online>2) break; 200 if (online > 2)
201 break;
162 } 202 }
163 fclose(fp); 203 fclose (fp);
164 if (online<=2) 204 if (online <= 2)
165 LOG(llevError,"Online read partial data from %s\n", filename); 205 LOG (llevError, "Online read partial data from %s\n", filename);
166 LOG(llevDebug,"Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname, 206 LOG (llevDebug, "Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname, settings.emergency_x, settings.emergency_y);
167 settings.emergency_x, settings.emergency_y);
168 }
169}
170 207 }
208}
209
171 210
172/* 211/*
173 * It is vital that init_library() is called by any functions 212 * It is vital that init_library() is called by any functions
174 * using this library. 213 * using this library.
175 * If you want to lessen the size of the program using the library, 214 * If you want to lessen the size of the program using the library,
176 * you can replace the call to init_library() with init_globals() and 215 * you can replace the call to init_library() with init_globals() and
177 * init_function_pointers(). Good idea to also call init_vars and 216 * init_function_pointers(). Good idea to also call init_vars and
178 * init_hash_table if you are doing any object loading. 217 * init_hash_table if you are doing any object loading.
179 */ 218 */
180 219
220void
181void init_library(void) { 221init_library (void)
222{
182 init_environ(); 223 init_environ ();
183 init_globals(); 224 init_globals ();
184 init_objects(); 225 init_objects ();
185 init_vars(); 226 init_vars ();
186 init_block(); 227 init_block ();
187 ReadBmapNames (); 228 ReadBmapNames ();
188 ReadSmooth(); 229 ReadSmooth ();
189 init_anim(); /* Must be after we read in the bitmaps */ 230 init_anim (); /* Must be after we read in the bitmaps */
190 init_archetypes(); /* Reads all archetypes from file */ 231 init_archetypes (); /* Reads all archetypes from file */
191 init_dynamic (); 232 init_dynamic ();
192 init_attackmess(); 233 init_attackmess ();
193 init_clocks(); 234 init_clocks ();
194 init_emergency_mappath(); 235 init_emergency_mappath ();
195 init_experience(); 236 init_experience ();
196} 237}
197 238
198 239
199/* init_environ initializes values from the environmental variables. 240/* init_environ initializes values from the environmental variables.
200 * it needs to be called very early, since command line options should 241 * it needs to be called very early, since command line options should
201 * overwrite these if specified. 242 * overwrite these if specified.
202 */ 243 */
244void
203void init_environ(void) { 245init_environ (void)
246{
204 char *cp; 247 char *cp;
205 248
206 cp=getenv("CROSSFIRE_LIBDIR"); 249 cp = getenv ("CROSSFIRE_LIBDIR");
250 if (cp)
207 if (cp) settings.datadir=cp; 251 settings.datadir = cp;
208 cp=getenv("CROSSFIRE_LOCALDIR"); 252 cp = getenv ("CROSSFIRE_LOCALDIR");
253 if (cp)
209 if (cp) settings.localdir=cp; 254 settings.localdir = cp;
210 cp=getenv("CROSSFIRE_PLAYERDIR"); 255 cp = getenv ("CROSSFIRE_PLAYERDIR");
256 if (cp)
211 if (cp) settings.playerdir=cp; 257 settings.playerdir = cp;
212 cp=getenv("CROSSFIRE_MAPDIR"); 258 cp = getenv ("CROSSFIRE_MAPDIR");
259 if (cp)
213 if (cp) settings.mapdir=cp; 260 settings.mapdir = cp;
214 cp=getenv("CROSSFIRE_ARCHETYPES"); 261 cp = getenv ("CROSSFIRE_ARCHETYPES");
262 if (cp)
215 if (cp) settings.archetypes=cp; 263 settings.archetypes = cp;
216 cp=getenv("CROSSFIRE_TREASURES"); 264 cp = getenv ("CROSSFIRE_TREASURES");
265 if (cp)
217 if (cp) settings.treasures=cp; 266 settings.treasures = cp;
218 cp=getenv("CROSSFIRE_UNIQUEDIR"); 267 cp = getenv ("CROSSFIRE_UNIQUEDIR");
268 if (cp)
219 if (cp) settings.uniquedir=cp; 269 settings.uniquedir = cp;
220 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 270 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
271 if (cp)
221 if (cp) settings.templatedir=cp; 272 settings.templatedir = cp;
222 cp=getenv("CROSSFIRE_TMPDIR"); 273 cp = getenv ("CROSSFIRE_TMPDIR");
274 if (cp)
223 if (cp) settings.tmpdir=cp; 275 settings.tmpdir = cp;
224} 276}
225 277
226 278
227/* 279/*
228 * Initialises all global variables. 280 * Initialises all global variables.
229 * Might use environment-variables as default for some of them. 281 * Might use environment-variables as default for some of them.
230 */ 282 */
231 283
284void
232void init_globals(void) { 285init_globals (void)
286{
233 if (settings.logfilename[0] == 0) { 287 if (settings.logfilename[0] == 0)
288 {
234 logfile = stderr; 289 logfile = stderr;
235 } 290 }
236 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) { 291 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
292 {
237 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n", 293 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
238 settings.logfilename);
239 logfile = stderr; 294 logfile = stderr;
295 }
296 else
240 } 297 {
241 else {
242 setvbuf(logfile, NULL, _IOLBF, 0); 298 setvbuf (logfile, NULL, _IOLBF, 0);
243 } 299 }
244 exiting = 0; 300 exiting = 0;
245 first_player=NULL; 301 first_player = NULL;
246 first_friendly_object=NULL; 302 first_friendly_object = NULL;
247 first_map=NULL; 303 first_map = NULL;
248 first_treasurelist=NULL; 304 first_treasurelist = NULL;
249 first_artifactlist=NULL; 305 first_artifactlist = NULL;
250 first_archetype=NULL; 306 first_archetype = NULL;
251 *first_map_ext_path=0; 307 *first_map_ext_path = 0;
252 warn_archetypes=0; 308 warn_archetypes = 0;
253 nroftreasures = 0; 309 nroftreasures = 0;
254 nrofartifacts = 0; 310 nrofartifacts = 0;
255 nrofallowedstr=0; 311 nrofallowedstr = 0;
256 ring_arch = NULL; 312 ring_arch = NULL;
257 amulet_arch = NULL; 313 amulet_arch = NULL;
258 staff_arch = NULL; 314 staff_arch = NULL;
259 trying_emergency_save = 0; 315 trying_emergency_save = 0;
260 num_animations=0; 316 num_animations = 0;
261 animations_allocated=0; 317 animations_allocated = 0;
262 init_defaults(); 318 init_defaults ();
263} 319}
264 320
265/* 321/*
266 * Sets up and initialises the linked list of free and used objects. 322 * Sets up and initialises the linked list of free and used objects.
267 * Allocates a certain chunk of objects and puts them on the free list. 323 * Allocates a certain chunk of objects and puts them on the free list.
268 * Called by init_library(); 324 * Called by init_library();
269 */ 325 */
270 326
327void
271void init_objects(void) { 328init_objects (void)
272 int i; 329{
273/* Initialize all objects: */ 330 /* Initialize all objects: */
274 objects=NULL; 331 objects = NULL;
275 active_objects = NULL; 332 active_objects = NULL;
276
277#ifdef MEMORY_DEBUG
278 free_objects=NULL;
279#else
280 free_objects=objarray;
281 objarray[0].prev=NULL,
282 objarray[0].next= &objarray[1],
283 SET_FLAG(&objarray[0], FLAG_REMOVED);
284 SET_FLAG(&objarray[0], FLAG_FREED);
285 for(i=1;i<STARTMAX-1;i++) {
286 objarray[i].next= &objarray[i+1];
287 objarray[i].prev= &objarray[i-1];
288 SET_FLAG(&objarray[i], FLAG_REMOVED);
289 SET_FLAG(&objarray[i], FLAG_FREED);
290 }
291 objarray[STARTMAX-1].next=NULL;
292 objarray[STARTMAX-1].prev= &objarray[STARTMAX-2];
293 SET_FLAG(&objarray[STARTMAX-1], FLAG_REMOVED);
294 SET_FLAG(&objarray[STARTMAX-1], FLAG_FREED);
295#endif
296} 333}
297 334
298/* 335/*
299 * Initialises global variables which can be changed by options. 336 * Initialises global variables which can be changed by options.
300 * Called by init_library(). 337 * Called by init_library().
301 */ 338 */
302 339
340void
303void init_defaults(void) { 341init_defaults (void)
342{
304 editor=0; 343 editor = 0;
305 nroferrors=0; 344 nroferrors = 0;
306} 345}
307 346
308 347
348void
309void init_dynamic (void) { 349init_dynamic (void)
350{
310 archetype *at = first_archetype; 351 archetype *at = first_archetype;
352
311 while (at) { 353 while (at)
354 {
312 if (at->clone.type == MAP) { 355 if (at->clone.type == MAP)
356 {
313 if (at->clone.race) { 357 if (at->clone.race)
358 {
314 strcpy (first_map_ext_path, at->clone.race); 359 strcpy (first_map_ext_path, at->clone.race);
315 } 360 }
316 if (EXIT_PATH (&at->clone)) { 361 if (EXIT_PATH (&at->clone))
362 {
317 strcpy (first_map_path, EXIT_PATH (&at->clone)); 363 strcpy (first_map_path, EXIT_PATH (&at->clone));
318 return; 364 return;
319 } 365 }
320 } 366 }
321 at = at->next; 367 at = at->next;
322 } 368 }
323 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n"); 369 LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n");
324 exit (-1); 370 exit (-1);
325} 371}
326 372
327unsigned long todtick; 373unsigned long todtick;
328 374
329/* 375/*
330 * Write out the current time to the file so time does not 376 * Write out the current time to the file so time does not
331 * reset every time the server reboots. 377 * reset every time the server reboots.
332 */ 378 */
333 379
380void
334void write_todclock(void) 381write_todclock (void)
335{ 382{
336 char filename[MAX_BUF]; 383 char filename[MAX_BUF];
337 FILE *fp; 384 FILE *fp;
338 385
339 sprintf(filename, "%s/clockdata", settings.localdir); 386 sprintf (filename, "%s/clockdata", settings.localdir);
340 if ((fp = fopen(filename, "w")) == NULL) { 387 if ((fp = fopen (filename, "w")) == NULL)
388 {
341 LOG(llevError, "Cannot open %s for writing\n", filename); 389 LOG (llevError, "Cannot open %s for writing\n", filename);
342 return; 390 return;
343 } 391 }
344 fprintf(fp, "%lu", todtick); 392 fprintf (fp, "%lu", todtick);
345 fclose(fp); 393 fclose (fp);
346} 394}
347 395
348/* 396/*
349 * Initializes the gametime and TOD counters 397 * Initializes the gametime and TOD counters
350 * Called by init_library(). 398 * Called by init_library().
351 */ 399 */
352 400
401void
353void init_clocks(void) 402init_clocks (void)
354{ 403{
355 char filename[MAX_BUF]; 404 char filename[MAX_BUF];
356 FILE *fp; 405 FILE *fp;
357 static int has_been_done=0; 406 static int has_been_done = 0;
358 407
359 if (has_been_done) 408 if (has_been_done)
360 return; 409 return;
361 else 410 else
362 has_been_done = 1; 411 has_been_done = 1;
363 412
364 sprintf(filename, "%s/clockdata", settings.localdir); 413 sprintf (filename, "%s/clockdata", settings.localdir);
365 LOG(llevDebug, "Reading clockdata from %s...", filename); 414 LOG (llevDebug, "Reading clockdata from %s...", filename);
366 if ((fp = fopen(filename, "r")) == NULL) { 415 if ((fp = fopen (filename, "r")) == NULL)
416 {
367 LOG(llevError, "Can't open %s.\n", filename); 417 LOG (llevError, "Can't open %s.\n", filename);
368 todtick = 0; 418 todtick = 0;
369 write_todclock(); 419 write_todclock ();
370 return; 420 return;
371 } 421 }
372 fscanf(fp, "%lu", &todtick); 422 fscanf (fp, "%lu", &todtick);
373 LOG(llevDebug, "todtick=%lu\n", todtick); 423 LOG (llevDebug, "todtick=%lu\n", todtick);
374 fclose(fp); 424 fclose (fp);
375} 425}
376 426
377/* 427/*
378 * Initializes the attack messages. 428 * Initializes the attack messages.
379 * Called by init_library(). 429 * Called by init_library().
380 */ 430 */
381 431
382//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 432//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
383 433
434void
384void init_attackmess(void){ 435init_attackmess (void)
436{
385 char buf[MAX_BUF]; 437 char buf[MAX_BUF];
386 char filename[MAX_BUF]; 438 char filename[MAX_BUF];
387 char *cp, *p; 439 char *cp, *p;
388 FILE *fp; 440 FILE *fp;
389 static int has_been_done=0; 441 static int has_been_done = 0;
390 int mess, level, comp; 442 int mess, level, comp;
391 int mode=0, total=0; 443 int mode = 0, total = 0;
392 444
393 if (has_been_done) 445 if (has_been_done)
394 return; 446 return;
395 else 447 else
396 has_been_done = 1; 448 has_been_done = 1;
397 449
398 sprintf(filename, "%s/attackmess", settings.datadir); 450 sprintf (filename, "%s/attackmess", settings.datadir);
399 LOG(llevDebug, "Reading attack messages from %s...", filename); 451 LOG (llevDebug, "Reading attack messages from %s...", filename);
400 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 452 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
453 {
401 LOG(llevError, "Can't open %s.\n", filename); 454 LOG (llevError, "Can't open %s.\n", filename);
402 return; 455 return;
403 } 456 }
404 457
405 level = 0; 458 level = 0;
406 while (fgets(buf, MAX_BUF, fp)!=NULL) { 459 while (fgets (buf, MAX_BUF, fp) != NULL)
407 if (*buf=='#') continue; 460 {
461 if (*buf == '#')
462 continue;
408 if((cp=strchr(buf,'\n'))!=NULL) 463 if ((cp = strchr (buf, '\n')) != NULL)
409 *cp='\0'; 464 *cp = '\0';
410 cp=buf; 465 cp = buf;
411 while(*cp==' ') /* Skip blanks */ 466 while (*cp == ' ') /* Skip blanks */
412 cp++; 467 cp++;
413 468
414 if (strncmp(cp, "TYPE:", 5)==0) { 469 if (strncmp (cp, "TYPE:", 5) == 0)
470 {
415 p = strtok(buf, ":"); 471 p = strtok (buf, ":");
416 p = strtok(NULL, ":"); 472 p = strtok (NULL, ":");
417 if (mode == 1) { 473 if (mode == 1)
474 {
418 attack_mess[mess][level].level = -1; 475 attack_mess[mess][level].level = -1;
419 attack_mess[mess][level].buf1 = NULL; 476 attack_mess[mess][level].buf1 = NULL;
420 attack_mess[mess][level].buf2 = NULL; 477 attack_mess[mess][level].buf2 = NULL;
421 attack_mess[mess][level].buf3 = NULL; 478 attack_mess[mess][level].buf3 = NULL;
422 } 479 }
423 level = 0; 480 level = 0;
424 mess = atoi(p); 481 mess = atoi (p);
425 mode = 1; 482 mode = 1;
426 continue; 483 continue;
427 } 484 }
428 if (mode==1) { 485 if (mode == 1)
486 {
429 p = strtok(buf, "="); 487 p = strtok (buf, "=");
430 attack_mess[mess][level].level = atoi(buf); 488 attack_mess[mess][level].level = atoi (buf);
431 p = strtok(NULL, "="); 489 p = strtok (NULL, "=");
432 if (p != NULL) 490 if (p != NULL)
433 attack_mess[mess][level].buf1 = strdup_local(p); 491 attack_mess[mess][level].buf1 = strdup_local (p);
434 else 492 else
435 attack_mess[mess][level].buf1 = strdup_local(""); 493 attack_mess[mess][level].buf1 = strdup_local ("");
436 mode = 2; 494 mode = 2;
437 continue; 495 continue;
438 } else if (mode==2) {
439 p = strtok(buf, "=");
440 attack_mess[mess][level].level = atoi(buf);
441 p = strtok(NULL, "=");
442 if (p != NULL)
443 attack_mess[mess][level].buf2 = strdup_local(p);
444 else
445 attack_mess[mess][level].buf2 = strdup_local("");
446 mode = 3;
447 continue;
448 } else if (mode==3) {
449 p = strtok(buf, "=");
450 attack_mess[mess][level].level = atoi(buf);
451 p = strtok(NULL, "=");
452 if (p != NULL)
453 attack_mess[mess][level].buf3 = strdup_local(p);
454 else
455 attack_mess[mess][level].buf3 = strdup_local("");
456 mode = 1;
457 level++;
458 total++;
459 continue;
460 } 496 }
497 else if (mode == 2)
498 {
499 p = strtok (buf, "=");
500 attack_mess[mess][level].level = atoi (buf);
501 p = strtok (NULL, "=");
502 if (p != NULL)
503 attack_mess[mess][level].buf2 = strdup_local (p);
504 else
505 attack_mess[mess][level].buf2 = strdup_local ("");
506 mode = 3;
507 continue;
508 }
509 else if (mode == 3)
510 {
511 p = strtok (buf, "=");
512 attack_mess[mess][level].level = atoi (buf);
513 p = strtok (NULL, "=");
514 if (p != NULL)
515 attack_mess[mess][level].buf3 = strdup_local (p);
516 else
517 attack_mess[mess][level].buf3 = strdup_local ("");
518 mode = 1;
519 level++;
520 total++;
521 continue;
522 }
461 } 523 }
462 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 524 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
463 close_and_delete(fp, comp); 525 close_and_delete (fp, comp);
464} 526}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines