ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/init.C
(Generate patch)

Comparing deliantra/server/server/init.C (file contents):
Revision 1.21 by root, Wed Dec 20 09:14:22 2006 UTC vs.
Revision 1.50 by root, Thu May 17 14:14:55 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <material.h> 26#include <material.h>
26#include <loader.h> 27#include <loader.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 28#include <sproto.h>
29#endif
30
31/* global weathermap */
32weathermap_t **weathermap;
33 29
34void 30void
35set_logfile (char *val) 31set_logfile (char *val)
36{ 32{
37 settings.logfilename = val; 33 settings.logfilename = val;
… …
241 * pass system very easy, and it is very easy to add in new options. 237 * pass system very easy, and it is very easy to add in new options.
242 */ 238 */
243struct Command_Line_Options options[] = { 239struct Command_Line_Options options[] = {
244 240
245/* Pass 1 functions - STuff that can/should be called before we actually 241/* Pass 1 functions - STuff that can/should be called before we actually
246 * initialize any data. 242 * initialise any data.
247 */ 243 */
248 {"-h", 0, 1, help}, 244 {"-h", 0, 1, help},
249 245
250/* Honor -help also, since it is somewhat common */ 246/* Honor -help also, since it is somewhat common */
251 {"-help", 0, 1, help}, 247 {"-help", 0, 1, help},
… …
378} 374}
379 375
380static void 376static void
381load_materials (void) 377load_materials (void)
382{ 378{
383 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 379 char filename[MAX_BUF];
384 FILE *fp;
385 materialtype_t *mt; 380 materialtype_t *mt;
386 int i, value;
387 381
388 sprintf (filename, "%s/materials", settings.datadir); 382 sprintf (filename, "%s/materials", settings.datadir);
389 LOG (llevDebug, "Reading material type data from %s...", filename); 383 LOG (llevDebug, "Reading material type data from %s...\n", filename);
390 if ((fp = fopen (filename, "r")) == NULL) 384
385 object_thawer thawer (filename);
386
387 if (!thawer)
391 { 388 {
392 LOG (llevError, "Cannot open %s for reading\n", filename); 389 LOG (llevError, "Cannot open %s for reading\n", filename);
393 mt = get_empty_mat (); 390 mt = get_empty_mat ();
394 mt->next = NULL; 391 mt->next = 0;
395 materialt = mt; 392 materialt = mt;
396 return; 393 return;
397 } 394 }
395
398 mt = get_empty_mat (); 396 mt = get_empty_mat ();
399 materialt = mt; 397 materialt = mt;
400 while (fgets (buf, MAX_BUF, fp) != NULL) 398
399 for (;;)
401 { 400 {
402 if (*buf == '#') 401 switch (thawer.get_kv ())
403 continue;
404 if ((cp = strchr (buf, '\n')) != NULL)
405 *cp = '\0';
406 cp = buf;
407 while (*cp == ' ') /* Skip blanks */
408 cp++;
409 if (!strncmp (cp, "name", 4))
410 { 402 {
403 case KW_name:
411 /* clean up the previous entry */ 404 /* clean up the previous entry */
412 if (mt->next != NULL) 405 if (mt->next)
413 { 406 {
414 if (mt->description == NULL) 407 if (!mt->description)
415 mt->description = mt->name; 408 mt->description = mt->name;
409
416 mt = mt->next; 410 mt = mt->next;
417 } 411 }
412
418 mt->next = get_empty_mat (); 413 mt->next = get_empty_mat ();
419 mt->name = strchr (cp, ' ') + 1; 414 thawer.get (mt->name);
420 } 415 break;
421 else if (!strncmp (cp, "description", 11)) 416
417 case KW_description:
418 thawer.get (mt->description);
419 break;
420
421 case KW_material:
422 thawer.get (mt->material);
423 break;
424
425 case KW_saves:
422 { 426 {
423 mt->description = strchr (cp, ' ') + 1; 427 const char *cp = thawer.get_str () - 1;
424 } 428
425 else if (sscanf (cp, "material %d", &value))
426 {
427 mt->material = value;
428 }
429 else if (!strncmp (cp, "saves", 5))
430 {
431 cp = strchr (cp, ' ') + 1;
432 for (i = 0; i < NROFATTACKS; i++) 429 for (int i = 0; i < NROFATTACKS; i++)
433 {
434 if (cp == NULL)
435 { 430 {
431 if (!cp)
432 {
436 mt->save[i] = 0; 433 mt->save[i] = 0;
437 continue; 434 continue;
435 }
436
437 int value;
438 ++cp;
439 sscanf (cp, "%d", &value);
440 mt->save[i] = (sint8) value;
441 cp = strchr (cp, ',');
438 } 442 }
439 if ((next = strchr (cp, ',')) != NULL)
440 *(next++) = '\0';
441 sscanf (cp, "%d", &value);
442 mt->save[i] = (sint8) value;
443 cp = next;
444 }
445 }
446 else if (!strncmp (cp, "mods", 4))
447 {
448 cp = strchr (cp, ' ') + 1;
449 for (i = 0; i < NROFATTACKS; i++)
450 { 443 }
451 if (cp == NULL) 444 break;
445
446 case KW_mods:
447 {
448 const char *cp = thawer.get_str () - 1;
449
450 for (int i = 0; i < NROFATTACKS; i++)
452 { 451 {
452 if (!cp)
453 {
453 mt->save[i] = 0; 454 mt->save[i] = 0;
454 continue; 455 continue;
456 }
457
458 ++cp;
459 int value;
460 sscanf (cp, "%d", &value);
461 mt->mod[i] = (sint8) value;
462 cp = strchr (cp, ',');
455 } 463 }
456 if ((next = strchr (cp, ',')) != NULL)
457 *(next++) = '\0';
458 sscanf (cp, "%d", &value);
459 mt->mod[i] = (sint8) value;
460 cp = next;
461 }
462 } 464 }
463 else if (sscanf (cp, "chance %d\n", &value)) 465 break;
466
467 case KW_chance: thawer.get (mt->chance); break;
468 case KW_difficulty: // cf+ alias, not original cf
469 case KW_diff: thawer.get (mt->difficulty); break;
470 case KW_magic: thawer.get (mt->magic); break;
471 case KW_dam: // cf+ alias, not original cf
472 case KW_damage: thawer.get (mt->damage); break;
473 case KW_wc: thawer.get (mt->wc); break;
474 case KW_ac: thawer.get (mt->ac); break;
475 case KW_sp: thawer.get (mt->sp); break;
476 case KW_weight: thawer.get (mt->weight); break;
477 case KW_value: thawer.get (mt->value); break;
478 case KW_density: thawer.get (mt->density); break;
479
480 case KW_EOF:
481 goto done;
482
483 default:
484 if (!thawer.parse_error ("materials file", "materials"))
485 goto done;
486 break;
464 { 487 }
465 mt->chance = (sint8) value;
466 }
467 else if (sscanf (cp, "diff %d\n", &value))
468 {
469 mt->difficulty = (sint8) value;
470 }
471 else if (sscanf (cp, "magic %d\n", &value))
472 {
473 mt->magic = (sint8) value;
474 }
475 else if (sscanf (cp, "damage %d\n", &value))
476 {
477 mt->damage = (sint8) value;
478 }
479 else if (sscanf (cp, "wc %d\n", &value))
480 {
481 mt->wc = (sint8) value;
482 }
483 else if (sscanf (cp, "ac %d\n", &value))
484 {
485 mt->ac = (sint8) value;
486 }
487 else if (sscanf (cp, "sp %d\n", &value))
488 {
489 mt->sp = (sint8) value;
490 }
491 else if (sscanf (cp, "weight %d\n", &value))
492 {
493 mt->weight = value;
494 }
495 else if (sscanf (cp, "value %d\n", &value))
496 {
497 mt->value = value;
498 }
499 } 488 }
489
490done:
500 if (mt->next) 491 if (mt->next)
501 { 492 {
502 delete mt->next; 493 delete mt->next;
503 494
504 mt->next = NULL; 495 mt->next = 0;
505 } 496 }
497
506 LOG (llevDebug, "Done.\n"); 498 LOG (llevDebug, "Done.\n");
507 fclose (fp);
508} 499}
509 500
510/* This loads the settings file. There could be debate whether this should 501/* This loads the settings file. There could be debate whether this should
511 * be here or in the common directory - but since only the server needs this 502 * be here or in the common directory - but since only the server needs this
512 * information, having it here probably makes more sense. 503 * information, having it here probably makes more sense.
… …
522 513
523 /* We don't require a settings file at current time, but down the road, 514 /* We don't require a settings file at current time, but down the road,
524 * there will probably be so many values that not having a settings file 515 * there will probably be so many values that not having a settings file
525 * will not be a good thing. 516 * will not be a good thing.
526 */ 517 */
527 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 518 if (!(fp = open_and_uncompress (buf, 0, &comp)))
528 { 519 {
529 LOG (llevError, "Warning: No settings file found\n"); 520 LOG (llevError, "Error: No settings file found\n");
530 return; 521 exit (1);
531 } 522 }
523
532 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 524 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
533 { 525 {
534 if (buf[0] == '#') 526 if (buf[0] == '#')
535 continue; 527 continue;
536 /* eliminate newline */ 528 /* eliminate newline */
… …
550 *cp++ = 0; 542 *cp++ = 0;
551 has_val = 1; 543 has_val = 1;
552 } 544 }
553 else 545 else
554 { 546 {
555 cp = ""; 547 cp = (char *)"";
556 has_val = 0; 548 has_val = 0;
557 } 549 }
558 550
559 if (!strcasecmp (buf, "motd")) 551 if (!strcasecmp (buf, "motd"))
560 { 552 {
… …
730 else 722 else
731 { 723 {
732 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp); 724 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp);
733 } 725 }
734 } 726 }
735 else if (!strcasecmp (buf, "casting_time"))
736 {
737 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
738 {
739 settings.casting_time = TRUE;
740 }
741 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
742 {
743 settings.casting_time = FALSE;
744 }
745 else
746 {
747 LOG (llevError, "load_settings: Unknown value for " "casting_time: %s\n", cp);
748 }
749 }
750 else if (!strcasecmp (buf, "real_wiz"))
751 {
752 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
753 {
754 settings.real_wiz = TRUE;
755 }
756 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
757 {
758 settings.real_wiz = FALSE;
759 }
760 else
761 {
762 LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
763 }
764 }
765 else if (!strcasecmp (buf, "explore_mode"))
766 {
767 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
768 {
769 settings.explore_mode = TRUE;
770 }
771 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
772 {
773 settings.explore_mode = FALSE;
774 }
775 else
776 {
777 LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
778 }
779 }
780 else if (!strcasecmp (buf, "spellpoint_level_depend")) 727 else if (!strcasecmp (buf, "spellpoint_level_depend"))
781 { 728 {
782 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 729 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
783 { 730 {
784 settings.spellpoint_level_depend = TRUE; 731 settings.spellpoint_level_depend = TRUE;
… …
888 } 835 }
889 else if (!strcasecmp (buf, "set_friendly_fire")) 836 else if (!strcasecmp (buf, "set_friendly_fire"))
890 { 837 {
891 int val = atoi (cp); 838 int val = atoi (cp);
892 839
893#if COZY_SERVER
894 if (val < 0 || val > 100) 840 if (val < 0 || val > 100)
895 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val); 841 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val);
896#else
897 if (val < 1 || val > 100)
898 LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
899#endif
900 else 842 else
901 settings.set_friendly_fire = val; 843 settings.set_friendly_fire = val;
902 } 844 }
903 else if (!strcasecmp (buf, "armor_max_enchant")) 845 else if (!strcasecmp (buf, "armor_max_enchant"))
904 { 846 {
… …
957 { 899 {
958 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp); 900 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp);
959 } 901 }
960 902
961 } 903 }
962 else if (!strcasecmp (buf, "no_player_stealing"))
963 {
964 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
965 {
966 settings.no_player_stealing = TRUE;
967 }
968 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
969 {
970 settings.no_player_stealing = FALSE;
971 }
972 else
973 {
974 LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
975 }
976
977 }
978 else if (!strcasecmp (buf, "create_home_portals"))
979 {
980 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
981 {
982 settings.create_home_portals = TRUE;
983 }
984 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
985 {
986 settings.create_home_portals = FALSE;
987 }
988 else
989 {
990 LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
991 }
992
993 }
994 else 904 else
995 {
996 LOG (llevError, "Unknown value in settings file: %s\n", buf); 905 LOG (llevError, "Unknown value in settings file: %s\n", buf);
997 }
998 } 906 }
999 907
1000 close_and_delete (fp, comp); 908 close_and_delete (fp, comp);
1001} 909}
1002
1003 910
1004/* 911/*
1005 * init() is called only once, when starting the program. 912 * init() is called only once, when starting the program.
1006 */ 913 */
1007
1008void 914void
1009init (int argc, char **argv) 915init (int argc, char **argv)
1010{ 916{
1011 init_done = 0; /* Must be done before init_signal() */ 917 init_done = 0; /* Must be done before init_signal() */
918 rndm.seed (time (0));
919
1012 logfile = stderr; 920 logfile = stderr;
921 init_environ ();
1013 parse_args (argc, argv, 1); /* First arg pass - right now it does 922 parse_args (argc, argv, 1); /* First arg pass - right now it does
1014 * nothing, but in future specifying the 923 * nothing, but in future specifying the
1015 * LibDir in this pass would be reasonable*/ 924 * LibDir in this pass would be reasonable*/
1016 925
926 init_anim (); // Must be called before perl
1017 cfperl_init (); 927 cfperl_init ();
1018 init_library (); /* Must be called early */ 928 init_library (); /* Must be called early */
1019 load_settings (); /* Load the settings file */ 929 load_settings (); /* Load the settings file */
1020 init_weather ();
1021 load_materials (); 930 load_materials ();
1022 parse_args (argc, argv, 2); 931 parse_args (argc, argv, 2);
1023 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 932 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
933 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
1024 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 934 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1025 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 935 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1026 936
1027 if (strcmp (settings.dm_mail, "") != 0) 937 if (strcmp (settings.dm_mail, "") != 0)
1028 { 938 {
1029 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 939 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1030 fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); 940 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
1031 } 941 }
1032
1033 SRANDOM (time (NULL));
1034 942
1035 init_startup (); /* Write (C), check shutdown/forbid files */ 943 init_startup (); /* Write (C), check shutdown/forbid files */
1036 init_uuid (); 944 init_uuid ();
1037 init_signals (); /* Sets up signal interceptions */ 945 init_signals (); /* Sets up signal interceptions */
1038 init_commands (); /* Sort command tables */ 946 init_commands (); /* Sort command tables */
1039 read_map_log (); /* Load up the old temp map files */
1040 init_skills (); 947 init_skills ();
1041 948
1042 parse_args (argc, argv, 3); 949 parse_args (argc, argv, 3);
1043
1044 if (settings.daemonmode)
1045 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1046 950
1047 init_beforeplay (); 951 init_beforeplay ();
1048 init_ericserver (); 952 init_ericserver ();
1049 init_done = 1; 953 init_done = 1;
1050} 954}
… …
1101} 1005}
1102 1006
1103void 1007void
1104init_beforeplay (void) 1008init_beforeplay (void)
1105{ 1009{
1106 init_archetypes (); /* If not called before, reads all archetypes from file */
1107 init_artifacts (); /* If not called before, reads all artifacts from file */ 1010 init_artifacts (); /* If not called before, reads all artifacts from file */
1108 init_spells (); /* If not called before, links archtypes used by spells */ 1011 init_spells (); /* If not called before, links archtypes used by spells */
1109 init_regions (); /* If not called before, reads all regions from file */
1110 init_archetype_pointers (); /* Setup global pointers to archetypes */ 1012 init_archetype_pointers (); /* Setup global pointers to archetypes */
1111 init_races (); /* overwrite race designations using entries in lib/races file */ 1013 init_races (); /* overwrite race designations using entries in lib/races file */
1112 init_gods (); /* init linked list of gods from archs */ 1014 init_gods (); /* init linked list of gods from archs */
1113 init_readable (); /* inits useful arrays for readable texts */ 1015 init_readable (); /* inits useful arrays for readable texts */
1114 init_formulae (); /* If not called before, reads formulae from file */ 1016 init_formulae (); /* If not called before, reads formulae from file */
… …
1214 printf ("Save player:\t<true>\n"); 1116 printf ("Save player:\t<true>\n");
1215 printf ("Save mode:\t%4.4o\n", SAVE_MODE); 1117 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1216 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir); 1118 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1217 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir); 1119 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1218 printf ("Tmpdir:\t\t%s\n", settings.tmpdir); 1120 printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
1219 printf ("Map max timeout:\t%d\n", MAP_MAXTIMEOUT);
1220 printf ("Max objects:\t%d\n", MAX_OBJECTS);
1221#ifdef USE_CALLOC 1121#ifdef USE_CALLOC
1222 printf ("Use_calloc:\t<true>\n"); 1122 printf ("Use_calloc:\t<true>\n");
1223#else 1123#else
1224 printf ("Use_calloc:\t<false>\n"); 1124 printf ("Use_calloc:\t<false>\n");
1225#endif 1125#endif
… …
1235 exit (-1); 1135 exit (-1);
1236} 1136}
1237 1137
1238/* Signal handlers: */ 1138/* Signal handlers: */
1239 1139
1240void 1140static void
1141rec_sigabrt (int i)
1142{
1143 signal (SIGABRT, SIG_DFL);
1144
1145 LOG (llevError, "SIGABRT received.\n");
1146 cleanup ("SIGABRT received", 1);
1147}
1148
1149static void
1241rec_sigsegv (int i) 1150rec_sigsegv (int i)
1242{ 1151{
1152 signal (SIGSEGV, SIG_DFL);
1153
1243 LOG (llevError, "SIGSEGV received.\n"); 1154 LOG (llevError, "SIGSEGV received.\n");
1244 fatal_signal (1, 1); 1155 cleanup ("SIGSEGV received", 1);
1245} 1156}
1246 1157
1247void 1158static void
1248rec_sigint (int i)
1249{
1250 LOG (llevInfo, "SIGINT received.\n");
1251 fatal_signal (0, 1);
1252}
1253
1254void
1255rec_sighup (int i)
1256{
1257 LOG (llevInfo, "SIGHUP received\n");
1258
1259 if (init_done)
1260 cleanup ();
1261
1262 exit (0);
1263}
1264
1265void
1266rec_sigquit (int i) 1159rec_sigquit (int i)
1267{ 1160{
1161 signal (SIGQUIT, SIG_IGN);
1162
1268 LOG (llevInfo, "SIGQUIT received\n"); 1163 LOG (llevInfo, "SIGQUIT received\n");
1269 fatal_signal (1, 1); 1164 cleanup ("SIGQUIT received", 1);
1270} 1165}
1271 1166
1272void 1167static void
1273rec_sigbus (int i) 1168rec_sigbus (int i)
1274{ 1169{
1275#ifdef SIGBUS 1170 signal (SIGBUS, SIG_DFL);
1171
1276 LOG (llevError, "SIGBUS received\n"); 1172 LOG (llevError, "SIGBUS received\n");
1277 fatal_signal (1, 1); 1173 cleanup ("SIGBUS received", 1);
1278#endif
1279} 1174}
1280 1175
1281void 1176void
1282rec_sigterm (int i) 1177reset_signals ()
1283{ 1178{
1284 LOG (llevInfo, "SIGTERM received\n"); 1179 signal (SIGABRT, SIG_DFL);
1285 fatal_signal (0, 1); 1180 signal (SIGQUIT, SIG_DFL);
1286} 1181 signal (SIGSEGV, SIG_DFL);
1287 1182 signal (SIGBUS , SIG_DFL);
1288void 1183 signal (SIGINT , SIG_DFL);
1289fatal_signal (int make_core, int close_sockets) 1184 signal (SIGTERM, SIG_DFL);
1290{
1291 cleanup (make_core);
1292} 1185}
1293 1186
1294void 1187void
1295init_signals (void) 1188init_signals (void)
1296{ 1189{
1297 signal (SIGHUP, rec_sighup); 1190 // large stack, but it's important data we want to save, and it is not usually
1298 signal (SIGINT, rec_sigint); 1191 // being physically allocated anyways
1299 signal (SIGQUIT, rec_sigquit); 1192 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1300 signal (SIGSEGV, rec_sigsegv); 1193
1301 signal (SIGPIPE, SIG_IGN); 1194 stack_t ss;
1302#ifdef SIGBUS 1195 ss.ss_sp = malloc (stacksize);
1303 signal (SIGBUS, rec_sigbus); 1196 ss.ss_flags = 0;
1304#endif 1197 ss.ss_size = stacksize;
1305 signal (SIGTERM, rec_sigterm); 1198 sigaltstack (&ss, 0);
1199
1200 struct sigaction sa;
1201
1202 sigfillset (&sa.sa_mask);
1203 sa.sa_flags = SA_RESTART;
1204
1205 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
1206 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
1207 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
1208 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1209
1210 sa.sa_flags |= SA_ONSTACK;
1211 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1306} 1212}
1307 1213
1308/* init_races() - reads the races file in the lib/ directory, then 1214/* init_races() - reads the races file in the lib/ directory, then
1309 * overwrites old 'race' entries. This routine allow us to quickly 1215 * overwrites old 'race' entries. This routine allow us to quickly
1310 * re-configure the 'alignment' of monsters, objects. Useful for 1216 * re-configure the 'alignment' of monsters, objects. Useful for
1311 * putting together lists of creatures, etc that belong to gods. 1217 * putting together lists of creatures, etc that belong to gods.
1312 */ 1218 */
1313
1314void 1219void
1315init_races (void) 1220init_races (void)
1316{ 1221{
1317 FILE *file; 1222 FILE *file;
1318 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 1223 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
… …
1323 return; 1228 return;
1324 init_done = 1; 1229 init_done = 1;
1325 first_race = 0; 1230 first_race = 0;
1326 1231
1327 sprintf (fname, "%s/races", settings.datadir); 1232 sprintf (fname, "%s/races", settings.datadir);
1328 LOG (llevDebug, "Reading races from %s...", fname); 1233 LOG (llevDebug, "Reading races from %s...\n", fname);
1329 if (!(file = fopen (fname, "r"))) 1234 if (!(file = fopen (fname, "r")))
1330 { 1235 {
1331 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno)); 1236 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno));
1332 return; 1237 return;
1333 } 1238 }
… …
1351 set_list = 0; 1256 set_list = 0;
1352 cp++; 1257 cp++;
1353 } 1258 }
1354 1259
1355 if (sscanf (cp, "RACE %s", variable)) 1260 if (sscanf (cp, "RACE %s", variable))
1356 { /* set new race value */ 1261 /* set new race value */
1357 strcpy (race, variable); 1262 strcpy (race, variable);
1358 }
1359 else 1263 else
1360 { 1264 {
1361 char *cp1; 1265 char *cp1;
1362 1266
1363 /* Take out beginning spaces */ 1267 /* Take out beginning spaces */
… …
1374 if (cp[strlen (cp) - 1] == '\n') 1278 if (cp[strlen (cp) - 1] == '\n')
1375 cp[strlen (cp) - 1] = '\0'; 1279 cp[strlen (cp) - 1] = '\0';
1376 1280
1377 /* set creature race to race value */ 1281 /* set creature race to race value */
1378 if ((mon = archetype::find (cp)) == NULL) 1282 if ((mon = archetype::find (cp)) == NULL)
1379 LOG (llevError, "\nCreature %s in race file lacks archetype", cp); 1283 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1380 else 1284 else
1381 { 1285 {
1382 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1286 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race)))
1383 { 1287 {
1384 if (mon->clone.race) 1288 if (mon->clone.race)
1385 LOG (llevDebug, "\n Resetting race to %s from %s for archetype %s", race, &mon->clone.race, &mon->name); 1289 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name);
1386 1290
1387 mon->clone.race = race; 1291 mon->clone.race = race;
1388 } 1292 }
1389 1293
1390 /* if the arch is a monster, add it to the race list */ 1294 /* if the arch is a monster, add it to the race list */

Diff Legend

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