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

Diff Legend

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