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.18 by root, Sat Dec 16 17:16:52 2006 UTC vs.
Revision 1.56 by root, Sun Jul 1 05:00:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <material.h> 25#include <material.h>
26#include <loader.h> 26#include <loader.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 27#include <sproto.h>
29#endif
30
31/* global weathermap */
32weathermap_t **weathermap;
33 28
34void 29void
35set_logfile (char *val) 30set_logfile (char *val)
36{ 31{
37 settings.logfilename = val; 32 settings.logfilename = val;
… …
241 * pass system very easy, and it is very easy to add in new options. 236 * pass system very easy, and it is very easy to add in new options.
242 */ 237 */
243struct Command_Line_Options options[] = { 238struct Command_Line_Options options[] = {
244 239
245/* Pass 1 functions - STuff that can/should be called before we actually 240/* Pass 1 functions - STuff that can/should be called before we actually
246 * initialize any data. 241 * initialise any data.
247 */ 242 */
248 {"-h", 0, 1, help}, 243 {"-h", 0, 1, help},
249 244
250/* Honor -help also, since it is somewhat common */ 245/* Honor -help also, since it is somewhat common */
251 {"-help", 0, 1, help}, 246 {"-help", 0, 1, help},
… …
378} 373}
379 374
380static void 375static void
381load_materials (void) 376load_materials (void)
382{ 377{
383 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 378 char filename[MAX_BUF];
384 FILE *fp;
385 materialtype_t *mt; 379 materialtype_t *mt;
386 int i, value;
387 380
388 sprintf (filename, "%s/materials", settings.datadir); 381 sprintf (filename, "%s/materials", settings.datadir);
389 LOG (llevDebug, "Reading material type data from %s...", filename); 382 LOG (llevDebug, "Reading material type data from %s...\n", filename);
390 if ((fp = fopen (filename, "r")) == NULL) 383
384 object_thawer thawer (filename);
385
386 if (!thawer)
391 { 387 {
392 LOG (llevError, "Cannot open %s for reading\n", filename); 388 LOG (llevError, "Cannot open %s for reading\n", filename);
393 mt = get_empty_mat (); 389 mt = get_empty_mat ();
394 mt->next = NULL; 390 mt->next = 0;
395 materialt = mt; 391 materialt = mt;
396 return; 392 return;
397 } 393 }
394
398 mt = get_empty_mat (); 395 mt = get_empty_mat ();
399 materialt = mt; 396 materialt = mt;
400 while (fgets (buf, MAX_BUF, fp) != NULL) 397
398 for (;;)
401 { 399 {
402 if (*buf == '#') 400 thawer.next ();
403 continue; 401
404 if ((cp = strchr (buf, '\n')) != NULL) 402 switch (thawer.kw)
405 *cp = '\0';
406 cp = buf;
407 while (*cp == ' ') /* Skip blanks */
408 cp++;
409 if (!strncmp (cp, "name", 4))
410 { 403 {
404 case KW_name:
411 /* clean up the previous entry */ 405 /* clean up the previous entry */
412 if (mt->next != NULL) 406 if (mt->next)
413 { 407 {
414 if (mt->description == NULL) 408 if (!mt->description)
415 mt->description = mt->name; 409 mt->description = mt->name;
410
416 mt = mt->next; 411 mt = mt->next;
417 } 412 }
413
418 mt->next = get_empty_mat (); 414 mt->next = get_empty_mat ();
419 mt->name = strchr (cp, ' ') + 1; 415 thawer.get (mt->name);
420 } 416 break;
421 else if (!strncmp (cp, "description", 11)) 417
418 case KW_description:
419 thawer.get (mt->description);
420 break;
421
422 case KW_material:
423 thawer.get (mt->material);
424 break;
425
426 case KW_saves:
422 { 427 {
423 mt->description = strchr (cp, ' ') + 1; 428 const char *cp = thawer.get_str () - 1;
424 } 429
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++) 430 for (int i = 0; i < NROFATTACKS; i++)
433 {
434 if (cp == NULL)
435 { 431 {
432 if (!cp)
433 {
436 mt->save[i] = 0; 434 mt->save[i] = 0;
437 continue; 435 continue;
436 }
437
438 int value;
439 ++cp;
440 sscanf (cp, "%d", &value);
441 mt->save[i] = (sint8) value;
442 cp = strchr (cp, ',');
438 } 443 }
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 { 444 }
451 if (cp == NULL) 445 break;
446
447 case KW_mods:
448 {
449 const char *cp = thawer.get_str () - 1;
450
451 for (int i = 0; i < NROFATTACKS; i++)
452 { 452 {
453 if (!cp)
454 {
453 mt->save[i] = 0; 455 mt->save[i] = 0;
454 continue; 456 continue;
457 }
458
459 ++cp;
460 int value;
461 sscanf (cp, "%d", &value);
462 mt->mod[i] = (sint8) value;
463 cp = strchr (cp, ',');
455 } 464 }
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 } 465 }
463 else if (sscanf (cp, "chance %d\n", &value)) 466 break;
467
468 case KW_chance: thawer.get (mt->chance); break;
469 case KW_difficulty: // cf+ alias, not original cf
470 case KW_diff: thawer.get (mt->difficulty); break;
471 case KW_magic: thawer.get (mt->magic); break;
472 case KW_dam: // cf+ alias, not original cf
473 case KW_damage: thawer.get (mt->damage); break;
474 case KW_wc: thawer.get (mt->wc); break;
475 case KW_ac: thawer.get (mt->ac); break;
476 case KW_sp: thawer.get (mt->sp); break;
477 case KW_weight: thawer.get (mt->weight); break;
478 case KW_value: thawer.get (mt->value); break;
479 case KW_density: thawer.get (mt->density); break;
480
481 case KW_EOF:
482 goto done;
483
484 default:
485 if (!thawer.parse_error ("materials file", "materials"))
486 goto done;
487 break;
464 { 488 }
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 } 489 }
490
491done:
500 if (mt->next) 492 if (mt->next)
501 { 493 {
502 delete mt->next; 494 delete mt->next;
503 495
504 mt->next = NULL; 496 mt->next = 0;
505 } 497 }
498
506 LOG (llevDebug, "Done.\n"); 499 LOG (llevDebug, "Done.\n");
507 fclose (fp);
508} 500}
509 501
510/* This loads the settings file. There could be debate whether this should 502/* 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 503 * be here or in the common directory - but since only the server needs this
512 * information, having it here probably makes more sense. 504 * information, having it here probably makes more sense.
… …
522 514
523 /* We don't require a settings file at current time, but down the road, 515 /* 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 516 * there will probably be so many values that not having a settings file
525 * will not be a good thing. 517 * will not be a good thing.
526 */ 518 */
527 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 519 if (!(fp = open_and_uncompress (buf, 0, &comp)))
528 { 520 {
529 LOG (llevError, "Warning: No settings file found\n"); 521 LOG (llevError, "Error: No settings file found\n");
530 return; 522 exit (1);
531 } 523 }
524
532 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 525 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
533 { 526 {
534 if (buf[0] == '#') 527 if (buf[0] == '#')
535 continue; 528 continue;
536 /* eliminate newline */ 529 /* eliminate newline */
… …
550 *cp++ = 0; 543 *cp++ = 0;
551 has_val = 1; 544 has_val = 1;
552 } 545 }
553 else 546 else
554 { 547 {
555 cp = ""; 548 cp = (char *)"";
556 has_val = 0; 549 has_val = 0;
557 } 550 }
558 551
559 if (!strcasecmp (buf, "motd")) 552 if (!strcasecmp (buf, "motd"))
560 { 553 {
… …
730 else 723 else
731 { 724 {
732 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp); 725 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp);
733 } 726 }
734 } 727 }
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, "recycle_tmp_maps"))
766 {
767 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
768 {
769 settings.recycle_tmp_maps = TRUE;
770 }
771 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
772 {
773 settings.recycle_tmp_maps = FALSE;
774 }
775 else
776 {
777 LOG (llevError, "load_settings: Unknown value for " "recycle_tmp_maps: %s\n", cp);
778 }
779 }
780 else if (!strcasecmp (buf, "explore_mode"))
781 {
782 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
783 {
784 settings.explore_mode = TRUE;
785 }
786 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
787 {
788 settings.explore_mode = FALSE;
789 }
790 else
791 {
792 LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
793 }
794 }
795 else if (!strcasecmp (buf, "spellpoint_level_depend")) 728 else if (!strcasecmp (buf, "spellpoint_level_depend"))
796 { 729 {
797 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 730 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
798 { 731 {
799 settings.spellpoint_level_depend = TRUE; 732 settings.spellpoint_level_depend = TRUE;
… …
903 } 836 }
904 else if (!strcasecmp (buf, "set_friendly_fire")) 837 else if (!strcasecmp (buf, "set_friendly_fire"))
905 { 838 {
906 int val = atoi (cp); 839 int val = atoi (cp);
907 840
908#if COZY_SERVER
909 if (val < 0 || val > 100) 841 if (val < 0 || val > 100)
910 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val); 842 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val);
911#else
912 if (val < 1 || val > 100)
913 LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
914#endif
915 else 843 else
916 settings.set_friendly_fire = val; 844 settings.set_friendly_fire = val;
917 } 845 }
918 else if (!strcasecmp (buf, "armor_max_enchant")) 846 else if (!strcasecmp (buf, "armor_max_enchant"))
919 { 847 {
… …
972 { 900 {
973 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp); 901 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp);
974 } 902 }
975 903
976 } 904 }
977 else if (!strcasecmp (buf, "no_player_stealing"))
978 {
979 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
980 {
981 settings.no_player_stealing = TRUE;
982 }
983 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
984 {
985 settings.no_player_stealing = FALSE;
986 }
987 else
988 {
989 LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
990 }
991
992 }
993 else if (!strcasecmp (buf, "create_home_portals"))
994 {
995 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
996 {
997 settings.create_home_portals = TRUE;
998 }
999 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
1000 {
1001 settings.create_home_portals = FALSE;
1002 }
1003 else
1004 {
1005 LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
1006 }
1007
1008 }
1009 else 905 else
1010 {
1011 LOG (llevError, "Unknown value in settings file: %s\n", buf); 906 LOG (llevError, "Unknown value in settings file: %s\n", buf);
1012 }
1013 } 907 }
908
1014 close_and_delete (fp, comp); 909 close_and_delete (fp, comp);
1015} 910}
1016
1017 911
1018/* 912/*
1019 * init() is called only once, when starting the program. 913 * init() is called only once, when starting the program.
1020 */ 914 */
1021
1022void 915void
1023init (int argc, char **argv) 916init (int argc, char **argv)
1024{ 917{
1025 init_done = 0; /* Must be done before init_signal() */ 918 init_done = 0; /* Must be done before init_signal() */
919 rndm.seed (time (0));
920
1026 logfile = stderr; 921 logfile = stderr;
922 init_environ ();
1027 parse_args (argc, argv, 1); /* First arg pass - right now it does 923 parse_args (argc, argv, 1); /* First arg pass - right now it does
1028 * nothing, but in future specifying the 924 * nothing, but in future specifying the
1029 * LibDir in this pass would be reasonable*/ 925 * LibDir in this pass would be reasonable*/
1030 926
927 init_anim (); // Must be called before perl
1031 cfperl_init (); 928 cfperl_init ();
1032 init_library (); /* Must be called early */ 929 init_library (); /* Must be called early */
1033 load_settings (); /* Load the settings file */ 930 load_settings (); /* Load the settings file */
1034 init_weather ();
1035 load_materials (); 931 load_materials ();
1036 parse_args (argc, argv, 2); 932 parse_args (argc, argv, 2);
1037 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 933 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
934 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
1038 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 935 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1039 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 936 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1040 937
1041 if (strcmp (settings.dm_mail, "") != 0) 938 if (strcmp (settings.dm_mail, "") != 0)
1042 { 939 {
1043 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 940 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1044 fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); 941 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
1045 } 942 }
1046 943
1047 SRANDOM (time (NULL));
1048
1049 init_startup (); /* Write (C), check shutdown/forbid files */ 944 init_startup (); /* Write (C), check shutdown/forbid files */
1050 init_uuid (); 945 init_uuid ();
1051 init_signals (); /* Sets up signal interceptions */ 946 init_signals (); /* Sets up signal interceptions */
1052 init_commands (); /* Sort command tables */ 947 init_commands (); /* Sort command tables */
1053 read_map_log (); /* Load up the old temp map files */
1054 init_skills (); 948 init_skills ();
1055 949
1056 parse_args (argc, argv, 3); 950 parse_args (argc, argv, 3);
1057 951
1058 if (settings.daemonmode)
1059 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1060
1061 init_beforeplay (); 952 init_beforeplay ();
1062 init_ericserver ();
1063 init_done = 1; 953 init_done = 1;
1064} 954}
1065 955
1066void 956void
1067usage (void) 957usage (void)
… …
1115} 1005}
1116 1006
1117void 1007void
1118init_beforeplay (void) 1008init_beforeplay (void)
1119{ 1009{
1120 init_archetypes (); /* If not called before, reads all archetypes from file */
1121 init_artifacts (); /* If not called before, reads all artifacts from file */ 1010 init_artifacts (); /* If not called before, reads all artifacts from file */
1122 init_spells (); /* If not called before, links archtypes used by spells */ 1011 init_spells (); /* If not called before, links archtypes used by spells */
1123 init_regions (); /* If not called before, reads all regions from file */
1124 init_archetype_pointers (); /* Setup global pointers to archetypes */ 1012 init_archetype_pointers (); /* Setup global pointers to archetypes */
1125 init_races (); /* overwrite race designations using entries in lib/races file */ 1013 init_races (); /* overwrite race designations using entries in lib/races file */
1126 init_gods (); /* init linked list of gods from archs */ 1014 init_gods (); /* init linked list of gods from archs */
1127 init_readable (); /* inits useful arrays for readable texts */ 1015 init_readable (); /* inits useful arrays for readable texts */
1128 init_formulae (); /* If not called before, reads formulae from file */ 1016 init_formulae (); /* If not called before, reads formulae from file */
1129
1130 switch (settings.dumpvalues)
1131 {
1132 case 1:
1133 print_monsters ();
1134 exit (0);
1135 case 2:
1136 dump_abilities ();
1137 exit (0);
1138 case 3:
1139 dump_artifacts ();
1140 exit (0);
1141 case 4:
1142 dump_spells ();
1143 exit (0);
1144 case 5:
1145 exit (0);
1146 case 6:
1147 dump_races ();
1148 exit (0);
1149 case 7:
1150 dump_alchemy ();
1151 exit (0);
1152 case 9:
1153 dump_alchemy_costs ();
1154 exit (0);
1155 case 10:
1156 dump_monster_treasure (settings.dumparg);
1157 exit (0);
1158 }
1159} 1017}
1160 1018
1161void 1019void
1162init_startup (void) 1020init_startup (void)
1163{ 1021{
… …
1228 printf ("Save player:\t<true>\n"); 1086 printf ("Save player:\t<true>\n");
1229 printf ("Save mode:\t%4.4o\n", SAVE_MODE); 1087 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1230 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir); 1088 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1231 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir); 1089 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1232 printf ("Tmpdir:\t\t%s\n", settings.tmpdir); 1090 printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
1233 printf ("Map max timeout:\t%d\n", MAP_MAXTIMEOUT);
1234 printf ("Max objects:\t%d\n", MAX_OBJECTS);
1235#ifdef USE_CALLOC 1091#ifdef USE_CALLOC
1236 printf ("Use_calloc:\t<true>\n"); 1092 printf ("Use_calloc:\t<true>\n");
1237#else 1093#else
1238 printf ("Use_calloc:\t<false>\n"); 1094 printf ("Use_calloc:\t<false>\n");
1239#endif 1095#endif
… …
1249 exit (-1); 1105 exit (-1);
1250} 1106}
1251 1107
1252/* Signal handlers: */ 1108/* Signal handlers: */
1253 1109
1254void 1110static void
1111rec_sigabrt (int i)
1112{
1113 signal (SIGABRT, SIG_DFL);
1114
1115 LOG (llevError, "SIGABRT received.\n");
1116 cleanup ("SIGABRT received", 1);
1117}
1118
1119static void
1255rec_sigsegv (int i) 1120rec_sigsegv (int i)
1256{ 1121{
1122 signal (SIGSEGV, SIG_DFL);
1123
1257 LOG (llevError, "\nSIGSEGV received.\n"); 1124 LOG (llevError, "SIGSEGV received.\n");
1258 fatal_signal (1, 1); 1125 cleanup ("SIGSEGV received", 1);
1259} 1126}
1260 1127
1261void 1128static void
1262rec_sigint (int i)
1263{
1264 LOG (llevInfo, "\nSIGINT received.\n");
1265 fatal_signal (0, 1);
1266}
1267
1268void
1269rec_sighup (int i)
1270{
1271 LOG (llevInfo, "\nSIGHUP received\n");
1272 if (init_done)
1273 {
1274 emergency_save (0);
1275 cleanup ();
1276 }
1277 exit (0);
1278}
1279
1280void
1281rec_sigquit (int i) 1129rec_sigquit (int i)
1282{ 1130{
1131 signal (SIGQUIT, SIG_IGN);
1132
1283 LOG (llevInfo, "\nSIGQUIT received\n"); 1133 LOG (llevInfo, "SIGQUIT received\n");
1284 fatal_signal (1, 1); 1134 cleanup ("SIGQUIT received", 1);
1285} 1135}
1286 1136
1287void 1137static void
1288rec_sigbus (int i) 1138rec_sigbus (int i)
1289{ 1139{
1290#ifdef SIGBUS 1140 signal (SIGBUS, SIG_DFL);
1141
1291 LOG (llevError, "\nSIGBUS received\n"); 1142 LOG (llevError, "SIGBUS received\n");
1292 fatal_signal (1, 1); 1143 cleanup ("SIGBUS received", 1);
1293#endif
1294} 1144}
1295 1145
1296void 1146void
1297rec_sigterm (int i) 1147reset_signals ()
1298{ 1148{
1299 LOG (llevInfo, "\nSIGTERM received\n"); 1149 signal (SIGABRT, SIG_DFL);
1300 fatal_signal (0, 1); 1150 signal (SIGQUIT, SIG_DFL);
1301} 1151 signal (SIGSEGV, SIG_DFL);
1302 1152 signal (SIGBUS , SIG_DFL);
1303void 1153 signal (SIGINT , SIG_DFL);
1304fatal_signal (int make_core, int close_sockets) 1154 signal (SIGTERM, SIG_DFL);
1305{
1306 if (init_done)
1307 {
1308 cleanup ();
1309 //emergency_save (0);
1310 //clean_tmp_files ();
1311 }
1312
1313 if (make_core)
1314 abort ();
1315
1316 exit (0);
1317} 1155}
1318 1156
1319void 1157void
1320init_signals (void) 1158init_signals (void)
1321{ 1159{
1322 signal (SIGHUP, rec_sighup); 1160 // large stack, but it's important data we want to save, and it is not usually
1323 signal (SIGINT, rec_sigint); 1161 // being physically allocated anyways
1324 signal (SIGQUIT, rec_sigquit); 1162 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1325 signal (SIGSEGV, rec_sigsegv); 1163
1326 signal (SIGPIPE, SIG_IGN); 1164 stack_t ss;
1327#ifdef SIGBUS 1165 ss.ss_sp = malloc (stacksize);
1328 signal (SIGBUS, rec_sigbus); 1166 ss.ss_flags = 0;
1329#endif 1167 ss.ss_size = stacksize;
1330 signal (SIGTERM, rec_sigterm); 1168 sigaltstack (&ss, 0);
1169
1170 struct sigaction sa;
1171
1172 sigfillset (&sa.sa_mask);
1173 sa.sa_flags = SA_RESTART;
1174
1175 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
1176 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
1177 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
1178 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1179
1180 sa.sa_flags |= SA_ONSTACK;
1181 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1331} 1182}
1332 1183
1333/* init_races() - reads the races file in the lib/ directory, then 1184/* init_races() - reads the races file in the lib/ directory, then
1334 * overwrites old 'race' entries. This routine allow us to quickly 1185 * overwrites old 'race' entries. This routine allow us to quickly
1335 * re-configure the 'alignment' of monsters, objects. Useful for 1186 * re-configure the 'alignment' of monsters, objects. Useful for
1336 * putting together lists of creatures, etc that belong to gods. 1187 * putting together lists of creatures, etc that belong to gods.
1337 */ 1188 */
1338
1339void 1189void
1340init_races (void) 1190init_races (void)
1341{ 1191{
1342 FILE *file; 1192 FILE *file;
1343 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 1193 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
… …
1348 return; 1198 return;
1349 init_done = 1; 1199 init_done = 1;
1350 first_race = 0; 1200 first_race = 0;
1351 1201
1352 sprintf (fname, "%s/races", settings.datadir); 1202 sprintf (fname, "%s/races", settings.datadir);
1353 LOG (llevDebug, "Reading races from %s...", fname); 1203 LOG (llevDebug, "Reading races from %s...\n", fname);
1354 if (!(file = fopen (fname, "r"))) 1204 if (!(file = fopen (fname, "r")))
1355 { 1205 {
1356 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno)); 1206 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno));
1357 return; 1207 return;
1358 } 1208 }
… …
1376 set_list = 0; 1226 set_list = 0;
1377 cp++; 1227 cp++;
1378 } 1228 }
1379 1229
1380 if (sscanf (cp, "RACE %s", variable)) 1230 if (sscanf (cp, "RACE %s", variable))
1381 { /* set new race value */ 1231 /* set new race value */
1382 strcpy (race, variable); 1232 strcpy (race, variable);
1383 }
1384 else 1233 else
1385 { 1234 {
1386 char *cp1; 1235 char *cp1;
1387 1236
1388 /* Take out beginning spaces */ 1237 /* Take out beginning spaces */
… …
1399 if (cp[strlen (cp) - 1] == '\n') 1248 if (cp[strlen (cp) - 1] == '\n')
1400 cp[strlen (cp) - 1] = '\0'; 1249 cp[strlen (cp) - 1] = '\0';
1401 1250
1402 /* set creature race to race value */ 1251 /* set creature race to race value */
1403 if ((mon = archetype::find (cp)) == NULL) 1252 if ((mon = archetype::find (cp)) == NULL)
1404 LOG (llevError, "\nCreature %s in race file lacks archetype", cp); 1253 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1405 else 1254 else
1406 { 1255 {
1407 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1256 if (set_race && (!mon->race || strcmp (mon->race, race)))
1408 { 1257 {
1409 if (mon->clone.race) 1258 if (mon->race)
1410 LOG (llevDebug, "\n Resetting race to %s from %s for archetype %s", race, &mon->clone.race, &mon->name); 1259 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1411 1260
1412 mon->clone.race = race; 1261 mon->race = race;
1413 } 1262 }
1414 1263
1415 /* if the arch is a monster, add it to the race list */ 1264 /* if the arch is a monster, add it to the race list */
1416 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1265 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1417 add_to_racelist (race, &mon->clone); 1266 add_to_racelist (race, mon);
1418 } 1267 }
1419 } 1268 }
1420 } 1269 }
1421 1270
1422 fclose (file); 1271 fclose (file);
… …
1431 1280
1432 for (list = first_race; list; list = list->next) 1281 for (list = first_race; list; list = list->next)
1433 { 1282 {
1434 fprintf (stderr, "\nRACE %s:\t", &list->name); 1283 fprintf (stderr, "\nRACE %s:\t", &list->name);
1435 for (tmp = list->member; tmp; tmp = tmp->next) 1284 for (tmp = list->member; tmp; tmp = tmp->next)
1436 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1285 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1437 } 1286 }
1438 1287
1439 fprintf (stderr, "\n"); 1288 fprintf (stderr, "\n");
1440} 1289}
1441 1290

Diff Legend

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