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

Diff Legend

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