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.4 by root, Sun Sep 3 07:57:54 2006 UTC vs.
Revision 1.25 by root, Tue Mar 6 03:06:00 2007 UTC

1/* 1/*
2 * static char *rcsid_init_c =
3 * "$Id: init.C,v 1.4 2006/09/03 07:57:54 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 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_objects();
185 init_vars();
186 init_block(); 153 init_block ();
187 ReadBmapNames (); 154 ReadBmapNames ();
188 ReadSmooth(); 155 ReadSmooth ();
189 init_anim(); /* Must be after we read in the bitmaps */ 156 init_anim (); /* Must be after we read in the bitmaps */
190 init_archetypes(); /* Reads all archetypes from file */ 157 init_archetypes (); /* Reads all archetypes from file */
191 init_dynamic (); 158 init_dynamic ();
192 init_attackmess(); 159 init_attackmess ();
193 init_clocks(); 160 init_clocks ();
194 init_emergency_mappath();
195 init_experience(); 161 init_experience ();
196} 162}
197 163
198 164
199/* init_environ initializes values from the environmental variables. 165/* init_environ initialises values from the environmental variables.
200 * 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
201 * overwrite these if specified. 167 * overwrite these if specified.
202 */ 168 */
169void
203void init_environ(void) { 170init_environ (void)
171{
204 char *cp; 172 char *cp;
205 173
206 cp=getenv("CROSSFIRE_LIBDIR"); 174 cp = getenv ("CROSSFIRE_LIBDIR");
175 if (cp)
207 if (cp) settings.datadir=cp; 176 settings.datadir = cp;
208 cp=getenv("CROSSFIRE_LOCALDIR"); 177 cp = getenv ("CROSSFIRE_LOCALDIR");
178 if (cp)
209 if (cp) settings.localdir=cp; 179 settings.localdir = cp;
210 cp=getenv("CROSSFIRE_PLAYERDIR"); 180 cp = getenv ("CROSSFIRE_PLAYERDIR");
181 if (cp)
211 if (cp) settings.playerdir=cp; 182 settings.playerdir = cp;
212 cp=getenv("CROSSFIRE_MAPDIR"); 183 cp = getenv ("CROSSFIRE_MAPDIR");
184 if (cp)
213 if (cp) settings.mapdir=cp; 185 settings.mapdir = cp;
214 cp=getenv("CROSSFIRE_ARCHETYPES"); 186 cp = getenv ("CROSSFIRE_ARCHETYPES");
187 if (cp)
215 if (cp) settings.archetypes=cp; 188 settings.archetypes = cp;
216 cp=getenv("CROSSFIRE_TREASURES"); 189 cp = getenv ("CROSSFIRE_TREASURES");
190 if (cp)
217 if (cp) settings.treasures=cp; 191 settings.treasures = cp;
218 cp=getenv("CROSSFIRE_UNIQUEDIR"); 192 cp = getenv ("CROSSFIRE_UNIQUEDIR");
193 if (cp)
219 if (cp) settings.uniquedir=cp; 194 settings.uniquedir = cp;
220 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 195 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
196 if (cp)
221 if (cp) settings.templatedir=cp; 197 settings.templatedir = cp;
222 cp=getenv("CROSSFIRE_TMPDIR"); 198 cp = getenv ("CROSSFIRE_TMPDIR");
199 if (cp)
223 if (cp) settings.tmpdir=cp; 200 settings.tmpdir = cp;
224} 201}
225 202
226 203
227/* 204/*
228 * Initialises all global variables. 205 * Initialises all global variables.
229 * Might use environment-variables as default for some of them. 206 * Might use environment-variables as default for some of them.
230 */ 207 */
231 208
209void
232void init_globals(void) { 210init_globals (void)
211{
233 if (settings.logfilename[0] == 0) { 212 if (settings.logfilename[0] == 0)
213 logfile = stderr;
214 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
215 {
216 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
234 logfile = stderr; 217 logfile = stderr;
235 } 218 }
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 { 219 else
242 setvbuf(logfile, NULL, _IOLBF, 0); 220 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} 221}
264 222
265/* 223void
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#ifdef MEMORY_DEBUG
278 free_objects=NULL;
279#else
280 free_objects=objarray;
281 objarray[0].prev=NULL,
282 objarray[0].next= &objarray[1],
283 SET_FLAG(&objarray[0], FLAG_REMOVED);
284 SET_FLAG(&objarray[0], FLAG_FREED);
285 for(i=1;i<STARTMAX-1;i++) {
286 objarray[i].next= &objarray[i+1];
287 objarray[i].prev= &objarray[i-1];
288 SET_FLAG(&objarray[i], FLAG_REMOVED);
289 SET_FLAG(&objarray[i], FLAG_FREED);
290 }
291 objarray[STARTMAX-1].next=NULL;
292 objarray[STARTMAX-1].prev= &objarray[STARTMAX-2];
293 SET_FLAG(&objarray[STARTMAX-1], FLAG_REMOVED);
294 SET_FLAG(&objarray[STARTMAX-1], FLAG_FREED);
295#endif
296}
297
298/*
299 * Initialises global variables which can be changed by options.
300 * Called by init_library().
301 */
302
303void init_defaults(void) {
304 editor=0;
305 nroferrors=0;
306}
307
308
309void init_dynamic (void) { 224init_dynamic (void)
225{
310 archetype *at = first_archetype; 226 archetype *at = first_archetype;
227
311 while (at) { 228 while (at)
229 {
312 if (at->clone.type == MAP) { 230 if (at->clone.type == MAP)
231 {
313 if (at->clone.race) { 232 if (at->clone.race)
314 strcpy (first_map_ext_path, at->clone.race); 233 first_map_ext_path = at->clone.race;
315 } 234
316 if (EXIT_PATH (&at->clone)) { 235 if (EXIT_PATH (&at->clone))
236 {
317 strcpy (first_map_path, EXIT_PATH (&at->clone)); 237 first_map_path = EXIT_PATH (&at->clone);
318 return; 238 return;
319 } 239 }
320 } 240 }
241
321 at = at->next; 242 at = at->next;
322 } 243 }
244
323 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n"); 245 LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n");
324 exit (-1); 246 exit (-1);
325} 247}
326 248
327unsigned long todtick; 249unsigned long todtick;
328 250
329/* 251/*
330 * Write out the current time to the file so time does not 252 * Write out the current time to the file so time does not
331 * reset every time the server reboots. 253 * reset every time the server reboots.
332 */ 254 */
333 255
256void
334void write_todclock(void) 257write_todclock (void)
335{ 258{
336 char filename[MAX_BUF]; 259 char filename[MAX_BUF];
337 FILE *fp; 260 FILE *fp;
338 261
339 sprintf(filename, "%s/clockdata", settings.localdir); 262 sprintf (filename, "%s/clockdata", settings.localdir);
340 if ((fp = fopen(filename, "w")) == NULL) { 263 if ((fp = fopen (filename, "w")) == NULL)
264 {
341 LOG(llevError, "Cannot open %s for writing\n", filename); 265 LOG (llevError, "Cannot open %s for writing\n", filename);
342 return; 266 return;
343 } 267 }
344 fprintf(fp, "%lu", todtick); 268 fprintf (fp, "%lu", todtick);
345 fclose(fp); 269 fclose (fp);
346} 270}
347 271
348/* 272/*
349 * Initializes the gametime and TOD counters 273 * initialises the gametime and TOD counters
350 * Called by init_library(). 274 * Called by init_library().
351 */ 275 */
352 276
277void
353void init_clocks(void) 278init_clocks (void)
354{ 279{
355 char filename[MAX_BUF]; 280 char filename[MAX_BUF];
356 FILE *fp; 281 FILE *fp;
357 static int has_been_done=0; 282 static int has_been_done = 0;
358 283
359 if (has_been_done) 284 if (has_been_done)
360 return; 285 return;
361 else 286 else
362 has_been_done = 1; 287 has_been_done = 1;
363 288
364 sprintf(filename, "%s/clockdata", settings.localdir); 289 sprintf (filename, "%s/clockdata", settings.localdir);
365 LOG(llevDebug, "Reading clockdata from %s...", filename); 290 LOG (llevDebug, "Reading clockdata from %s...\n", filename);
366 if ((fp = fopen(filename, "r")) == NULL) { 291 if ((fp = fopen (filename, "r")) == NULL)
292 {
367 LOG(llevError, "Can't open %s.\n", filename); 293 LOG (llevError, "Can't open %s.\n", filename);
368 todtick = 0; 294 todtick = 0;
369 write_todclock(); 295 write_todclock ();
370 return; 296 return;
371 } 297 }
372 fscanf(fp, "%lu", &todtick); 298 fscanf (fp, "%lu", &todtick);
373 LOG(llevDebug, "todtick=%lu\n", todtick); 299 LOG (llevDebug, "todtick=%lu\n", todtick);
374 fclose(fp); 300 fclose (fp);
375} 301}
376 302
377/* 303/*
378 * Initializes the attack messages. 304 * initialises the attack messages.
379 * Called by init_library(). 305 * Called by init_library().
380 */ 306 */
381 307
382//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 308//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
383 309
310void
384void init_attackmess(void){ 311init_attackmess (void)
312{
385 char buf[MAX_BUF]; 313 char buf[MAX_BUF];
386 char filename[MAX_BUF]; 314 char filename[MAX_BUF];
387 char *cp, *p; 315 char *cp, *p;
388 FILE *fp; 316 FILE *fp;
389 static int has_been_done=0; 317 static int has_been_done = 0;
390 int mess, level, comp; 318 int mess, level, comp;
391 int mode=0, total=0; 319 int mode = 0, total = 0;
392 320
393 if (has_been_done) 321 if (has_been_done)
394 return; 322 return;
395 else 323 else
396 has_been_done = 1; 324 has_been_done = 1;
397 325
398 sprintf(filename, "%s/attackmess", settings.datadir); 326 sprintf (filename, "%s/attackmess", settings.datadir);
399 LOG(llevDebug, "Reading attack messages from %s...", filename); 327 LOG (llevDebug, "Reading attack messages from %s...\n", filename);
400 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 328 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
329 {
401 LOG(llevError, "Can't open %s.\n", filename); 330 LOG (llevError, "Can't open %s.\n", filename);
402 return; 331 return;
403 } 332 }
404 333
405 level = 0; 334 level = 0;
406 while (fgets(buf, MAX_BUF, fp)!=NULL) { 335 while (fgets (buf, MAX_BUF, fp) != NULL)
407 if (*buf=='#') continue; 336 {
337 if (*buf == '#')
338 continue;
408 if((cp=strchr(buf,'\n'))!=NULL) 339 if ((cp = strchr (buf, '\n')) != NULL)
409 *cp='\0'; 340 *cp = '\0';
410 cp=buf; 341 cp = buf;
411 while(*cp==' ') /* Skip blanks */ 342 while (*cp == ' ') /* Skip blanks */
412 cp++; 343 cp++;
413 344
414 if (strncmp(cp, "TYPE:", 5)==0) { 345 if (strncmp (cp, "TYPE:", 5) == 0)
346 {
415 p = strtok(buf, ":"); 347 p = strtok (buf, ":");
416 p = strtok(NULL, ":"); 348 p = strtok (NULL, ":");
417 if (mode == 1) { 349 if (mode == 1)
350 {
418 attack_mess[mess][level].level = -1; 351 attack_mess[mess][level].level = -1;
419 attack_mess[mess][level].buf1 = NULL; 352 attack_mess[mess][level].buf1 = NULL;
420 attack_mess[mess][level].buf2 = NULL; 353 attack_mess[mess][level].buf2 = NULL;
421 attack_mess[mess][level].buf3 = NULL; 354 attack_mess[mess][level].buf3 = NULL;
422 } 355 }
423 level = 0; 356 level = 0;
424 mess = atoi(p); 357 mess = atoi (p);
425 mode = 1; 358 mode = 1;
426 continue; 359 continue;
427 } 360 }
428 if (mode==1) { 361 if (mode == 1)
362 {
429 p = strtok(buf, "="); 363 p = strtok (buf, "=");
430 attack_mess[mess][level].level = atoi(buf); 364 attack_mess[mess][level].level = atoi (buf);
431 p = strtok(NULL, "="); 365 p = strtok (NULL, "=");
432 if (p != NULL) 366 if (p != NULL)
433 attack_mess[mess][level].buf1 = strdup_local(p); 367 attack_mess[mess][level].buf1 = strdup (p);
434 else 368 else
435 attack_mess[mess][level].buf1 = strdup_local(""); 369 attack_mess[mess][level].buf1 = strdup ("");
436 mode = 2; 370 mode = 2;
437 continue; 371 continue;
438 } else if (mode==2) {
439 p = strtok(buf, "=");
440 attack_mess[mess][level].level = atoi(buf);
441 p = strtok(NULL, "=");
442 if (p != NULL)
443 attack_mess[mess][level].buf2 = strdup_local(p);
444 else
445 attack_mess[mess][level].buf2 = strdup_local("");
446 mode = 3;
447 continue;
448 } else if (mode==3) {
449 p = strtok(buf, "=");
450 attack_mess[mess][level].level = atoi(buf);
451 p = strtok(NULL, "=");
452 if (p != NULL)
453 attack_mess[mess][level].buf3 = strdup_local(p);
454 else
455 attack_mess[mess][level].buf3 = strdup_local("");
456 mode = 1;
457 level++;
458 total++;
459 continue;
460 } 372 }
373 else if (mode == 2)
374 {
375 p = strtok (buf, "=");
376 attack_mess[mess][level].level = atoi (buf);
377 p = strtok (NULL, "=");
378 if (p != NULL)
379 attack_mess[mess][level].buf2 = strdup (p);
380 else
381 attack_mess[mess][level].buf2 = strdup ("");
382 mode = 3;
383 continue;
384 }
385 else if (mode == 3)
386 {
387 p = strtok (buf, "=");
388 attack_mess[mess][level].level = atoi (buf);
389 p = strtok (NULL, "=");
390 if (p != NULL)
391 attack_mess[mess][level].buf3 = strdup (p);
392 else
393 attack_mess[mess][level].buf3 = strdup ("");
394 mode = 1;
395 level++;
396 total++;
397 continue;
398 }
461 } 399 }
462 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 400 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
463 close_and_delete(fp, comp); 401 close_and_delete (fp, comp);
464} 402}

Diff Legend

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