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.9 by root, Sat Sep 9 23:49:06 2006 UTC vs.
Revision 1.17 by root, Mon Dec 18 02:35:00 2006 UTC

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

Diff Legend

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