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.1 by elmex, Sun Aug 13 17:16:00 2006 UTC vs.
Revision 1.26 by root, Tue Mar 6 14:01:10 2007 UTC

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

Diff Legend

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