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.14 by root, Thu Sep 21 00:05:24 2006 UTC

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

Diff Legend

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