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.2 by root, Tue Aug 29 08:01:35 2006 UTC vs.
Revision 1.15 by root, Wed Dec 13 02:55:49 2006 UTC

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

Diff Legend

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