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.12 by root, Thu Sep 14 18:13:01 2006 UTC

1/*
2 * static char *rcsid_init_c =
3 * "$Id: init.C,v 1.4 2006/09/03 07:57:54 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();
185 init_vars(); 219 init_vars ();
186 init_block(); 220 init_block ();
187 ReadBmapNames (); 221 ReadBmapNames ();
188 ReadSmooth(); 222 ReadSmooth ();
189 init_anim(); /* Must be after we read in the bitmaps */ 223 init_anim (); /* Must be after we read in the bitmaps */
190 init_archetypes(); /* Reads all archetypes from file */ 224 init_archetypes (); /* Reads all archetypes from file */
191 init_dynamic (); 225 init_dynamic ();
192 init_attackmess(); 226 init_attackmess ();
193 init_clocks(); 227 init_clocks ();
194 init_emergency_mappath(); 228 init_emergency_mappath ();
195 init_experience(); 229 init_experience ();
196} 230}
197 231
198 232
199/* init_environ initializes values from the environmental variables. 233/* init_environ initializes values from the environmental variables.
200 * it needs to be called very early, since command line options should 234 * it needs to be called very early, since command line options should
201 * overwrite these if specified. 235 * overwrite these if specified.
202 */ 236 */
237void
203void init_environ(void) { 238init_environ (void)
239{
204 char *cp; 240 char *cp;
205 241
206 cp=getenv("CROSSFIRE_LIBDIR"); 242 cp = getenv ("CROSSFIRE_LIBDIR");
243 if (cp)
207 if (cp) settings.datadir=cp; 244 settings.datadir = cp;
208 cp=getenv("CROSSFIRE_LOCALDIR"); 245 cp = getenv ("CROSSFIRE_LOCALDIR");
246 if (cp)
209 if (cp) settings.localdir=cp; 247 settings.localdir = cp;
210 cp=getenv("CROSSFIRE_PLAYERDIR"); 248 cp = getenv ("CROSSFIRE_PLAYERDIR");
249 if (cp)
211 if (cp) settings.playerdir=cp; 250 settings.playerdir = cp;
212 cp=getenv("CROSSFIRE_MAPDIR"); 251 cp = getenv ("CROSSFIRE_MAPDIR");
252 if (cp)
213 if (cp) settings.mapdir=cp; 253 settings.mapdir = cp;
214 cp=getenv("CROSSFIRE_ARCHETYPES"); 254 cp = getenv ("CROSSFIRE_ARCHETYPES");
255 if (cp)
215 if (cp) settings.archetypes=cp; 256 settings.archetypes = cp;
216 cp=getenv("CROSSFIRE_TREASURES"); 257 cp = getenv ("CROSSFIRE_TREASURES");
258 if (cp)
217 if (cp) settings.treasures=cp; 259 settings.treasures = cp;
218 cp=getenv("CROSSFIRE_UNIQUEDIR"); 260 cp = getenv ("CROSSFIRE_UNIQUEDIR");
261 if (cp)
219 if (cp) settings.uniquedir=cp; 262 settings.uniquedir = cp;
220 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 263 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
264 if (cp)
221 if (cp) settings.templatedir=cp; 265 settings.templatedir = cp;
222 cp=getenv("CROSSFIRE_TMPDIR"); 266 cp = getenv ("CROSSFIRE_TMPDIR");
267 if (cp)
223 if (cp) settings.tmpdir=cp; 268 settings.tmpdir = cp;
224} 269}
225 270
226 271
227/* 272/*
228 * Initialises all global variables. 273 * Initialises all global variables.
229 * Might use environment-variables as default for some of them. 274 * Might use environment-variables as default for some of them.
230 */ 275 */
231 276
277void
232void init_globals(void) { 278init_globals (void)
279{
233 if (settings.logfilename[0] == 0) { 280 if (settings.logfilename[0] == 0)
281 logfile = stderr;
282 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
283 {
284 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
234 logfile = stderr; 285 logfile = stderr;
235 } 286 }
236 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) {
237 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n",
238 settings.logfilename);
239 logfile = stderr;
240 }
241 else { 287 else
242 setvbuf(logfile, NULL, _IOLBF, 0); 288 setvbuf (logfile, NULL, _IOLBF, 0);
243 }
244 exiting = 0;
245 first_player=NULL;
246 first_friendly_object=NULL;
247 first_map=NULL;
248 first_treasurelist=NULL;
249 first_artifactlist=NULL;
250 first_archetype=NULL;
251 *first_map_ext_path=0;
252 warn_archetypes=0;
253 nroftreasures = 0;
254 nrofartifacts = 0;
255 nrofallowedstr=0;
256 ring_arch = NULL;
257 amulet_arch = NULL;
258 staff_arch = NULL;
259 trying_emergency_save = 0;
260 num_animations=0;
261 animations_allocated=0;
262 init_defaults();
263} 289}
264 290
265/* 291void
266 * 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.
268 * Called by init_library();
269 */
270
271void init_objects(void) {
272 int i;
273/* Initialize all objects: */
274 objects=NULL;
275 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}
297
298/*
299 * Initialises global variables which can be changed by options.
300 * Called by init_library().
301 */
302
303void init_defaults(void) {
304 editor=0;
305 nroferrors=0;
306}
307
308
309void init_dynamic (void) { 292init_dynamic (void)
293{
310 archetype *at = first_archetype; 294 archetype *at = first_archetype;
295
311 while (at) { 296 while (at)
297 {
312 if (at->clone.type == MAP) { 298 if (at->clone.type == MAP)
299 {
313 if (at->clone.race) { 300 if (at->clone.race)
314 strcpy (first_map_ext_path, at->clone.race); 301 strcpy (first_map_ext_path, at->clone.race);
302
303 if (EXIT_PATH (&at->clone))
304 {
305 strcpy (first_map_path, EXIT_PATH (&at->clone));
306 return;
315 } 307 }
316 if (EXIT_PATH (&at->clone)) {
317 strcpy (first_map_path, EXIT_PATH (&at->clone));
318 return;
319 } 308 }
320 } 309
321 at = at->next; 310 at = at->next;
322 } 311 }
312
323 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n"); 313 LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n");
324 exit (-1); 314 exit (-1);
325} 315}
326 316
327unsigned long todtick; 317unsigned long todtick;
328 318
329/* 319/*
330 * Write out the current time to the file so time does not 320 * Write out the current time to the file so time does not
331 * reset every time the server reboots. 321 * reset every time the server reboots.
332 */ 322 */
333 323
324void
334void write_todclock(void) 325write_todclock (void)
335{ 326{
336 char filename[MAX_BUF]; 327 char filename[MAX_BUF];
337 FILE *fp; 328 FILE *fp;
338 329
339 sprintf(filename, "%s/clockdata", settings.localdir); 330 sprintf (filename, "%s/clockdata", settings.localdir);
340 if ((fp = fopen(filename, "w")) == NULL) { 331 if ((fp = fopen (filename, "w")) == NULL)
332 {
341 LOG(llevError, "Cannot open %s for writing\n", filename); 333 LOG (llevError, "Cannot open %s for writing\n", filename);
342 return; 334 return;
343 } 335 }
344 fprintf(fp, "%lu", todtick); 336 fprintf (fp, "%lu", todtick);
345 fclose(fp); 337 fclose (fp);
346} 338}
347 339
348/* 340/*
349 * Initializes the gametime and TOD counters 341 * Initializes the gametime and TOD counters
350 * Called by init_library(). 342 * Called by init_library().
351 */ 343 */
352 344
345void
353void init_clocks(void) 346init_clocks (void)
354{ 347{
355 char filename[MAX_BUF]; 348 char filename[MAX_BUF];
356 FILE *fp; 349 FILE *fp;
357 static int has_been_done=0; 350 static int has_been_done = 0;
358 351
359 if (has_been_done) 352 if (has_been_done)
360 return; 353 return;
361 else 354 else
362 has_been_done = 1; 355 has_been_done = 1;
363 356
364 sprintf(filename, "%s/clockdata", settings.localdir); 357 sprintf (filename, "%s/clockdata", settings.localdir);
365 LOG(llevDebug, "Reading clockdata from %s...", filename); 358 LOG (llevDebug, "Reading clockdata from %s...", filename);
366 if ((fp = fopen(filename, "r")) == NULL) { 359 if ((fp = fopen (filename, "r")) == NULL)
360 {
367 LOG(llevError, "Can't open %s.\n", filename); 361 LOG (llevError, "Can't open %s.\n", filename);
368 todtick = 0; 362 todtick = 0;
369 write_todclock(); 363 write_todclock ();
370 return; 364 return;
371 } 365 }
372 fscanf(fp, "%lu", &todtick); 366 fscanf (fp, "%lu", &todtick);
373 LOG(llevDebug, "todtick=%lu\n", todtick); 367 LOG (llevDebug, "todtick=%lu\n", todtick);
374 fclose(fp); 368 fclose (fp);
375} 369}
376 370
377/* 371/*
378 * Initializes the attack messages. 372 * Initializes the attack messages.
379 * Called by init_library(). 373 * Called by init_library().
380 */ 374 */
381 375
382//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 376//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
383 377
378void
384void init_attackmess(void){ 379init_attackmess (void)
380{
385 char buf[MAX_BUF]; 381 char buf[MAX_BUF];
386 char filename[MAX_BUF]; 382 char filename[MAX_BUF];
387 char *cp, *p; 383 char *cp, *p;
388 FILE *fp; 384 FILE *fp;
389 static int has_been_done=0; 385 static int has_been_done = 0;
390 int mess, level, comp; 386 int mess, level, comp;
391 int mode=0, total=0; 387 int mode = 0, total = 0;
392 388
393 if (has_been_done) 389 if (has_been_done)
394 return; 390 return;
395 else 391 else
396 has_been_done = 1; 392 has_been_done = 1;
397 393
398 sprintf(filename, "%s/attackmess", settings.datadir); 394 sprintf (filename, "%s/attackmess", settings.datadir);
399 LOG(llevDebug, "Reading attack messages from %s...", filename); 395 LOG (llevDebug, "Reading attack messages from %s...", filename);
400 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 396 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
397 {
401 LOG(llevError, "Can't open %s.\n", filename); 398 LOG (llevError, "Can't open %s.\n", filename);
402 return; 399 return;
403 } 400 }
404 401
405 level = 0; 402 level = 0;
406 while (fgets(buf, MAX_BUF, fp)!=NULL) { 403 while (fgets (buf, MAX_BUF, fp) != NULL)
407 if (*buf=='#') continue; 404 {
405 if (*buf == '#')
406 continue;
408 if((cp=strchr(buf,'\n'))!=NULL) 407 if ((cp = strchr (buf, '\n')) != NULL)
409 *cp='\0'; 408 *cp = '\0';
410 cp=buf; 409 cp = buf;
411 while(*cp==' ') /* Skip blanks */ 410 while (*cp == ' ') /* Skip blanks */
412 cp++; 411 cp++;
413 412
414 if (strncmp(cp, "TYPE:", 5)==0) { 413 if (strncmp (cp, "TYPE:", 5) == 0)
414 {
415 p = strtok(buf, ":"); 415 p = strtok (buf, ":");
416 p = strtok(NULL, ":"); 416 p = strtok (NULL, ":");
417 if (mode == 1) { 417 if (mode == 1)
418 {
418 attack_mess[mess][level].level = -1; 419 attack_mess[mess][level].level = -1;
419 attack_mess[mess][level].buf1 = NULL; 420 attack_mess[mess][level].buf1 = NULL;
420 attack_mess[mess][level].buf2 = NULL; 421 attack_mess[mess][level].buf2 = NULL;
421 attack_mess[mess][level].buf3 = NULL; 422 attack_mess[mess][level].buf3 = NULL;
422 } 423 }
423 level = 0; 424 level = 0;
424 mess = atoi(p); 425 mess = atoi (p);
425 mode = 1; 426 mode = 1;
426 continue; 427 continue;
428 }
429 if (mode == 1)
427 } 430 {
428 if (mode==1) {
429 p = strtok(buf, "="); 431 p = strtok (buf, "=");
430 attack_mess[mess][level].level = atoi(buf); 432 attack_mess[mess][level].level = atoi (buf);
431 p = strtok(NULL, "="); 433 p = strtok (NULL, "=");
432 if (p != NULL) 434 if (p != NULL)
433 attack_mess[mess][level].buf1 = strdup_local(p); 435 attack_mess[mess][level].buf1 = strdup_local (p);
434 else 436 else
435 attack_mess[mess][level].buf1 = strdup_local(""); 437 attack_mess[mess][level].buf1 = strdup_local ("");
436 mode = 2; 438 mode = 2;
437 continue; 439 continue;
440 }
438 } else if (mode==2) { 441 else if (mode == 2)
442 {
439 p = strtok(buf, "="); 443 p = strtok (buf, "=");
440 attack_mess[mess][level].level = atoi(buf); 444 attack_mess[mess][level].level = atoi (buf);
441 p = strtok(NULL, "="); 445 p = strtok (NULL, "=");
442 if (p != NULL) 446 if (p != NULL)
443 attack_mess[mess][level].buf2 = strdup_local(p); 447 attack_mess[mess][level].buf2 = strdup_local (p);
444 else 448 else
445 attack_mess[mess][level].buf2 = strdup_local(""); 449 attack_mess[mess][level].buf2 = strdup_local ("");
446 mode = 3; 450 mode = 3;
447 continue; 451 continue;
452 }
448 } else if (mode==3) { 453 else if (mode == 3)
454 {
449 p = strtok(buf, "="); 455 p = strtok (buf, "=");
450 attack_mess[mess][level].level = atoi(buf); 456 attack_mess[mess][level].level = atoi (buf);
451 p = strtok(NULL, "="); 457 p = strtok (NULL, "=");
452 if (p != NULL) 458 if (p != NULL)
453 attack_mess[mess][level].buf3 = strdup_local(p); 459 attack_mess[mess][level].buf3 = strdup_local (p);
454 else 460 else
455 attack_mess[mess][level].buf3 = strdup_local(""); 461 attack_mess[mess][level].buf3 = strdup_local ("");
456 mode = 1; 462 mode = 1;
457 level++; 463 level++;
458 total++; 464 total++;
459 continue; 465 continue;
460 } 466 }
461 } 467 }
462 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 468 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
463 close_and_delete(fp, comp); 469 close_and_delete (fp, comp);
464} 470}

Diff Legend

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