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

Diff Legend

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