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.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.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,
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 0,
900,
911.0, 101 1.0,
102
92/* Armor enchantment stuff */ 103/* Armor enchantment stuff */
93ARMOR_MAX_ENCHANT, 104 ARMOR_MAX_ENCHANT,
94ARMOR_WEIGHT_REDUCTION, 105 ARMOR_WEIGHT_REDUCTION,
95ARMOR_WEIGHT_LINEAR, 106 ARMOR_WEIGHT_LINEAR,
96ARMOR_SPEED_IMPROVEMENT, 107 ARMOR_SPEED_IMPROVEMENT,
97ARMOR_SPEED_LINEAR, 108 ARMOR_SPEED_LINEAR,
981, /* no_player_stealing */ 109 1, /* no_player_stealing */
991, /* create_home_portals */ 110 1, /* create_home_portals */
100}; 111};
101 112
102/* perhaps not the best place for this, but needs to be 113/* perhaps not the best place for this, but needs to be
103 * in some file in the common area so that standalone 114 * in some file in the common area so that standalone
104 * programs, like the random map generator, can be built. 115 * programs, like the random map generator, can be built.
105 */ 116 */
106const char* const spellpathnames[NRSPELLPATHS] = { 117const char *const spellpathnames[NRSPELLPATHS] = {
107 "Protection", 118 "Protection",
108 "Fire", 119 "Fire",
109 "Frost", 120 "Frost",
110 "Electricity", 121 "Electricity",
111 "Missiles", 122 "Missiles",
112 "Self", 123 "Self",
113 "Summoning", 124 "Summoning",
114 "Abjuration", 125 "Abjuration",
115 "Restoration", 126 "Restoration",
116 "Detonation", 127 "Detonation",
117 "Mind", 128 "Mind",
118 "Creation", 129 "Creation",
119 "Teleportation", 130 "Teleportation",
120 "Information", 131 "Information",
121 "Transmutation", 132 "Transmutation",
122 "Transferrence", 133 "Transferrence",
123 "Turning", 134 "Turning",
124 "Wounding", 135 "Wounding",
125 "Death", 136 "Death",
126 "Light" 137 "Light"
127}; 138};
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 139
172/* 140/*
173 * It is vital that init_library() is called by any functions 141 * It is vital that init_library() is called by any functions
174 * using this library. 142 * using this library.
175 * 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,
176 * 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
177 * init_function_pointers(). Good idea to also call init_vars and 145 * init_function_pointers(). Good idea to also call init_vars and
178 * init_hash_table if you are doing any object loading. 146 * init_hash_table if you are doing any object loading.
179 */ 147 */
180 148void
181void init_library(void) { 149init_library (void)
182 init_environ(); 150{
183 init_globals(); 151 init_globals ();
184 init_hash_table();
185 init_objects();
186 init_vars();
187 init_block(); 152 init_block ();
188 ReadBmapNames (); 153 ReadBmapNames ();
189 ReadSmooth(); 154 ReadSmooth ();
190 init_anim(); /* Must be after we read in the bitmaps */ 155 init_anim (); /* Must be after we read in the bitmaps */
191 init_archetypes(); /* Reads all archetypes from file */ 156 init_archetypes (); /* Reads all archetypes from file */
192 init_dynamic (); 157 init_dynamic ();
193 init_attackmess(); 158 init_attackmess ();
194 init_clocks(); 159 init_clocks ();
195 init_emergency_mappath();
196 init_experience(); 160 init_experience ();
197} 161}
198 162
199 163
200/* init_environ initializes values from the environmental variables. 164/* init_environ initialises values from the environmental variables.
201 * 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
202 * overwrite these if specified. 166 * overwrite these if specified.
203 */ 167 */
168void
204void init_environ(void) { 169init_environ (void)
170{
205 char *cp; 171 char *cp;
206 172
207 cp=getenv("CROSSFIRE_LIBDIR"); 173 cp = getenv ("CROSSFIRE_LIBDIR");
174 if (cp)
208 if (cp) settings.datadir=cp; 175 settings.datadir = cp;
209 cp=getenv("CROSSFIRE_LOCALDIR"); 176 cp = getenv ("CROSSFIRE_LOCALDIR");
177 if (cp)
210 if (cp) settings.localdir=cp; 178 settings.localdir = cp;
211 cp=getenv("CROSSFIRE_PLAYERDIR"); 179 cp = getenv ("CROSSFIRE_PLAYERDIR");
180 if (cp)
212 if (cp) settings.playerdir=cp; 181 settings.playerdir = cp;
213 cp=getenv("CROSSFIRE_MAPDIR"); 182 cp = getenv ("CROSSFIRE_MAPDIR");
183 if (cp)
214 if (cp) settings.mapdir=cp; 184 settings.mapdir = cp;
215 cp=getenv("CROSSFIRE_ARCHETYPES"); 185 cp = getenv ("CROSSFIRE_ARCHETYPES");
186 if (cp)
216 if (cp) settings.archetypes=cp; 187 settings.archetypes = cp;
217 cp=getenv("CROSSFIRE_TREASURES"); 188 cp = getenv ("CROSSFIRE_TREASURES");
189 if (cp)
218 if (cp) settings.treasures=cp; 190 settings.treasures = cp;
219 cp=getenv("CROSSFIRE_UNIQUEDIR"); 191 cp = getenv ("CROSSFIRE_UNIQUEDIR");
192 if (cp)
220 if (cp) settings.uniquedir=cp; 193 settings.uniquedir = cp;
221 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 194 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
195 if (cp)
222 if (cp) settings.templatedir=cp; 196 settings.templatedir = cp;
223 cp=getenv("CROSSFIRE_TMPDIR"); 197 cp = getenv ("CROSSFIRE_TMPDIR");
198 if (cp)
224 if (cp) settings.tmpdir=cp; 199 settings.tmpdir = cp;
225} 200}
226
227 201
228/* 202/*
229 * Initialises all global variables. 203 * Initialises all global variables.
230 * Might use environment-variables as default for some of them. 204 * Might use environment-variables as default for some of them.
231 */ 205 */
232 206void
233void init_globals(void) { 207init_globals (void)
208{
234 if (settings.logfilename[0] == 0) { 209 if (settings.logfilename[0] == 0)
235 logfile = stderr; 210 logfile = stderr;
236 }
237 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) { 211 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
212 {
238 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n", 213 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
239 settings.logfilename);
240 logfile = stderr; 214 logfile = stderr;
241 } 215 }
242 else { 216 else
243 setvbuf(logfile, NULL, _IOLBF, 0); 217 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} 218}
267 219
268/* 220void
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) { 221init_dynamic (void)
222{
313 archetype *at = first_archetype; 223 archetype *at = first_archetype;
224
314 while (at) { 225 while (at)
226 {
315 if (at->clone.type == MAP) { 227 if (at->clone.type == MAP)
228 {
316 if (at->clone.race) { 229 if (at->clone.race)
317 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;
318 } 236 }
319 if (EXIT_PATH (&at->clone)) {
320 strcpy (first_map_path, EXIT_PATH (&at->clone));
321 return;
322 } 237 }
323 } 238
324 at = at->next; 239 at = at->next;
325 } 240 }
241
326 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");
327 exit (-1); 243 exit (-1);
328} 244}
329 245
330unsigned long todtick; 246unsigned long todtick;
331 247
332/* 248/*
333 * 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
334 * reset every time the server reboots. 250 * reset every time the server reboots.
335 */ 251 */
336 252void
337void write_todclock(void) 253write_todclock (void)
338{ 254{
339 char filename[MAX_BUF]; 255 char filename[MAX_BUF];
340 FILE *fp; 256 FILE *fp;
341 257
342 sprintf(filename, "%s/clockdata", settings.localdir); 258 sprintf (filename, "%s/clockdata", settings.localdir);
343 if ((fp = fopen(filename, "w")) == NULL) { 259 if ((fp = fopen (filename, "w")) == NULL)
260 {
344 LOG(llevError, "Cannot open %s for writing\n", filename); 261 LOG (llevError, "Cannot open %s for writing\n", filename);
345 return; 262 return;
346 } 263 }
347 fprintf(fp, "%lu", todtick); 264 fprintf (fp, "%lu", todtick);
348 fclose(fp); 265 fclose (fp);
349} 266}
350 267
351/* 268/*
352 * Initializes the gametime and TOD counters 269 * initialises the gametime and TOD counters
353 * Called by init_library(). 270 * Called by init_library().
354 */ 271 */
355 272void
356void init_clocks(void) 273init_clocks (void)
357{ 274{
358 char filename[MAX_BUF]; 275 char filename[MAX_BUF];
359 FILE *fp; 276 FILE *fp;
360 static int has_been_done=0; 277 static int has_been_done = 0;
361 278
362 if (has_been_done) 279 if (has_been_done)
363 return; 280 return;
364 else 281 else
365 has_been_done = 1; 282 has_been_done = 1;
366 283
367 sprintf(filename, "%s/clockdata", settings.localdir); 284 sprintf (filename, "%s/clockdata", settings.localdir);
368 LOG(llevDebug, "Reading clockdata from %s...", filename); 285 LOG (llevDebug, "Reading clockdata from %s...\n", filename);
369 if ((fp = fopen(filename, "r")) == NULL) { 286 if ((fp = fopen (filename, "r")) == NULL)
287 {
370 LOG(llevError, "Can't open %s.\n", filename); 288 LOG (llevError, "Can't open %s.\n", filename);
371 todtick = 0; 289 todtick = 0;
372 write_todclock(); 290 write_todclock ();
373 return; 291 return;
374 } 292 }
293
375 fscanf(fp, "%lu", &todtick); 294 fscanf (fp, "%lu", &todtick);
376 LOG(llevDebug, "todtick=%lu\n", todtick); 295 LOG (llevDebug, "todtick=%lu\n", todtick);
377 fclose(fp); 296 fclose (fp);
378} 297}
379 298
380/* 299/*
381 * Initializes the attack messages. 300 * initialises the attack messages.
382 * Called by init_library(). 301 * Called by init_library().
383 */ 302 */
384 303
385//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 304//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
386 305
306void
387void init_attackmess(void){ 307init_attackmess (void)
308{
388 char buf[MAX_BUF]; 309 char buf[MAX_BUF];
389 char filename[MAX_BUF]; 310 char filename[MAX_BUF];
390 char *cp, *p; 311 char *cp, *p;
391 FILE *fp; 312 FILE *fp;
392 static int has_been_done=0; 313 static int has_been_done = 0;
393 int mess, level, comp; 314 int mess, level, comp;
394 int mode=0, total=0; 315 int mode = 0, total = 0;
395 316
396 if (has_been_done) 317 if (has_been_done)
397 return; 318 return;
398 else 319 else
399 has_been_done = 1; 320 has_been_done = 1;
400 321
401 sprintf(filename, "%s/attackmess", settings.datadir); 322 sprintf (filename, "%s/attackmess", settings.datadir);
402 LOG(llevDebug, "Reading attack messages from %s...", filename); 323 LOG (llevDebug, "Reading attack messages from %s...\n", filename);
403 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 324 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
325 {
404 LOG(llevError, "Can't open %s.\n", filename); 326 LOG (llevError, "Can't open %s.\n", filename);
405 return; 327 return;
406 } 328 }
407 329
408 level = 0; 330 level = 0;
409 while (fgets(buf, MAX_BUF, fp)!=NULL) { 331 while (fgets (buf, MAX_BUF, fp) != NULL)
410 if (*buf=='#') continue; 332 {
333 if (*buf == '#')
334 continue;
411 if((cp=strchr(buf,'\n'))!=NULL) 335 if ((cp = strchr (buf, '\n')) != NULL)
412 *cp='\0'; 336 *cp = '\0';
413 cp=buf; 337 cp = buf;
414 while(*cp==' ') /* Skip blanks */ 338 while (*cp == ' ') /* Skip blanks */
415 cp++; 339 cp++;
416 340
417 if (strncmp(cp, "TYPE:", 5)==0) { 341 if (strncmp (cp, "TYPE:", 5) == 0)
342 {
418 p = strtok(buf, ":"); 343 p = strtok (buf, ":");
419 p = strtok(NULL, ":"); 344 p = strtok (NULL, ":");
420 if (mode == 1) { 345 if (mode == 1)
346 {
421 attack_mess[mess][level].level = -1; 347 attack_mess[mess][level].level = -1;
422 attack_mess[mess][level].buf1 = NULL; 348 attack_mess[mess][level].buf1 = NULL;
423 attack_mess[mess][level].buf2 = NULL; 349 attack_mess[mess][level].buf2 = NULL;
424 attack_mess[mess][level].buf3 = NULL; 350 attack_mess[mess][level].buf3 = NULL;
425 } 351 }
426 level = 0; 352 level = 0;
427 mess = atoi(p); 353 mess = atoi (p);
428 mode = 1; 354 mode = 1;
429 continue; 355 continue;
430 } 356 }
431 if (mode==1) { 357 if (mode == 1)
358 {
432 p = strtok(buf, "="); 359 p = strtok (buf, "=");
433 attack_mess[mess][level].level = atoi(buf); 360 attack_mess[mess][level].level = atoi (buf);
434 p = strtok(NULL, "="); 361 p = strtok (NULL, "=");
435 if (p != NULL) 362 if (p != NULL)
436 attack_mess[mess][level].buf1 = strdup_local(p); 363 attack_mess[mess][level].buf1 = strdup (p);
437 else 364 else
438 attack_mess[mess][level].buf1 = strdup_local(""); 365 attack_mess[mess][level].buf1 = strdup ("");
439 mode = 2; 366 mode = 2;
440 continue; 367 continue;
368 }
441 } else if (mode==2) { 369 else if (mode == 2)
370 {
442 p = strtok(buf, "="); 371 p = strtok (buf, "=");
443 attack_mess[mess][level].level = atoi(buf); 372 attack_mess[mess][level].level = atoi (buf);
444 p = strtok(NULL, "="); 373 p = strtok (NULL, "=");
445 if (p != NULL) 374 if (p != NULL)
446 attack_mess[mess][level].buf2 = strdup_local(p); 375 attack_mess[mess][level].buf2 = strdup (p);
447 else 376 else
448 attack_mess[mess][level].buf2 = strdup_local(""); 377 attack_mess[mess][level].buf2 = strdup ("");
449 mode = 3; 378 mode = 3;
450 continue; 379 continue;
380 }
451 } else if (mode==3) { 381 else if (mode == 3)
382 {
452 p = strtok(buf, "="); 383 p = strtok (buf, "=");
453 attack_mess[mess][level].level = atoi(buf); 384 attack_mess[mess][level].level = atoi (buf);
454 p = strtok(NULL, "="); 385 p = strtok (NULL, "=");
455 if (p != NULL) 386 if (p != NULL)
456 attack_mess[mess][level].buf3 = strdup_local(p); 387 attack_mess[mess][level].buf3 = strdup (p);
457 else 388 else
458 attack_mess[mess][level].buf3 = strdup_local(""); 389 attack_mess[mess][level].buf3 = strdup ("");
459 mode = 1; 390 mode = 1;
460 level++; 391 level++;
461 total++; 392 total++;
462 continue; 393 continue;
463 } 394 }
464 } 395 }
465 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);
466 close_and_delete(fp, comp); 397 close_and_delete (fp, comp);
467} 398}

Diff Legend

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