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.55 by root, Sat Jun 9 22:54:03 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 it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 to <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 thawer.next ();
403 continue; 402
404 if ((cp = strchr (buf, '\n')) != NULL) 403 switch (thawer.kw)
405 *cp = '\0';
406 cp = buf;
407 while (*cp == ' ') /* Skip blanks */
408 cp++;
409 if (!strncmp (cp, "name", 4))
410 { 404 {
405 case KW_name:
411 /* clean up the previous entry */ 406 /* clean up the previous entry */
412 if (mt->next != NULL) 407 if (mt->next)
413 { 408 {
414 if (mt->description == NULL) 409 if (!mt->description)
415 mt->description = mt->name; 410 mt->description = mt->name;
411
416 mt = mt->next; 412 mt = mt->next;
417 } 413 }
414
418 mt->next = get_empty_mat (); 415 mt->next = get_empty_mat ();
419 mt->name = strchr (cp, ' ') + 1; 416 thawer.get (mt->name);
420 } 417 break;
421 else if (!strncmp (cp, "description", 11)) 418
419 case KW_description:
420 thawer.get (mt->description);
421 break;
422
423 case KW_material:
424 thawer.get (mt->material);
425 break;
426
427 case KW_saves:
422 { 428 {
423 mt->description = strchr (cp, ' ') + 1; 429 const char *cp = thawer.get_str () - 1;
424 } 430
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++) 431 for (int i = 0; i < NROFATTACKS; i++)
433 {
434 if (cp == NULL)
435 { 432 {
433 if (!cp)
434 {
436 mt->save[i] = 0; 435 mt->save[i] = 0;
437 continue; 436 continue;
437 }
438
439 int value;
440 ++cp;
441 sscanf (cp, "%d", &value);
442 mt->save[i] = (sint8) value;
443 cp = strchr (cp, ',');
438 } 444 }
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 { 445 }
451 if (cp == NULL) 446 break;
447
448 case KW_mods:
449 {
450 const char *cp = thawer.get_str () - 1;
451
452 for (int i = 0; i < NROFATTACKS; i++)
452 { 453 {
454 if (!cp)
455 {
453 mt->save[i] = 0; 456 mt->save[i] = 0;
454 continue; 457 continue;
458 }
459
460 ++cp;
461 int value;
462 sscanf (cp, "%d", &value);
463 mt->mod[i] = (sint8) value;
464 cp = strchr (cp, ',');
455 } 465 }
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 } 466 }
463 else if (sscanf (cp, "chance %d\n", &value)) 467 break;
468
469 case KW_chance: thawer.get (mt->chance); break;
470 case KW_difficulty: // cf+ alias, not original cf
471 case KW_diff: thawer.get (mt->difficulty); break;
472 case KW_magic: thawer.get (mt->magic); break;
473 case KW_dam: // cf+ alias, not original cf
474 case KW_damage: thawer.get (mt->damage); break;
475 case KW_wc: thawer.get (mt->wc); break;
476 case KW_ac: thawer.get (mt->ac); break;
477 case KW_sp: thawer.get (mt->sp); break;
478 case KW_weight: thawer.get (mt->weight); break;
479 case KW_value: thawer.get (mt->value); break;
480 case KW_density: thawer.get (mt->density); break;
481
482 case KW_EOF:
483 goto done;
484
485 default:
486 if (!thawer.parse_error ("materials file", "materials"))
487 goto done;
488 break;
464 { 489 }
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 } 490 }
491
492done:
500 if (mt->next) 493 if (mt->next)
501 { 494 {
502 delete mt->next; 495 delete mt->next;
503 496
504 mt->next = NULL; 497 mt->next = 0;
505 } 498 }
499
506 LOG (llevDebug, "Done.\n"); 500 LOG (llevDebug, "Done.\n");
507 fclose (fp);
508} 501}
509 502
510/* This loads the settings file. There could be debate whether this should 503/* 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 504 * be here or in the common directory - but since only the server needs this
512 * information, having it here probably makes more sense. 505 * information, having it here probably makes more sense.
… …
522 515
523 /* We don't require a settings file at current time, but down the road, 516 /* 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 517 * there will probably be so many values that not having a settings file
525 * will not be a good thing. 518 * will not be a good thing.
526 */ 519 */
527 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 520 if (!(fp = open_and_uncompress (buf, 0, &comp)))
528 { 521 {
529 LOG (llevError, "Warning: No settings file found\n"); 522 LOG (llevError, "Error: No settings file found\n");
530 return; 523 exit (1);
531 } 524 }
525
532 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 526 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
533 { 527 {
534 if (buf[0] == '#') 528 if (buf[0] == '#')
535 continue; 529 continue;
536 /* eliminate newline */ 530 /* eliminate newline */
… …
550 *cp++ = 0; 544 *cp++ = 0;
551 has_val = 1; 545 has_val = 1;
552 } 546 }
553 else 547 else
554 { 548 {
555 cp = ""; 549 cp = (char *)"";
556 has_val = 0; 550 has_val = 0;
557 } 551 }
558 552
559 if (!strcasecmp (buf, "motd")) 553 if (!strcasecmp (buf, "motd"))
560 { 554 {
… …
730 else 724 else
731 { 725 {
732 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp); 726 LOG (llevError, "load_settings: Unknown value for " "spell_failure_effects: %s\n", cp);
733 } 727 }
734 } 728 }
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")) 729 else if (!strcasecmp (buf, "spellpoint_level_depend"))
781 { 730 {
782 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 731 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
783 { 732 {
784 settings.spellpoint_level_depend = TRUE; 733 settings.spellpoint_level_depend = TRUE;
… …
888 } 837 }
889 else if (!strcasecmp (buf, "set_friendly_fire")) 838 else if (!strcasecmp (buf, "set_friendly_fire"))
890 { 839 {
891 int val = atoi (cp); 840 int val = atoi (cp);
892 841
893#if COZY_SERVER
894 if (val < 0 || val > 100) 842 if (val < 0 || val > 100)
895 LOG (llevError, "load_settings: set_friendly_fire must be between 0 an 100" ", %d is invalid\n", val); 843 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 844 else
901 settings.set_friendly_fire = val; 845 settings.set_friendly_fire = val;
902 } 846 }
903 else if (!strcasecmp (buf, "armor_max_enchant")) 847 else if (!strcasecmp (buf, "armor_max_enchant"))
904 { 848 {
… …
957 { 901 {
958 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp); 902 LOG (llevError, "load_settings: unknown value for armor_speed_linear: %s\n", cp);
959 } 903 }
960 904
961 } 905 }
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 906 else
995 {
996 LOG (llevError, "Unknown value in settings file: %s\n", buf); 907 LOG (llevError, "Unknown value in settings file: %s\n", buf);
997 }
998 } 908 }
999 909
1000 close_and_delete (fp, comp); 910 close_and_delete (fp, comp);
1001} 911}
1002
1003 912
1004/* 913/*
1005 * init() is called only once, when starting the program. 914 * init() is called only once, when starting the program.
1006 */ 915 */
1007
1008void 916void
1009init (int argc, char **argv) 917init (int argc, char **argv)
1010{ 918{
1011 init_done = 0; /* Must be done before init_signal() */ 919 init_done = 0; /* Must be done before init_signal() */
920 rndm.seed (time (0));
921
1012 logfile = stderr; 922 logfile = stderr;
923 init_environ ();
1013 parse_args (argc, argv, 1); /* First arg pass - right now it does 924 parse_args (argc, argv, 1); /* First arg pass - right now it does
1014 * nothing, but in future specifying the 925 * nothing, but in future specifying the
1015 * LibDir in this pass would be reasonable*/ 926 * LibDir in this pass would be reasonable*/
1016 927
928 init_anim (); // Must be called before perl
1017 cfperl_init (); 929 cfperl_init ();
1018 init_library (); /* Must be called early */ 930 init_library (); /* Must be called early */
1019 load_settings (); /* Load the settings file */ 931 load_settings (); /* Load the settings file */
1020 init_weather ();
1021 load_materials (); 932 load_materials ();
1022 parse_args (argc, argv, 2); 933 parse_args (argc, argv, 2);
1023 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 934 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
935 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
1024 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n"); 936 fprintf (logfile, "Copyright (C) 1994 Mark Wedel.\n");
1025 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n"); 937 fprintf (logfile, "Copyright (C) 1992 Frank Tore Johansen.\n");
1026 938
1027 if (strcmp (settings.dm_mail, "") != 0) 939 if (strcmp (settings.dm_mail, "") != 0)
1028 { 940 {
1029 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 941 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1030 fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); 942 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
1031 } 943 }
1032 944
1033 SRANDOM (time (NULL));
1034
1035 init_startup (); /* Write (C), check shutdown/forbid files */ 945 init_startup (); /* Write (C), check shutdown/forbid files */
1036 init_uuid (); 946 init_uuid ();
1037 init_signals (); /* Sets up signal interceptions */ 947 init_signals (); /* Sets up signal interceptions */
1038 init_commands (); /* Sort command tables */ 948 init_commands (); /* Sort command tables */
1039 read_map_log (); /* Load up the old temp map files */
1040 init_skills (); 949 init_skills ();
1041 950
1042 parse_args (argc, argv, 3); 951 parse_args (argc, argv, 3);
1043 952
1044 if (settings.daemonmode)
1045 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1046
1047 init_beforeplay (); 953 init_beforeplay ();
1048 init_ericserver ();
1049 init_done = 1; 954 init_done = 1;
1050} 955}
1051 956
1052void 957void
1053usage (void) 958usage (void)
… …
1101} 1006}
1102 1007
1103void 1008void
1104init_beforeplay (void) 1009init_beforeplay (void)
1105{ 1010{
1106 init_archetypes (); /* If not called before, reads all archetypes from file */
1107 init_artifacts (); /* If not called before, reads all artifacts from file */ 1011 init_artifacts (); /* If not called before, reads all artifacts from file */
1108 init_spells (); /* If not called before, links archtypes used by spells */ 1012 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 */ 1013 init_archetype_pointers (); /* Setup global pointers to archetypes */
1111 init_races (); /* overwrite race designations using entries in lib/races file */ 1014 init_races (); /* overwrite race designations using entries in lib/races file */
1112 init_gods (); /* init linked list of gods from archs */ 1015 init_gods (); /* init linked list of gods from archs */
1113 init_readable (); /* inits useful arrays for readable texts */ 1016 init_readable (); /* inits useful arrays for readable texts */
1114 init_formulae (); /* If not called before, reads formulae from file */ 1017 init_formulae (); /* If not called before, reads formulae from file */
1115
1116 switch (settings.dumpvalues)
1117 {
1118 case 1:
1119 print_monsters ();
1120 exit (0);
1121 case 2:
1122 dump_abilities ();
1123 exit (0);
1124 case 3:
1125 dump_artifacts ();
1126 exit (0);
1127 case 4:
1128 dump_spells ();
1129 exit (0);
1130 case 5:
1131 exit (0);
1132 case 6:
1133 dump_races ();
1134 exit (0);
1135 case 7:
1136 dump_alchemy ();
1137 exit (0);
1138 case 9:
1139 dump_alchemy_costs ();
1140 exit (0);
1141 case 10:
1142 dump_monster_treasure (settings.dumparg);
1143 exit (0);
1144 }
1145} 1018}
1146 1019
1147void 1020void
1148init_startup (void) 1021init_startup (void)
1149{ 1022{
… …
1214 printf ("Save player:\t<true>\n"); 1087 printf ("Save player:\t<true>\n");
1215 printf ("Save mode:\t%4.4o\n", SAVE_MODE); 1088 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1216 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir); 1089 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1217 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir); 1090 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1218 printf ("Tmpdir:\t\t%s\n", settings.tmpdir); 1091 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 1092#ifdef USE_CALLOC
1222 printf ("Use_calloc:\t<true>\n"); 1093 printf ("Use_calloc:\t<true>\n");
1223#else 1094#else
1224 printf ("Use_calloc:\t<false>\n"); 1095 printf ("Use_calloc:\t<false>\n");
1225#endif 1096#endif
… …
1235 exit (-1); 1106 exit (-1);
1236} 1107}
1237 1108
1238/* Signal handlers: */ 1109/* Signal handlers: */
1239 1110
1240void 1111static void
1112rec_sigabrt (int i)
1113{
1114 signal (SIGABRT, SIG_DFL);
1115
1116 LOG (llevError, "SIGABRT received.\n");
1117 cleanup ("SIGABRT received", 1);
1118}
1119
1120static void
1241rec_sigsegv (int i) 1121rec_sigsegv (int i)
1242{ 1122{
1123 signal (SIGSEGV, SIG_DFL);
1124
1243 LOG (llevError, "SIGSEGV received.\n"); 1125 LOG (llevError, "SIGSEGV received.\n");
1244 fatal_signal (1, 1); 1126 cleanup ("SIGSEGV received", 1);
1245} 1127}
1246 1128
1247void 1129static 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) 1130rec_sigquit (int i)
1267{ 1131{
1132 signal (SIGQUIT, SIG_IGN);
1133
1268 LOG (llevInfo, "SIGQUIT received\n"); 1134 LOG (llevInfo, "SIGQUIT received\n");
1269 fatal_signal (1, 1); 1135 cleanup ("SIGQUIT received", 1);
1270} 1136}
1271 1137
1272void 1138static void
1273rec_sigbus (int i) 1139rec_sigbus (int i)
1274{ 1140{
1275#ifdef SIGBUS 1141 signal (SIGBUS, SIG_DFL);
1142
1276 LOG (llevError, "SIGBUS received\n"); 1143 LOG (llevError, "SIGBUS received\n");
1277 fatal_signal (1, 1); 1144 cleanup ("SIGBUS received", 1);
1278#endif
1279} 1145}
1280 1146
1281void 1147void
1282rec_sigterm (int i) 1148reset_signals ()
1283{ 1149{
1284 LOG (llevInfo, "SIGTERM received\n"); 1150 signal (SIGABRT, SIG_DFL);
1285 fatal_signal (0, 1); 1151 signal (SIGQUIT, SIG_DFL);
1286} 1152 signal (SIGSEGV, SIG_DFL);
1287 1153 signal (SIGBUS , SIG_DFL);
1288void 1154 signal (SIGINT , SIG_DFL);
1289fatal_signal (int make_core, int close_sockets) 1155 signal (SIGTERM, SIG_DFL);
1290{
1291 cleanup (make_core);
1292} 1156}
1293 1157
1294void 1158void
1295init_signals (void) 1159init_signals (void)
1296{ 1160{
1297 signal (SIGHUP, rec_sighup); 1161 // large stack, but it's important data we want to save, and it is not usually
1298 signal (SIGINT, rec_sigint); 1162 // being physically allocated anyways
1299 signal (SIGQUIT, rec_sigquit); 1163 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1300 signal (SIGSEGV, rec_sigsegv); 1164
1301 signal (SIGPIPE, SIG_IGN); 1165 stack_t ss;
1302#ifdef SIGBUS 1166 ss.ss_sp = malloc (stacksize);
1303 signal (SIGBUS, rec_sigbus); 1167 ss.ss_flags = 0;
1304#endif 1168 ss.ss_size = stacksize;
1305 signal (SIGTERM, rec_sigterm); 1169 sigaltstack (&ss, 0);
1170
1171 struct sigaction sa;
1172
1173 sigfillset (&sa.sa_mask);
1174 sa.sa_flags = SA_RESTART;
1175
1176 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
1177 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
1178 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
1179 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1180
1181 sa.sa_flags |= SA_ONSTACK;
1182 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1306} 1183}
1307 1184
1308/* init_races() - reads the races file in the lib/ directory, then 1185/* init_races() - reads the races file in the lib/ directory, then
1309 * overwrites old 'race' entries. This routine allow us to quickly 1186 * overwrites old 'race' entries. This routine allow us to quickly
1310 * re-configure the 'alignment' of monsters, objects. Useful for 1187 * re-configure the 'alignment' of monsters, objects. Useful for
1311 * putting together lists of creatures, etc that belong to gods. 1188 * putting together lists of creatures, etc that belong to gods.
1312 */ 1189 */
1313
1314void 1190void
1315init_races (void) 1191init_races (void)
1316{ 1192{
1317 FILE *file; 1193 FILE *file;
1318 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 1194 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
… …
1323 return; 1199 return;
1324 init_done = 1; 1200 init_done = 1;
1325 first_race = 0; 1201 first_race = 0;
1326 1202
1327 sprintf (fname, "%s/races", settings.datadir); 1203 sprintf (fname, "%s/races", settings.datadir);
1328 LOG (llevDebug, "Reading races from %s...", fname); 1204 LOG (llevDebug, "Reading races from %s...\n", fname);
1329 if (!(file = fopen (fname, "r"))) 1205 if (!(file = fopen (fname, "r")))
1330 { 1206 {
1331 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno)); 1207 LOG (llevError, "Cannot open races file %s: %s\n", fname, strerror (errno));
1332 return; 1208 return;
1333 } 1209 }
… …
1351 set_list = 0; 1227 set_list = 0;
1352 cp++; 1228 cp++;
1353 } 1229 }
1354 1230
1355 if (sscanf (cp, "RACE %s", variable)) 1231 if (sscanf (cp, "RACE %s", variable))
1356 { /* set new race value */ 1232 /* set new race value */
1357 strcpy (race, variable); 1233 strcpy (race, variable);
1358 }
1359 else 1234 else
1360 { 1235 {
1361 char *cp1; 1236 char *cp1;
1362 1237
1363 /* Take out beginning spaces */ 1238 /* Take out beginning spaces */
… …
1374 if (cp[strlen (cp) - 1] == '\n') 1249 if (cp[strlen (cp) - 1] == '\n')
1375 cp[strlen (cp) - 1] = '\0'; 1250 cp[strlen (cp) - 1] = '\0';
1376 1251
1377 /* set creature race to race value */ 1252 /* set creature race to race value */
1378 if ((mon = archetype::find (cp)) == NULL) 1253 if ((mon = archetype::find (cp)) == NULL)
1379 LOG (llevError, "\nCreature %s in race file lacks archetype", cp); 1254 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1380 else 1255 else
1381 { 1256 {
1382 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1257 if (set_race && (!mon->race || strcmp (mon->race, race)))
1383 { 1258 {
1384 if (mon->clone.race) 1259 if (mon->race)
1385 LOG (llevDebug, "\n Resetting race to %s from %s for archetype %s", race, &mon->clone.race, &mon->name); 1260 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1386 1261
1387 mon->clone.race = race; 1262 mon->race = race;
1388 } 1263 }
1389 1264
1390 /* if the arch is a monster, add it to the race list */ 1265 /* if the arch is a monster, add it to the race list */
1391 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1266 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1392 add_to_racelist (race, &mon->clone); 1267 add_to_racelist (race, mon);
1393 } 1268 }
1394 } 1269 }
1395 } 1270 }
1396 1271
1397 fclose (file); 1272 fclose (file);
… …
1406 1281
1407 for (list = first_race; list; list = list->next) 1282 for (list = first_race; list; list = list->next)
1408 { 1283 {
1409 fprintf (stderr, "\nRACE %s:\t", &list->name); 1284 fprintf (stderr, "\nRACE %s:\t", &list->name);
1410 for (tmp = list->member; tmp; tmp = tmp->next) 1285 for (tmp = list->member; tmp; tmp = tmp->next)
1411 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1286 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1412 } 1287 }
1413 1288
1414 fprintf (stderr, "\n"); 1289 fprintf (stderr, "\n");
1415} 1290}
1416 1291

Diff Legend

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