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

Diff Legend

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