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

Diff Legend

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