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.27 by root, Tue Mar 6 19:02:35 2007 UTC

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

Diff Legend

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