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.11 by root, Wed Sep 13 02:05:18 2006 UTC

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/* 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
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-devel@real-time.com
27*/ 22*/
28 23
29#define EXTERN // horrible hack 24#define EXTERN // horrible hack
30 25
31#include <global.h> 26#include <global.h>
32#include <object.h> 27#include <object.h>
33 28
34extern const char* const attacktype_desc[NROFATTACKS] = { 29extern const char *const attacktype_desc[NROFATTACKS] = {
35# define def(uc, name, lc, plus, change) # name, 30# define def(uc, lc, name, plus, change) # name,
36# include "attackinc.h" 31# include "attackinc.h"
37# undef def 32# undef def
38}; 33};
39 34
40extern const keyword resist_save[NROFATTACKS] = { 35extern const keyword resist_save[NROFATTACKS] = {
41# define def(uc, name, lc, plus, change) KW_resist_ ## lc, 36# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
42# include "attackinc.h" 37# include "attackinc.h"
43# undef def 38# undef def
44}; 39};
45 40
46extern const char* const resist_plus[NROFATTACKS] = { 41extern const char *const resist_plus[NROFATTACKS] = {
47# define def(uc, name, lc, plus, change) # plus, 42# define def(uc, lc, name, plus, change) # plus,
48# include "attackinc.h" 43# include "attackinc.h"
49# undef def 44# undef def
50}; 45};
51 46
52extern const char* const change_resist_msg[NROFATTACKS] = { 47extern const char *const change_resist_msg[NROFATTACKS] = {
53# define def(uc, name, lc, plus, change) # change, 48# define def(uc, lc, name, plus, change) # change,
54# include "attackinc.h" 49# include "attackinc.h"
55# undef def 50# undef def
56}; 51};
57 52
58int resist_table[NROFATTACKS] = { 53int resist_table[NROFATTACKS] = {
59# define def(uc, name, lc, plus, change) ATNR_ ## uc, 54# define def(uc, lc, name, plus, change) ATNR_ ## uc,
60# include "attackinc.h" 55# include "attackinc.h"
61# undef def 56# undef def
62}; 57};
63 58
64/* You unforunately need to looking in include/global.h to see what these 59/* You unforunately need to looking in include/global.h to see what these
65 * correspond to. 60 * correspond to.
66 */ 61 */
67struct Settings settings = { 62struct Settings settings = {
68LOGFILE, /* Logfile */ 63 LOGFILE, /* Logfile */
69CSPORT, /* Client/server port */ 64 CSPORT, /* Client/server port */
70 65
71/* Debug level */ 66/* Debug level */
72#ifdef DEBUG 67#ifdef DEBUG
73 llevDebug, 68 llevDebug,
74#else 69#else
75 llevInfo, 70 llevInfo,
76#endif 71#endif
77 72
780, NULL, 0, /* dumpvalues, dumparg, daemonmode */ 73 0, NULL, 0, /* dumpvalues, dumparg, daemonmode */
790, /* argc */ 74 0, /* argc */
80NULL, /* argv */ 75 NULL, /* argv */
81CONFDIR, 76 CONFDIR,
82DATADIR, 77 DATADIR,
83LOCALDIR, 78 LOCALDIR,
84PLAYERDIR, MAPDIR, ARCHETYPES,REGIONS,TREASURES, 79 PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
85UNIQUE_DIR, TEMPLATE_DIR, 80 UNIQUE_DIR, TEMPLATE_DIR,
86TMPDIR, 81 TMPDIR,
87STAT_LOSS_ON_DEATH, 82 STAT_LOSS_ON_DEATH,
88PK_LUCK_PENALTY, 83 PK_LUCK_PENALTY,
89PERMANENT_EXPERIENCE_RATIO, 84 PERMANENT_EXPERIENCE_RATIO,
90DEATH_PENALTY_RATIO, 85 DEATH_PENALTY_RATIO,
91DEATH_PENALTY_LEVEL, 86 DEATH_PENALTY_LEVEL,
92BALANCED_STAT_LOSS, 87 BALANCED_STAT_LOSS,
93NOT_PERMADETH, 88 NOT_PERMADETH,
94SIMPLE_EXP, 89 SIMPLE_EXP,
95RESET_LOCATION_TIME, 90 RESET_LOCATION_TIME,
96SET_TITLE, 91 SET_TITLE,
97RESURRECTION, 92 RESURRECTION,
98SEARCH_ITEMS, 93 SEARCH_ITEMS,
99SPELL_ENCUMBRANCE, 94 SPELL_ENCUMBRANCE,
100SPELL_FAILURE_EFFECTS, 95 SPELL_FAILURE_EFFECTS,
101CASTING_TIME, 96 CASTING_TIME,
102REAL_WIZ, 97 REAL_WIZ,
103RECYCLE_TMP_MAPS, 98 RECYCLE_TMP_MAPS,
104EXPLORE_MODE, 99 EXPLORE_MODE,
105SPELLPOINT_LEVEL_DEPEND, 100 SPELLPOINT_LEVEL_DEPEND,
106SET_FRIENDLY_FIRE, 101 SET_FRIENDLY_FIRE,
107"", /* Who format specifier */ 102 "", /* Who format specifier */
108"", /* who wiz format specifier */ 103 "", /* who wiz format specifier */
109MOTD, 104 MOTD,
110"rules", 105 "rules",
111"news", 106 "news",
112"", /* DM_MAIL */ 107 "", /* DM_MAIL */
1130, /* This and the next 3 values are metaserver values */ 108 0, /* This and the next 3 values are metaserver values */
114"", 109 "",
115"", 110 "",
1160, 111 0,
117"", 112 "",
1180,0,0,0,0,0,0,0, /* worldmap settings*/ 113 0, 0, 0, 0, 0, 0, 0, 0, /* worldmap settings */
119EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y, 114 EMERGENCY_MAPPATH, EMERGENCY_X, EMERGENCY_Y,
1200, 115 0,
1211.0, 116 1.0,
117
122/* Armor enchantment stuff */ 118/* Armor enchantment stuff */
123ARMOR_MAX_ENCHANT, 119 ARMOR_MAX_ENCHANT,
124ARMOR_WEIGHT_REDUCTION, 120 ARMOR_WEIGHT_REDUCTION,
125ARMOR_WEIGHT_LINEAR, 121 ARMOR_WEIGHT_LINEAR,
126ARMOR_SPEED_IMPROVEMENT, 122 ARMOR_SPEED_IMPROVEMENT,
127ARMOR_SPEED_LINEAR, 123 ARMOR_SPEED_LINEAR,
1281, /* no_player_stealing */ 124 1, /* no_player_stealing */
1291, /* create_home_portals */ 125 1, /* create_home_portals */
130}; 126};
131 127
132/* perhaps not the best place for this, but needs to be 128/* perhaps not the best place for this, but needs to be
133 * in some file in the common area so that standalone 129 * in some file in the common area so that standalone
134 * programs, like the random map generator, can be built. 130 * programs, like the random map generator, can be built.
135 */ 131 */
136const char* const spellpathnames[NRSPELLPATHS] = { 132const char *const spellpathnames[NRSPELLPATHS] = {
137 "Protection", 133 "Protection",
138 "Fire", 134 "Fire",
139 "Frost", 135 "Frost",
140 "Electricity", 136 "Electricity",
141 "Missiles", 137 "Missiles",
142 "Self", 138 "Self",
143 "Summoning", 139 "Summoning",
144 "Abjuration", 140 "Abjuration",
145 "Restoration", 141 "Restoration",
146 "Detonation", 142 "Detonation",
147 "Mind", 143 "Mind",
148 "Creation", 144 "Creation",
149 "Teleportation", 145 "Teleportation",
150 "Information", 146 "Information",
151 "Transmutation", 147 "Transmutation",
152 "Transferrence", 148 "Transferrence",
153 "Turning", 149 "Turning",
154 "Wounding", 150 "Wounding",
155 "Death", 151 "Death",
156 "Light" 152 "Light"
157}; 153};
158 154
159 155
160/* This loads the emergency map information from a 156/* This loads the emergency map information from a
161 * .emergency file in the map directory. Doing this makes 157 * .emergency file in the map directory. Doing this makes
162 * it easier to switch between map distributions (don't need 158 * it easier to switch between map distributions (don't need
163 * to recompile. Note that there is no reason I see that 159 * to recompile. Note that there is no reason I see that
164 * this could not be re-loaded during play, but it seems 160 * this could not be re-loaded during play, but it seems
165 * like there should be little reason to do that. 161 * like there should be little reason to do that.
166 */ 162 */
163static void
167static void init_emergency_mappath(void) 164init_emergency_mappath (void)
168{ 165{
169 char filename[MAX_BUF], tmpbuf[MAX_BUF]; 166 char filename[MAX_BUF], tmpbuf[MAX_BUF];
170 FILE *fp; 167 FILE *fp;
171 int online=0; 168 int online = 0;
172 169
173 /* If this file doesn't exist, not a big deal */ 170 /* If this file doesn't exist, not a big deal */
174 sprintf(filename,"%s/%s/.emergency",settings.datadir, settings.mapdir); 171 sprintf (filename, "%s/%s/.emergency", settings.datadir, settings.mapdir);
175 if ((fp = fopen(filename, "r"))!=NULL) { 172 if ((fp = fopen (filename, "r")) != NULL)
173 {
176 while (fgets(tmpbuf, MAX_BUF-1, fp)) { 174 while (fgets (tmpbuf, MAX_BUF - 1, fp))
177 if (tmpbuf[0] == '#') continue; /* ignore comments */ 175 {
176 if (tmpbuf[0] == '#')
177 continue; /* ignore comments */
178
179 if (online == 0)
178 180 {
179 if (online == 0) {
180 tmpbuf[strlen(tmpbuf)-1] = 0; /* kill newline */ 181 tmpbuf[strlen (tmpbuf) - 1] = 0; /* kill newline */
181 settings.emergency_mapname = strdup_local(tmpbuf); 182 settings.emergency_mapname = strdup_local (tmpbuf);
182 } 183 }
183 else if (online == 1) { 184 else if (online == 1)
185 {
184 settings.emergency_x = atoi(tmpbuf); 186 settings.emergency_x = atoi (tmpbuf);
185 } 187 }
186 188
187 else if (online == 2) { 189 else if (online == 2)
190 {
188 settings.emergency_y = atoi(tmpbuf); 191 settings.emergency_y = atoi (tmpbuf);
189 } 192 }
190 online++; 193 online++;
191 if (online>2) break; 194 if (online > 2)
195 break;
192 } 196 }
193 fclose(fp); 197 fclose (fp);
194 if (online<=2) 198 if (online <= 2)
195 LOG(llevError,"Online read partial data from %s\n", filename); 199 LOG (llevError, "Online read partial data from %s\n", filename);
196 LOG(llevDebug,"Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname, 200 LOG (llevDebug, "Emergency mappath reset to %s (%d, %d)\n", settings.emergency_mapname, settings.emergency_x, settings.emergency_y);
197 settings.emergency_x, settings.emergency_y);
198 }
199}
200 201 }
202}
203
201 204
202/* 205/*
203 * It is vital that init_library() is called by any functions 206 * It is vital that init_library() is called by any functions
204 * using this library. 207 * using this library.
205 * If you want to lessen the size of the program using the library, 208 * 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 209 * you can replace the call to init_library() with init_globals() and
207 * init_function_pointers(). Good idea to also call init_vars and 210 * init_function_pointers(). Good idea to also call init_vars and
208 * init_hash_table if you are doing any object loading. 211 * init_hash_table if you are doing any object loading.
209 */ 212 */
210 213
214void
211void init_library(void) { 215init_library (void)
216{
212 init_environ(); 217 init_environ ();
213 init_globals(); 218 init_globals ();
214 init_objects(); 219 init_objects ();
215 init_vars(); 220 init_vars ();
216 init_block(); 221 init_block ();
217 ReadBmapNames (); 222 ReadBmapNames ();
218 ReadSmooth(); 223 ReadSmooth ();
219 init_anim(); /* Must be after we read in the bitmaps */ 224 init_anim (); /* Must be after we read in the bitmaps */
220 init_archetypes(); /* Reads all archetypes from file */ 225 init_archetypes (); /* Reads all archetypes from file */
221 init_dynamic (); 226 init_dynamic ();
222 init_attackmess(); 227 init_attackmess ();
223 init_clocks(); 228 init_clocks ();
224 init_emergency_mappath(); 229 init_emergency_mappath ();
225 init_experience(); 230 init_experience ();
226} 231}
227 232
228 233
229/* init_environ initializes values from the environmental variables. 234/* init_environ initializes values from the environmental variables.
230 * it needs to be called very early, since command line options should 235 * it needs to be called very early, since command line options should
231 * overwrite these if specified. 236 * overwrite these if specified.
232 */ 237 */
238void
233void init_environ(void) { 239init_environ (void)
240{
234 char *cp; 241 char *cp;
235 242
236 cp=getenv("CROSSFIRE_LIBDIR"); 243 cp = getenv ("CROSSFIRE_LIBDIR");
244 if (cp)
237 if (cp) settings.datadir=cp; 245 settings.datadir = cp;
238 cp=getenv("CROSSFIRE_LOCALDIR"); 246 cp = getenv ("CROSSFIRE_LOCALDIR");
247 if (cp)
239 if (cp) settings.localdir=cp; 248 settings.localdir = cp;
240 cp=getenv("CROSSFIRE_PLAYERDIR"); 249 cp = getenv ("CROSSFIRE_PLAYERDIR");
250 if (cp)
241 if (cp) settings.playerdir=cp; 251 settings.playerdir = cp;
242 cp=getenv("CROSSFIRE_MAPDIR"); 252 cp = getenv ("CROSSFIRE_MAPDIR");
253 if (cp)
243 if (cp) settings.mapdir=cp; 254 settings.mapdir = cp;
244 cp=getenv("CROSSFIRE_ARCHETYPES"); 255 cp = getenv ("CROSSFIRE_ARCHETYPES");
256 if (cp)
245 if (cp) settings.archetypes=cp; 257 settings.archetypes = cp;
246 cp=getenv("CROSSFIRE_TREASURES"); 258 cp = getenv ("CROSSFIRE_TREASURES");
259 if (cp)
247 if (cp) settings.treasures=cp; 260 settings.treasures = cp;
248 cp=getenv("CROSSFIRE_UNIQUEDIR"); 261 cp = getenv ("CROSSFIRE_UNIQUEDIR");
262 if (cp)
249 if (cp) settings.uniquedir=cp; 263 settings.uniquedir = cp;
250 cp=getenv("CROSSFIRE_TEMPLATEDIR"); 264 cp = getenv ("CROSSFIRE_TEMPLATEDIR");
265 if (cp)
251 if (cp) settings.templatedir=cp; 266 settings.templatedir = cp;
252 cp=getenv("CROSSFIRE_TMPDIR"); 267 cp = getenv ("CROSSFIRE_TMPDIR");
268 if (cp)
253 if (cp) settings.tmpdir=cp; 269 settings.tmpdir = cp;
254} 270}
255 271
256 272
257/* 273/*
258 * Initialises all global variables. 274 * Initialises all global variables.
259 * Might use environment-variables as default for some of them. 275 * Might use environment-variables as default for some of them.
260 */ 276 */
261 277
278void
262void init_globals(void) { 279init_globals (void)
280{
263 if (settings.logfilename[0] == 0) { 281 if (settings.logfilename[0] == 0)
282 {
264 logfile = stderr; 283 logfile = stderr;
265 } 284 }
266 else if ((logfile=fopen(settings.logfilename, "a"))==NULL) { 285 else if ((logfile = fopen (settings.logfilename, "a")) == NULL)
286 {
267 fprintf(stderr,"Unable to open %s as the logfile - will use stderr instead\n", 287 fprintf (stderr, "Unable to open %s as the logfile - will use stderr instead\n", settings.logfilename);
268 settings.logfilename);
269 logfile = stderr; 288 logfile = stderr;
289 }
290 else
270 } 291 {
271 else {
272 setvbuf(logfile, NULL, _IOLBF, 0); 292 setvbuf (logfile, NULL, _IOLBF, 0);
273 } 293 }
274 exiting = 0; 294 exiting = 0;
275 first_player=NULL; 295 first_player = NULL;
276 first_friendly_object=NULL; 296 first_friendly_object = NULL;
277 first_map=NULL; 297 first_map = NULL;
278 first_treasurelist=NULL; 298 first_treasurelist = NULL;
279 first_artifactlist=NULL; 299 first_artifactlist = NULL;
280 first_archetype=NULL; 300 first_archetype = NULL;
281 *first_map_ext_path=0; 301 *first_map_ext_path = 0;
282 warn_archetypes=0; 302 warn_archetypes = 0;
283 nroftreasures = 0; 303 nroftreasures = 0;
284 nrofartifacts = 0; 304 nrofartifacts = 0;
285 nrofallowedstr=0; 305 nrofallowedstr = 0;
286 ring_arch = NULL; 306 ring_arch = NULL;
287 amulet_arch = NULL; 307 amulet_arch = NULL;
288 staff_arch = NULL; 308 staff_arch = NULL;
289 trying_emergency_save = 0; 309 trying_emergency_save = 0;
290 num_animations=0; 310 num_animations = 0;
291 animations_allocated=0; 311 animations_allocated = 0;
292 init_defaults(); 312 init_defaults ();
293} 313}
294 314
295/* 315/*
296 * Sets up and initialises the linked list of free and used objects. 316 * 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. 317 * Allocates a certain chunk of objects and puts them on the free list.
298 * Called by init_library(); 318 * Called by init_library();
299 */ 319 */
300 320
301void 321void
302init_objects(void) 322init_objects (void)
303{ 323{
304 /* Initialize all objects: */ 324 /* Initialize all objects: */
305 objects = NULL; 325 objects = NULL;
306 active_objects = NULL; 326 active_objects = NULL;
307} 327}
309/* 329/*
310 * Initialises global variables which can be changed by options. 330 * Initialises global variables which can be changed by options.
311 * Called by init_library(). 331 * Called by init_library().
312 */ 332 */
313 333
334void
314void init_defaults(void) { 335init_defaults (void)
336{
315 editor=0; 337 editor = 0;
316 nroferrors=0; 338 nroferrors = 0;
317} 339}
318 340
319 341
342void
320void init_dynamic (void) { 343init_dynamic (void)
344{
321 archetype *at = first_archetype; 345 archetype *at = first_archetype;
346
322 while (at) { 347 while (at)
348 {
323 if (at->clone.type == MAP) { 349 if (at->clone.type == MAP)
350 {
324 if (at->clone.race) { 351 if (at->clone.race)
352 {
325 strcpy (first_map_ext_path, at->clone.race); 353 strcpy (first_map_ext_path, at->clone.race);
326 } 354 }
327 if (EXIT_PATH (&at->clone)) { 355 if (EXIT_PATH (&at->clone))
356 {
328 strcpy (first_map_path, EXIT_PATH (&at->clone)); 357 strcpy (first_map_path, EXIT_PATH (&at->clone));
329 return; 358 return;
330 } 359 }
331 } 360 }
332 at = at->next; 361 at = at->next;
333 } 362 }
334 LOG(llevDebug,"You Need a archetype called 'map' and it have to contain start map\n"); 363 LOG (llevDebug, "You Need a archetype called 'map' and it have to contain start map\n");
335 exit (-1); 364 exit (-1);
336} 365}
337 366
338unsigned long todtick; 367unsigned long todtick;
339 368
340/* 369/*
341 * Write out the current time to the file so time does not 370 * Write out the current time to the file so time does not
342 * reset every time the server reboots. 371 * reset every time the server reboots.
343 */ 372 */
344 373
374void
345void write_todclock(void) 375write_todclock (void)
346{ 376{
347 char filename[MAX_BUF]; 377 char filename[MAX_BUF];
348 FILE *fp; 378 FILE *fp;
349 379
350 sprintf(filename, "%s/clockdata", settings.localdir); 380 sprintf (filename, "%s/clockdata", settings.localdir);
351 if ((fp = fopen(filename, "w")) == NULL) { 381 if ((fp = fopen (filename, "w")) == NULL)
382 {
352 LOG(llevError, "Cannot open %s for writing\n", filename); 383 LOG (llevError, "Cannot open %s for writing\n", filename);
353 return; 384 return;
354 } 385 }
355 fprintf(fp, "%lu", todtick); 386 fprintf (fp, "%lu", todtick);
356 fclose(fp); 387 fclose (fp);
357} 388}
358 389
359/* 390/*
360 * Initializes the gametime and TOD counters 391 * Initializes the gametime and TOD counters
361 * Called by init_library(). 392 * Called by init_library().
362 */ 393 */
363 394
395void
364void init_clocks(void) 396init_clocks (void)
365{ 397{
366 char filename[MAX_BUF]; 398 char filename[MAX_BUF];
367 FILE *fp; 399 FILE *fp;
368 static int has_been_done=0; 400 static int has_been_done = 0;
369 401
370 if (has_been_done) 402 if (has_been_done)
371 return; 403 return;
372 else 404 else
373 has_been_done = 1; 405 has_been_done = 1;
374 406
375 sprintf(filename, "%s/clockdata", settings.localdir); 407 sprintf (filename, "%s/clockdata", settings.localdir);
376 LOG(llevDebug, "Reading clockdata from %s...", filename); 408 LOG (llevDebug, "Reading clockdata from %s...", filename);
377 if ((fp = fopen(filename, "r")) == NULL) { 409 if ((fp = fopen (filename, "r")) == NULL)
410 {
378 LOG(llevError, "Can't open %s.\n", filename); 411 LOG (llevError, "Can't open %s.\n", filename);
379 todtick = 0; 412 todtick = 0;
380 write_todclock(); 413 write_todclock ();
381 return; 414 return;
382 } 415 }
383 fscanf(fp, "%lu", &todtick); 416 fscanf (fp, "%lu", &todtick);
384 LOG(llevDebug, "todtick=%lu\n", todtick); 417 LOG (llevDebug, "todtick=%lu\n", todtick);
385 fclose(fp); 418 fclose (fp);
386} 419}
387 420
388/* 421/*
389 * Initializes the attack messages. 422 * Initializes the attack messages.
390 * Called by init_library(). 423 * Called by init_library().
391 */ 424 */
392 425
393//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS]; 426//attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
394 427
428void
395void init_attackmess(void){ 429init_attackmess (void)
430{
396 char buf[MAX_BUF]; 431 char buf[MAX_BUF];
397 char filename[MAX_BUF]; 432 char filename[MAX_BUF];
398 char *cp, *p; 433 char *cp, *p;
399 FILE *fp; 434 FILE *fp;
400 static int has_been_done=0; 435 static int has_been_done = 0;
401 int mess, level, comp; 436 int mess, level, comp;
402 int mode=0, total=0; 437 int mode = 0, total = 0;
403 438
404 if (has_been_done) 439 if (has_been_done)
405 return; 440 return;
406 else 441 else
407 has_been_done = 1; 442 has_been_done = 1;
408 443
409 sprintf(filename, "%s/attackmess", settings.datadir); 444 sprintf (filename, "%s/attackmess", settings.datadir);
410 LOG(llevDebug, "Reading attack messages from %s...", filename); 445 LOG (llevDebug, "Reading attack messages from %s...", filename);
411 if ((fp = open_and_uncompress(filename, 0, &comp)) == NULL) { 446 if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
447 {
412 LOG(llevError, "Can't open %s.\n", filename); 448 LOG (llevError, "Can't open %s.\n", filename);
413 return; 449 return;
414 } 450 }
415 451
416 level = 0; 452 level = 0;
417 while (fgets(buf, MAX_BUF, fp)!=NULL) { 453 while (fgets (buf, MAX_BUF, fp) != NULL)
418 if (*buf=='#') continue; 454 {
455 if (*buf == '#')
456 continue;
419 if((cp=strchr(buf,'\n'))!=NULL) 457 if ((cp = strchr (buf, '\n')) != NULL)
420 *cp='\0'; 458 *cp = '\0';
421 cp=buf; 459 cp = buf;
422 while(*cp==' ') /* Skip blanks */ 460 while (*cp == ' ') /* Skip blanks */
423 cp++; 461 cp++;
424 462
425 if (strncmp(cp, "TYPE:", 5)==0) { 463 if (strncmp (cp, "TYPE:", 5) == 0)
464 {
426 p = strtok(buf, ":"); 465 p = strtok (buf, ":");
427 p = strtok(NULL, ":"); 466 p = strtok (NULL, ":");
428 if (mode == 1) { 467 if (mode == 1)
468 {
429 attack_mess[mess][level].level = -1; 469 attack_mess[mess][level].level = -1;
430 attack_mess[mess][level].buf1 = NULL; 470 attack_mess[mess][level].buf1 = NULL;
431 attack_mess[mess][level].buf2 = NULL; 471 attack_mess[mess][level].buf2 = NULL;
432 attack_mess[mess][level].buf3 = NULL; 472 attack_mess[mess][level].buf3 = NULL;
433 } 473 }
434 level = 0; 474 level = 0;
435 mess = atoi(p); 475 mess = atoi (p);
436 mode = 1; 476 mode = 1;
437 continue; 477 continue;
438 } 478 }
439 if (mode==1) { 479 if (mode == 1)
480 {
440 p = strtok(buf, "="); 481 p = strtok (buf, "=");
441 attack_mess[mess][level].level = atoi(buf); 482 attack_mess[mess][level].level = atoi (buf);
442 p = strtok(NULL, "="); 483 p = strtok (NULL, "=");
443 if (p != NULL) 484 if (p != NULL)
444 attack_mess[mess][level].buf1 = strdup_local(p); 485 attack_mess[mess][level].buf1 = strdup_local (p);
445 else 486 else
446 attack_mess[mess][level].buf1 = strdup_local(""); 487 attack_mess[mess][level].buf1 = strdup_local ("");
447 mode = 2; 488 mode = 2;
448 continue; 489 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 } 490 }
491 else if (mode == 2)
492 {
493 p = strtok (buf, "=");
494 attack_mess[mess][level].level = atoi (buf);
495 p = strtok (NULL, "=");
496 if (p != NULL)
497 attack_mess[mess][level].buf2 = strdup_local (p);
498 else
499 attack_mess[mess][level].buf2 = strdup_local ("");
500 mode = 3;
501 continue;
502 }
503 else if (mode == 3)
504 {
505 p = strtok (buf, "=");
506 attack_mess[mess][level].level = atoi (buf);
507 p = strtok (NULL, "=");
508 if (p != NULL)
509 attack_mess[mess][level].buf3 = strdup_local (p);
510 else
511 attack_mess[mess][level].buf3 = strdup_local ("");
512 mode = 1;
513 level++;
514 total++;
515 continue;
516 }
472 } 517 }
473 LOG(llevDebug, "got %d messages in %d categories.\n", total, mess+1); 518 LOG (llevDebug, "got %d messages in %d categories.\n", total, mess + 1);
474 close_and_delete(fp, comp); 519 close_and_delete (fp, comp);
475} 520}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines