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.5 by root, Mon Sep 4 11:07:59 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.5 2006/09/04 11:07:59 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,
74EXPLORE_MODE, 92 EXPLORE_MODE,
75SPELLPOINT_LEVEL_DEPEND, 93 SPELLPOINT_LEVEL_DEPEND,
76SET_FRIENDLY_FIRE, 94 SET_FRIENDLY_FIRE,
77"", /* Who format specifier */
78"", /* who wiz format specifier */
79MOTD, 95 MOTD,
80"rules", 96 "rules",
81"news", 97 "news",
82"", /* DM_MAIL */ 98 "", /* 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*/ 99 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
89EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 100 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
900, 101 0,
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 140
129 141
130/* This loads the emergency map information from a 142/* This loads the emergency map information from a
131 * .emergency file in the map directory. Doing this makes 143 * .emergency file in the map directory. Doing this makes
132 * it easier to switch between map distributions (don't need 144 * it easier to switch between map distributions (don't need
133 * to recompile. Note that there is no reason I see that 145 * to recompile. Note that there is no reason I see that
134 * this could not be re-loaded during play, but it seems 146 * this could not be re-loaded during play, but it seems
135 * like there should be little reason to do that. 147 * like there should be little reason to do that.
136 */ 148 */
149static void
137static void init_emergency_mappath(void) 150init_emergency_mappath (void)
138{ 151{
139 char filename[MAX_BUF], tmpbuf[MAX_BUF]; 152 char filename[MAX_BUF], tmpbuf[MAX_BUF];
140 FILE *fp; 153 FILE *fp;
141 int online=0; 154 int online = 0;
142 155
143 /* If this file doesn't exist, not a big deal */ 156 /* If this file doesn't exist, not a big deal */
144 sprintf(filename,"%s/%s/.emergency",settings.datadir, settings.mapdir); 157 sprintf (filename, "%s/%s/.emergency", settings.datadir, settings.mapdir);
145 if ((fp = fopen(filename, "r"))!=NULL) { 158 if ((fp = fopen (filename, "r")) != NULL)
159 {
146 while (fgets(tmpbuf, MAX_BUF-1, fp)) { 160 while (fgets (tmpbuf, MAX_BUF - 1, fp))
147 if (tmpbuf[0] == '#') continue; /* ignore comments */ 161 {
162 if (tmpbuf[0] == '#')
163 continue; /* ignore comments */
164
165 if (online == 0)
148 166 {
149 if (online == 0) {
150 tmpbuf[strlen(tmpbuf)-1] = 0; /* kill newline */ 167 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
151 settings.emergency_mapname = strdup_local(tmpbuf); 168 settings.emergency_mapname = strdup (tmpbuf);
152 } 169 }
153 else if (online == 1) { 170 else if (online == 1)
171 {
154 settings.emergency_x = atoi(tmpbuf); 172 settings.emergency_x = atoi (tmpbuf);
155 } 173 }
156 174
157 else if (online == 2) { 175 else if (online == 2)
176 {
158 settings.emergency_y = atoi(tmpbuf); 177 settings.emergency_y = atoi (tmpbuf);
159 } 178 }
160 online++; 179 online++;
161 if (online>2) break; 180 if (online > 2)
181 break;
162 } 182 }
163 fclose(fp); 183 fclose (fp);
164 if (online<=2) 184 if (online <= 2)
165 LOG(llevError,"Online read partial data from %s\n", filename); 185 LOG (llevError, "Online read partial data from %s\n", filename);
166 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);
167 settings.emergency_x, settings.emergency_y);
168 }
169}
170 187 }
188}
189
171 190
172/* 191/*
173 * It is vital that init_library() is called by any functions 192 * It is vital that init_library() is called by any functions
174 * using this library. 193 * using this library.
175 * 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,
176 * 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
177 * init_function_pointers(). Good idea to also call init_vars and 196 * init_function_pointers(). Good idea to also call init_vars and
178 * init_hash_table if you are doing any object loading. 197 * init_hash_table if you are doing any object loading.
179 */ 198 */
180 199
200void
181void init_library(void) { 201init_library (void)
202{
182 init_environ(); 203 init_environ ();
183 init_globals(); 204 init_globals ();
184 init_objects();
185 init_vars(); 205 init_vars ();
186 init_block(); 206 init_block ();
187 ReadBmapNames (); 207 ReadBmapNames ();
188 ReadSmooth(); 208 ReadSmooth ();
189 init_anim(); /* Must be after we read in the bitmaps */ 209 init_anim (); /* Must be after we read in the bitmaps */
190 init_archetypes(); /* Reads all archetypes from file */ 210 init_archetypes (); /* Reads all archetypes from file */
191 init_dynamic (); 211 init_dynamic ();
192 init_attackmess(); 212 init_attackmess ();
193 init_clocks(); 213 init_clocks ();
194 init_emergency_mappath(); 214 init_emergency_mappath ();
195 init_experience(); 215 init_experience ();
196} 216}
197 217
198 218
199/* init_environ initializes values from the environmental variables. 219/* init_environ initializes values from the environmental variables.
200 * 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
201 * overwrite these if specified. 221 * overwrite these if specified.
202 */ 222 */
223void
203void init_environ(void) { 224init_environ (void)
225{
204 char *cp; 226 char *cp;
205 227
206 cp=getenv("CROSSFIRE_LIBDIR"); 228 cp = getenv ("CROSSFIRE_LIBDIR");
229 if (cp)
207 if (cp) settings.datadir=cp; 230 settings.datadir = cp;
208 cp=getenv("CROSSFIRE_LOCALDIR"); 231 cp = getenv ("CROSSFIRE_LOCALDIR");
232 if (cp)
209 if (cp) settings.localdir=cp; 233 settings.localdir = cp;
210 cp=getenv("CROSSFIRE_PLAYERDIR"); 234 cp = getenv ("CROSSFIRE_PLAYERDIR");
235 if (cp)
211 if (cp) settings.playerdir=cp; 236 settings.playerdir = cp;
212 cp=getenv("CROSSFIRE_MAPDIR"); 237 cp = getenv ("CROSSFIRE_MAPDIR");
238 if (cp)
213 if (cp) settings.mapdir=cp; 239 settings.mapdir = cp;
214 cp=getenv("CROSSFIRE_ARCHETYPES"); 240 cp = getenv ("CROSSFIRE_ARCHETYPES");
241 if (cp)
215 if (cp) settings.archetypes=cp; 242 settings.archetypes = cp;
216 cp=getenv("CROSSFIRE_TREASURES"); 243 cp = getenv ("CROSSFIRE_TREASURES");
244 if (cp)
217 if (cp) settings.treasures=cp; 245 settings.treasures = cp;
218 cp=getenv("CROSSFIRE_UNIQUEDIR"); 246 cp = getenv ("CROSSFIRE_UNIQUEDIR");
247 if (cp)
219 if (cp) settings.uniquedir=cp; 248 settings.uniquedir = cp;
220 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 249 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
250 if (cp)
221 if (cp) settings.templatedir=cp; 251 settings.templatedir = cp;
222 cp=getenv("CROSSFIRE_TMPDIR"); 252 cp = getenv ("CROSSFIRE_TMPDIR");
253 if (cp)
223 if (cp) settings.tmpdir=cp; 254 settings.tmpdir = cp;
224} 255}
225 256
226 257
227/* 258/*
228 * Initialises all global variables. 259 * Initialises all global variables.
229 * Might use environment-variables as default for some of them. 260 * Might use environment-variables as default for some of them.
230 */ 261 */
231 262
263void
232void init_globals(void) { 264init_globals (void)
265{
233 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);
234 logfile = stderr; 271 logfile = stderr;
235 } 272 }
236 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) {
237 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n",
238 settings.logfilename);
239 logfile = stderr;
240 }
241 else { 273 else
242 setvbuf(logfile, NULL, _IOLBF, 0); 274 setvbuf (logfile, NULL, _IOLBF, 0);
243 }
244 exiting = 0;
245 first_player=NULL;
246 first_friendly_object=NULL;
247 first_map=NULL;
248 first_treasurelist=NULL;
249 first_artifactlist=NULL;
250 first_archetype=NULL;
251 *first_map_ext_path=0;
252 warn_archetypes=0;
253 nroftreasures = 0;
254 nrofartifacts = 0;
255 nrofallowedstr=0;
256 ring_arch = NULL;
257 amulet_arch = NULL;
258 staff_arch = NULL;
259 trying_emergency_save = 0;
260 num_animations=0;
261 animations_allocated=0;
262 init_defaults();
263} 275}
264 276
265/* 277void
266 * Sets up and initialises the linked list of free and used objects.
267 * Allocates a certain chunk of objects and puts them on the free list.
268 * Called by init_library();
269 */
270
271void init_objects(void) {
272 int i;
273/* Initialize all objects: */
274 objects=NULL;
275 active_objects = NULL;
276}
277
278/*
279 * Initialises global variables which can be changed by options.
280 * Called by init_library().
281 */
282
283void init_defaults(void) {
284 editor=0;
285 nroferrors=0;
286}
287
288
289void init_dynamic (void) { 278init_dynamic (void)
279{
290 archetype *at = first_archetype; 280 archetype *at = first_archetype;
281
291 while (at) { 282 while (at)
283 {
292 if (at->clone.type == MAP) { 284 if (at->clone.type == MAP)
285 {
293 if (at->clone.race) { 286 if (at->clone.race)
294 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;
295 } 293 }
296 if (EXIT_PATH (&at->clone)) {
297 strcpy (first_map_path, EXIT_PATH (&at->clone));
298 return;
299 } 294 }
300 } 295
301 at = at->next; 296 at = at->next;
302 } 297 }
298
303 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");
304 exit (-1); 300 exit (-1);
305} 301}
306 302
307unsigned long todtick; 303unsigned long todtick;
308 304
309/* 305/*
310 * 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
311 * reset every time the server reboots. 307 * reset every time the server reboots.
312 */ 308 */
313 309
310void
314void write_todclock(void) 311write_todclock (void)
315{ 312{
316 char filename[MAX_BUF]; 313 char filename[MAX_BUF];
317 FILE *fp; 314 FILE *fp;
318 315
319 sprintf(filename, "%s/clockdata", settings.localdir); 316 sprintf (filename, "%s/clockdata", settings.localdir);
320 if ((fp = fopen(filename, "w")) == NULL) { 317 if ((fp = fopen (filename, "w")) == NULL)
318 {
321 LOG(llevError, "Cannot open %s for writing\n", filename); 319 LOG (llevError, "Cannot open %s for writing\n", filename);
322 return; 320 return;
323 } 321 }
324 fprintf(fp, "%lu", todtick); 322 fprintf (fp, "%lu", todtick);
325 fclose(fp); 323 fclose (fp);
326} 324}
327 325
328/* 326/*
329 * Initializes the gametime and TOD counters 327 * Initializes the gametime and TOD counters
330 * Called by init_library(). 328 * Called by init_library().
331 */ 329 */
332 330
331void
333void init_clocks(void) 332init_clocks (void)
334{ 333{
335 char filename[MAX_BUF]; 334 char filename[MAX_BUF];
336 FILE *fp; 335 FILE *fp;
337 static int has_been_done=0; 336 static int has_been_done = 0;
338 337
339 if (has_been_done) 338 if (has_been_done)
340 return; 339 return;
341 else 340 else
342 has_been_done = 1; 341 has_been_done = 1;
343 342
344 sprintf(filename, "%s/clockdata", settings.localdir); 343 sprintf (filename, "%s/clockdata", settings.localdir);
345 LOG(llevDebug, "Reading clockdata from %s...", filename); 344 LOG (llevDebug, "Reading clockdata from %s...", filename);
346 if ((fp = fopen(filename, "r")) == NULL) { 345 if ((fp = fopen (filename, "r")) == NULL)
346 {
347 LOG(llevError, "Can't open %s.\n", filename); 347 LOG (llevError, "Can't open %s.\n", filename);
348 todtick = 0; 348 todtick = 0;
349 write_todclock(); 349 write_todclock ();
350 return; 350 return;
351 } 351 }
352 fscanf(fp, "%lu", &todtick); 352 fscanf (fp, "%lu", &todtick);
353 LOG(llevDebug, "todtick=%lu\n", todtick); 353 LOG (llevDebug, "todtick=%lu\n", todtick);
354 fclose(fp); 354 fclose (fp);
355} 355}
356 356
357/* 357/*
358 * Initializes the attack messages. 358 * Initializes the attack messages.
359 * Called by init_library(). 359 * Called by init_library().
360 */ 360 */
361 361
362//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 362//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
363 363
364void
364void init_attackmess(void){ 365init_attackmess (void)
366{
365 char buf[MAX_BUF]; 367 char buf[MAX_BUF];
366 char filename[MAX_BUF]; 368 char filename[MAX_BUF];
367 char *cp, *p; 369 char *cp, *p;
368 FILE *fp; 370 FILE *fp;
369 static int has_been_done=0; 371 static int has_been_done = 0;
370 int mess, level, comp; 372 int mess, level, comp;
371 int mode=0, total=0; 373 int mode = 0, total = 0;
372 374
373 if (has_been_done) 375 if (has_been_done)
374 return; 376 return;
375 else 377 else
376 has_been_done = 1; 378 has_been_done = 1;
377 379
378 sprintf(filename, "%s/attackmess", settings.datadir); 380 sprintf (filename, "%s/attackmess", settings.datadir);
379 LOG(llevDebug, "Reading attack messages from %s...", filename); 381 LOG (llevDebug, "Reading attack messages from %s...", filename);
380 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 382 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
383 {
381 LOG(llevError, "Can't open %s.\n", filename); 384 LOG (llevError, "Can't open %s.\n", filename);
382 return; 385 return;
383 } 386 }
384 387
385 level = 0; 388 level = 0;
386 while (fgets(buf, MAX_BUF, fp)!=NULL) { 389 while (fgets (buf, MAX_BUF, fp) != NULL)
387 if (*buf=='#') continue; 390 {
391 if (*buf == '#')
392 continue;
388 if((cp=strchr(buf,'\n'))!=NULL) 393 if ((cp = strchr (buf, '\n')) != NULL)
389 *cp='\0'; 394 *cp = '\0';
390 cp=buf; 395 cp = buf;
391 while(*cp==' ') /* Skip blanks */ 396 while (*cp == ' ') /* Skip blanks */
392 cp++; 397 cp++;
393 398
394 if (strncmp(cp, "TYPE:", 5)==0) { 399 if (strncmp (cp, "TYPE:", 5) == 0)
400 {
395 p = strtok(buf, ":"); 401 p = strtok (buf, ":");
396 p = strtok(NULL, ":"); 402 p = strtok (NULL, ":");
397 if (mode == 1) { 403 if (mode == 1)
404 {
398 attack_mess[mess][level].level = -1; 405 attack_mess[mess][level].level = -1;
399 attack_mess[mess][level].buf1 = NULL; 406 attack_mess[mess][level].buf1 = NULL;
400 attack_mess[mess][level].buf2 = NULL; 407 attack_mess[mess][level].buf2 = NULL;
401 attack_mess[mess][level].buf3 = NULL; 408 attack_mess[mess][level].buf3 = NULL;
402 } 409 }
403 level = 0; 410 level = 0;
404 mess = atoi(p); 411 mess = atoi (p);
405 mode = 1; 412 mode = 1;
406 continue; 413 continue;
414 }
415 if (mode == 1)
407 } 416 {
408 if (mode==1) {
409 p = strtok(buf, "="); 417 p = strtok (buf, "=");
410 attack_mess[mess][level].level = atoi(buf); 418 attack_mess[mess][level].level = atoi (buf);
411 p = strtok(NULL, "="); 419 p = strtok (NULL, "=");
412 if (p != NULL) 420 if (p != NULL)
413 attack_mess[mess][level].buf1 = strdup_local(p); 421 attack_mess[mess][level].buf1 = strdup (p);
414 else 422 else
415 attack_mess[mess][level].buf1 = strdup_local(""); 423 attack_mess[mess][level].buf1 = strdup ("");
416 mode = 2; 424 mode = 2;
417 continue; 425 continue;
426 }
418 } else if (mode==2) { 427 else if (mode == 2)
428 {
419 p = strtok(buf, "="); 429 p = strtok (buf, "=");
420 attack_mess[mess][level].level = atoi(buf); 430 attack_mess[mess][level].level = atoi (buf);
421 p = strtok(NULL, "="); 431 p = strtok (NULL, "=");
422 if (p != NULL) 432 if (p != NULL)
423 attack_mess[mess][level].buf2 = strdup_local(p); 433 attack_mess[mess][level].buf2 = strdup (p);
424 else 434 else
425 attack_mess[mess][level].buf2 = strdup_local(""); 435 attack_mess[mess][level].buf2 = strdup ("");
426 mode = 3; 436 mode = 3;
427 continue; 437 continue;
438 }
428 } else if (mode==3) { 439 else if (mode == 3)
440 {
429 p = strtok(buf, "="); 441 p = strtok (buf, "=");
430 attack_mess[mess][level].level = atoi(buf); 442 attack_mess[mess][level].level = atoi (buf);
431 p = strtok(NULL, "="); 443 p = strtok (NULL, "=");
432 if (p != NULL) 444 if (p != NULL)
433 attack_mess[mess][level].buf3 = strdup_local(p); 445 attack_mess[mess][level].buf3 = strdup (p);
434 else 446 else
435 attack_mess[mess][level].buf3 = strdup_local(""); 447 attack_mess[mess][level].buf3 = strdup ("");
436 mode = 1; 448 mode = 1;
437 level++; 449 level++;
438 total++; 450 total++;
439 continue; 451 continue;
440 } 452 }
441 } 453 }
442 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);
443 close_and_delete(fp, comp); 455 close_and_delete (fp, comp);
444} 456}

Diff Legend

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