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.5 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.11 by root, Wed Sep 13 02:05:18 2006 UTC

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

Diff Legend

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