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.28 by pippijn, Wed Jan 3 00:46:53 2007 UTC vs.
Revision 1.58 by root, Sat Sep 8 09:15:50 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#include <sproto.h> 27#include <sproto.h>
… …
268 {"-detach", 0, 2, set_daemon}, 268 {"-detach", 0, 2, set_daemon},
269 269
270/* Start of pass 3 information. In theory, by pass 3, all data paths 270/* Start of pass 3 information. In theory, by pass 3, all data paths
271 * and defaults should have been set up. 271 * and defaults should have been set up.
272 */ 272 */
273 {"-o", 0, 3, compile_info},
274 {"-m", 0, 3, set_dumpmon1}, 273 {"-m", 0, 3, set_dumpmon1},
275 {"-m2", 0, 3, set_dumpmon2}, 274 {"-m2", 0, 3, set_dumpmon2},
276 {"-m3", 0, 3, set_dumpmon3}, 275 {"-m3", 0, 3, set_dumpmon3},
277 {"-m4", 0, 3, set_dumpmon4}, 276 {"-m4", 0, 3, set_dumpmon4},
278 {"-m5", 0, 3, set_dumpmon5}, 277 {"-m5", 0, 3, set_dumpmon5},
… …
373} 372}
374 373
375static void 374static void
376load_materials (void) 375load_materials (void)
377{ 376{
378 char buf[MAX_BUF], filename[MAX_BUF], *cp, *next; 377 char filename[MAX_BUF];
379 FILE *fp;
380 materialtype_t *mt; 378 materialtype_t *mt;
381 int i, value;
382 379
383 sprintf (filename, "%s/materials", settings.datadir); 380 sprintf (filename, "%s/materials", settings.datadir);
384 LOG (llevDebug, "Reading material type data from %s...\n", filename); 381 LOG (llevDebug, "Reading material type data from %s...\n", filename);
385 if ((fp = fopen (filename, "r")) == NULL) 382
383 object_thawer thawer (filename);
384
385 if (!thawer)
386 { 386 {
387 LOG (llevError, "Cannot open %s for reading\n", filename); 387 LOG (llevError, "Cannot open %s for reading\n", filename);
388 mt = get_empty_mat (); 388 mt = get_empty_mat ();
389 mt->next = NULL; 389 mt->next = 0;
390 materialt = mt; 390 materialt = mt;
391 return; 391 return;
392 } 392 }
393
393 mt = get_empty_mat (); 394 mt = get_empty_mat ();
394 materialt = mt; 395 materialt = mt;
395 while (fgets (buf, MAX_BUF, fp) != NULL) 396
397 for (;;)
396 { 398 {
397 if (*buf == '#') 399 thawer.next ();
398 continue; 400
399 if ((cp = strchr (buf, '\n')) != NULL) 401 switch (thawer.kw)
400 *cp = '\0';
401 cp = buf;
402 while (*cp == ' ') /* Skip blanks */
403 cp++;
404 if (!strncmp (cp, "name", 4))
405 { 402 {
403 case KW_name:
406 /* clean up the previous entry */ 404 /* clean up the previous entry */
407 if (mt->next != NULL) 405 if (mt->next)
408 { 406 {
409 if (mt->description == NULL) 407 if (!mt->description)
410 mt->description = mt->name; 408 mt->description = mt->name;
409
411 mt = mt->next; 410 mt = mt->next;
412 } 411 }
412
413 mt->next = get_empty_mat (); 413 mt->next = get_empty_mat ();
414 mt->name = strchr (cp, ' ') + 1; 414 thawer.get (mt->name);
415 } 415 break;
416 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:
417 { 426 {
418 mt->description = strchr (cp, ' ') + 1; 427 const char *cp = thawer.get_str () - 1;
419 } 428
420 else if (sscanf (cp, "material %d", &value))
421 {
422 mt->material = value;
423 }
424 else if (!strncmp (cp, "saves", 5))
425 {
426 cp = strchr (cp, ' ') + 1;
427 for (i = 0; i < NROFATTACKS; i++) 429 for (int i = 0; i < NROFATTACKS; i++)
428 {
429 if (cp == NULL)
430 { 430 {
431 if (!cp)
432 {
431 mt->save[i] = 0; 433 mt->save[i] = 0;
432 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, ',');
433 } 442 }
434 if ((next = strchr (cp, ',')) != NULL)
435 *(next++) = '\0';
436 sscanf (cp, "%d", &value);
437 mt->save[i] = (sint8) value;
438 cp = next;
439 }
440 }
441 else if (!strncmp (cp, "mods", 4))
442 {
443 cp = strchr (cp, ' ') + 1;
444 for (i = 0; i < NROFATTACKS; i++)
445 { 443 }
446 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++)
447 { 451 {
452 if (!cp)
453 {
448 mt->save[i] = 0; 454 mt->save[i] = 0;
449 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, ',');
450 } 463 }
451 if ((next = strchr (cp, ',')) != NULL)
452 *(next++) = '\0';
453 sscanf (cp, "%d", &value);
454 mt->mod[i] = (sint8) value;
455 cp = next;
456 }
457 } 464 }
458 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;
459 { 487 }
460 mt->chance = (sint8) value;
461 }
462 else if (sscanf (cp, "diff %d\n", &value))
463 {
464 mt->difficulty = (sint8) value;
465 }
466 else if (sscanf (cp, "magic %d\n", &value))
467 {
468 mt->magic = (sint8) value;
469 }
470 else if (sscanf (cp, "damage %d\n", &value))
471 {
472 mt->damage = (sint8) value;
473 }
474 else if (sscanf (cp, "wc %d\n", &value))
475 {
476 mt->wc = (sint8) value;
477 }
478 else if (sscanf (cp, "ac %d\n", &value))
479 {
480 mt->ac = (sint8) value;
481 }
482 else if (sscanf (cp, "sp %d\n", &value))
483 {
484 mt->sp = (sint8) value;
485 }
486 else if (sscanf (cp, "weight %d\n", &value))
487 {
488 mt->weight = value;
489 }
490 else if (sscanf (cp, "value %d\n", &value))
491 {
492 mt->value = value;
493 }
494 } 488 }
489
490done:
495 if (mt->next) 491 if (mt->next)
496 { 492 {
497 delete mt->next; 493 delete mt->next;
498 494
499 mt->next = NULL; 495 mt->next = 0;
500 } 496 }
497
501 LOG (llevDebug, "Done.\n"); 498 LOG (llevDebug, "Done.\n");
502 fclose (fp);
503} 499}
504 500
505/* 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
506 * 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
507 * information, having it here probably makes more sense. 503 * information, having it here probably makes more sense.
… …
517 513
518 /* 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,
519 * 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
520 * will not be a good thing. 516 * will not be a good thing.
521 */ 517 */
522 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 518 if (!(fp = open_and_uncompress (buf, 0, &comp)))
523 { 519 {
524 LOG (llevError, "Warning: No settings file found\n"); 520 LOG (llevError, "Error: No settings file found\n");
525 return; 521 exit (1);
526 } 522 }
523
527 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 524 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
528 { 525 {
529 if (buf[0] == '#') 526 if (buf[0] == '#')
530 continue; 527 continue;
531 /* eliminate newline */ 528 /* eliminate newline */
… …
545 *cp++ = 0; 542 *cp++ = 0;
546 has_val = 1; 543 has_val = 1;
547 } 544 }
548 else 545 else
549 { 546 {
550 cp = ""; 547 cp = (char *)"";
551 has_val = 0; 548 has_val = 0;
552 } 549 }
553 550
554 if (!strcasecmp (buf, "motd")) 551 if (!strcasecmp (buf, "motd"))
555 { 552 {
… …
725 else 722 else
726 { 723 {
727 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);
728 } 725 }
729 } 726 }
730 else if (!strcasecmp (buf, "casting_time"))
731 {
732 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
733 {
734 settings.casting_time = TRUE;
735 }
736 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
737 {
738 settings.casting_time = FALSE;
739 }
740 else
741 {
742 LOG (llevError, "load_settings: Unknown value for " "casting_time: %s\n", cp);
743 }
744 }
745 else if (!strcasecmp (buf, "real_wiz"))
746 {
747 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
748 {
749 settings.real_wiz = TRUE;
750 }
751 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
752 {
753 settings.real_wiz = FALSE;
754 }
755 else
756 {
757 LOG (llevError, "load_settings: Unknown value for " "real_wiz: %s\n", cp);
758 }
759 }
760 else if (!strcasecmp (buf, "explore_mode"))
761 {
762 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
763 {
764 settings.explore_mode = TRUE;
765 }
766 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
767 {
768 settings.explore_mode = FALSE;
769 }
770 else
771 {
772 LOG (llevError, "load_settings: Unknown value for " "explore_mode: %s\n", cp);
773 }
774 }
775 else if (!strcasecmp (buf, "spellpoint_level_depend")) 727 else if (!strcasecmp (buf, "spellpoint_level_depend"))
776 { 728 {
777 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true")) 729 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
778 { 730 {
779 settings.spellpoint_level_depend = TRUE; 731 settings.spellpoint_level_depend = TRUE;
… …
883 } 835 }
884 else if (!strcasecmp (buf, "set_friendly_fire")) 836 else if (!strcasecmp (buf, "set_friendly_fire"))
885 { 837 {
886 int val = atoi (cp); 838 int val = atoi (cp);
887 839
888#if COZY_SERVER
889 if (val < 0 || val > 100) 840 if (val < 0 || val > 100)
890 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);
891#else
892 if (val < 1 || val > 100)
893 LOG (llevError, "load_settings: set_friendly_fire must be between 1 an 100" ", %d is invalid\n", val);
894#endif
895 else 842 else
896 settings.set_friendly_fire = val; 843 settings.set_friendly_fire = val;
897 } 844 }
898 else if (!strcasecmp (buf, "armor_max_enchant")) 845 else if (!strcasecmp (buf, "armor_max_enchant"))
899 { 846 {
… …
952 { 899 {
953 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);
954 } 901 }
955 902
956 } 903 }
957 else if (!strcasecmp (buf, "no_player_stealing"))
958 {
959 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
960 {
961 settings.no_player_stealing = TRUE;
962 }
963 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
964 {
965 settings.no_player_stealing = FALSE;
966 }
967 else
968 {
969 LOG (llevError, "load_settings: unknown value for no_player_stealing: %s\n", cp);
970 }
971
972 }
973 else if (!strcasecmp (buf, "create_home_portals"))
974 {
975 if (!strcasecmp (cp, "on") || !strcasecmp (cp, "true"))
976 {
977 settings.create_home_portals = TRUE;
978 }
979 else if (!strcasecmp (cp, "off") || !strcasecmp (cp, "false"))
980 {
981 settings.create_home_portals = FALSE;
982 }
983 else
984 {
985 LOG (llevError, "load_settings: Unknown value for create_home_portals: %s\n", cp);
986 }
987
988 }
989 else 904 else
990 {
991 LOG (llevError, "Unknown value in settings file: %s\n", buf); 905 LOG (llevError, "Unknown value in settings file: %s\n", buf);
992 }
993 } 906 }
994 907
995 close_and_delete (fp, comp); 908 close_and_delete (fp, comp);
996} 909}
997
998 910
999/* 911/*
1000 * init() is called only once, when starting the program. 912 * init() is called only once, when starting the program.
1001 */ 913 */
1002
1003void 914void
1004init (int argc, char **argv) 915init (int argc, char **argv)
1005{ 916{
1006 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
1007 logfile = stderr; 920 logfile = stderr;
921 init_environ ();
1008 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
1009 * nothing, but in future specifying the 923 * nothing, but in future specifying the
1010 * LibDir in this pass would be reasonable*/ 924 * LibDir in this pass would be reasonable*/
1011 925
926 init_anim (); // Must be called before perl
927 init_globals ();
928 init_experience ();
929 init_attackmess ();
930 init_dynamic ();
931 init_block ();
1012 cfperl_init (); 932 cfperl_init ();
1013 init_library (); /* Must be called early */
1014 load_settings (); /* Load the settings file */ 933 load_settings (); /* Load the settings file */
1015 load_materials (); 934 load_materials ();
1016 parse_args (argc, argv, 2); 935 parse_args (argc, argv, 2);
1017 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION); 936 fprintf (logfile, "Welcome to CrossFire, v%s\n", VERSION);
1018 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n"); 937 fprintf (logfile, "Copyright (C) 2005, 2006, 2007 Marc Lehmann.\n");
… …
1023 { 942 {
1024 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail); 943 fprintf (logfile, "Maintained locally by: %s\n", settings.dm_mail);
1025 fprintf (logfile, "Questions and bugs should be mailed to above address.\n"); 944 fprintf (logfile, "Questions and bugs should be mailed to above address.\n");
1026 } 945 }
1027 946
1028 SRANDOM (time (NULL));
1029
1030 init_startup (); /* Write (C), check shutdown/forbid files */
1031 init_uuid (); 947 init_uuid ();
1032 init_signals (); /* Sets up signal interceptions */ 948 init_signals (); /* Sets up signal interceptions */
1033 init_commands (); /* Sort command tables */ 949 init_commands (); /* Sort command tables */
1034 init_skills (); 950 init_skills ();
1035 951
1036 parse_args (argc, argv, 3); 952 parse_args (argc, argv, 3);
1037 953
1038 if (settings.daemonmode)
1039 logfile = BecomeDaemon (settings.logfilename[0] == '\0' ? "logfile" : settings.logfilename);
1040
1041 init_beforeplay (); 954 init_beforeplay ();
1042 init_ericserver ();
1043 init_done = 1; 955 init_done = 1;
1044} 956}
1045 957
1046void 958void
1047usage (void) 959usage (void)
… …
1095} 1007}
1096 1008
1097void 1009void
1098init_beforeplay (void) 1010init_beforeplay (void)
1099{ 1011{
1100 init_archetypes (); /* If not called before, reads all archetypes from file */
1101 init_artifacts (); /* If not called before, reads all artifacts from file */ 1012 init_artifacts (); /* If not called before, reads all artifacts from file */
1102 init_spells (); /* If not called before, links archtypes used by spells */ 1013 init_spells (); /* If not called before, links archtypes used by spells */
1103 init_regions (); /* If not called before, reads all regions from file */
1104 init_archetype_pointers (); /* Setup global pointers to archetypes */ 1014 init_archetype_pointers (); /* Setup global pointers to archetypes */
1105 init_races (); /* overwrite race designations using entries in lib/races file */ 1015 init_races (); /* overwrite race designations using entries in lib/races file */
1106 init_gods (); /* init linked list of gods from archs */ 1016 init_gods (); /* init linked list of gods from archs */
1107 init_readable (); /* inits useful arrays for readable texts */ 1017 init_readable (); /* inits useful arrays for readable texts */
1108 init_formulae (); /* If not called before, reads formulae from file */ 1018 init_formulae (); /* If not called before, reads formulae from file */
1109
1110 switch (settings.dumpvalues)
1111 {
1112 case 1:
1113 print_monsters ();
1114 exit (0);
1115 case 2:
1116 dump_abilities ();
1117 exit (0);
1118 case 3:
1119 dump_artifacts ();
1120 exit (0);
1121 case 4:
1122 dump_spells ();
1123 exit (0);
1124 case 5:
1125 exit (0);
1126 case 6:
1127 dump_races ();
1128 exit (0);
1129 case 7:
1130 dump_alchemy ();
1131 exit (0);
1132 case 9:
1133 dump_alchemy_costs ();
1134 exit (0);
1135 case 10:
1136 dump_monster_treasure (settings.dumparg);
1137 exit (0);
1138 }
1139}
1140
1141void
1142init_startup (void)
1143{
1144 char buf[MAX_BUF];
1145 FILE *fp;
1146 int comp;
1147
1148#ifdef SHUTDOWN_FILE
1149 sprintf (buf, "%s/%s", settings.confdir, SHUTDOWN_FILE);
1150 if ((fp = open_and_uncompress (buf, 0, &comp)) != NULL)
1151 {
1152 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
1153 printf ("%s", buf);
1154 close_and_delete (fp, comp);
1155 exit (1);
1156 }
1157#endif
1158
1159 if (forbid_play ())
1160 { /* Maybe showing highscore should be allowed? */
1161 LOG (llevError, "CrossFire: Playing not allowed.\n");
1162 exit (-1);
1163 }
1164}
1165
1166/*
1167 * compile_info(): activated with the -o flag.
1168 * It writes out information on how Imakefile and config.h was configured
1169 * at compile time.
1170 */
1171
1172void
1173compile_info (void)
1174{
1175 int i = 0;
1176
1177 printf ("Non-standard include files:\n");
1178#if !defined (__STRICT_ANSI__) || defined (__sun__)
1179# if !defined (Mips)
1180 printf ("<stdlib.h>\n");
1181 i = 1;
1182# endif
1183# if !defined (MACH) && !defined (sony)
1184 printf ("<malloc.h>\n");
1185 i = 1;
1186# endif
1187#endif
1188#ifndef __STRICT_ANSI__
1189# ifndef MACH
1190 printf ("<memory.h\n");
1191 i = 1;
1192# endif
1193#endif
1194#ifndef sgi
1195 printf ("<sys/timeb.h>\n");
1196 i = 1;
1197#endif
1198 if (!i)
1199 printf ("(none)\n");
1200 printf ("Datadir:\t\t%s\n", settings.datadir);
1201 printf ("Localdir:\t\t%s\n", settings.localdir);
1202#ifdef PERM_FILE
1203 printf ("Perm file:\t<ETC>/%s\n", PERM_FILE);
1204#endif
1205#ifdef SHUTDOWN_FILE
1206 printf ("Shutdown file:\t<ETC>/%s\n", SHUTDOWN_FILE);
1207#endif
1208 printf ("Save player:\t<true>\n");
1209 printf ("Save mode:\t%4.4o\n", SAVE_MODE);
1210 printf ("Playerdir:\t<VAR>/%s\n", settings.playerdir);
1211 printf ("Itemsdir:\t<VAR>/%s\n", settings.uniquedir);
1212 printf ("Tmpdir:\t\t%s\n", settings.tmpdir);
1213#ifdef USE_CALLOC
1214 printf ("Use_calloc:\t<true>\n");
1215#else
1216 printf ("Use_calloc:\t<false>\n");
1217#endif
1218
1219#ifdef X_EDITOR
1220 printf ("Editor:\t\t%s\n", X_EDITOR);
1221#endif
1222
1223 printf ("Max_time:\t%d\n", MAX_TIME);
1224
1225 execl ("/bin/uname", "uname", "-a", NULL);
1226 LOG (llevError, "Oops, shouldn't have gotten here: execl(/bin/uname) failed: %s\n", strerror (errno));
1227 exit (-1);
1228} 1019}
1229 1020
1230/* Signal handlers: */ 1021/* Signal handlers: */
1231 1022
1232void 1023static void
1024rec_sigabrt (int i)
1025{
1026 signal (SIGABRT, SIG_DFL);
1027
1028 LOG (llevError, "SIGABRT received.\n");
1029 cleanup ("SIGABRT received", 1);
1030}
1031
1032static void
1233rec_sigsegv (int i) 1033rec_sigsegv (int i)
1234{ 1034{
1035 signal (SIGSEGV, SIG_DFL);
1036
1235 LOG (llevError, "SIGSEGV received.\n"); 1037 LOG (llevError, "SIGSEGV received.\n");
1236 fatal_signal (1, 1); 1038 cleanup ("SIGSEGV received", 1);
1237} 1039}
1238 1040
1239void 1041static void
1240rec_sigint (int i)
1241{
1242 LOG (llevInfo, "SIGINT received.\n");
1243 fatal_signal (0, 1);
1244}
1245
1246void
1247rec_sighup (int i)
1248{
1249 LOG (llevInfo, "SIGHUP received\n");
1250
1251 if (init_done)
1252 cleanup (0);
1253
1254 exit (0);
1255}
1256
1257void
1258rec_sigquit (int i) 1042rec_sigquit (int i)
1259{ 1043{
1044 signal (SIGQUIT, SIG_IGN);
1045
1260 LOG (llevInfo, "SIGQUIT received\n"); 1046 LOG (llevInfo, "SIGQUIT received\n");
1261 fatal_signal (1, 1); 1047 cleanup ("SIGQUIT received", 1);
1262} 1048}
1263 1049
1264void 1050static void
1265rec_sigbus (int i) 1051rec_sigbus (int i)
1266{ 1052{
1267#ifdef SIGBUS 1053 signal (SIGBUS, SIG_DFL);
1054
1268 LOG (llevError, "SIGBUS received\n"); 1055 LOG (llevError, "SIGBUS received\n");
1269 fatal_signal (1, 1); 1056 cleanup ("SIGBUS received", 1);
1270#endif
1271} 1057}
1272 1058
1273void 1059void
1274rec_sigterm (int i) 1060reset_signals ()
1275{ 1061{
1276 LOG (llevInfo, "SIGTERM received\n"); 1062 signal (SIGABRT, SIG_DFL);
1277 fatal_signal (0, 1); 1063 signal (SIGQUIT, SIG_DFL);
1278} 1064 signal (SIGSEGV, SIG_DFL);
1279 1065 signal (SIGBUS , SIG_DFL);
1280void 1066 signal (SIGINT , SIG_DFL);
1281fatal_signal (int make_core, int close_sockets) 1067 signal (SIGTERM, SIG_DFL);
1282{
1283 cleanup (make_core);
1284} 1068}
1285 1069
1286void 1070void
1287init_signals (void) 1071init_signals (void)
1288{ 1072{
1289 signal (SIGHUP, rec_sighup); 1073 // large stack, but it's important data we want to save, and it is not usually
1290 signal (SIGINT, rec_sigint); 1074 // being physically allocated anyways
1291 signal (SIGQUIT, rec_sigquit); 1075 const size_t stacksize = 8 * 1024 * 1024 + SIGSTKSZ;
1292 signal (SIGSEGV, rec_sigsegv); 1076
1293 signal (SIGPIPE, SIG_IGN); 1077 stack_t ss;
1294#ifdef SIGBUS 1078 ss.ss_sp = malloc (stacksize);
1295 signal (SIGBUS, rec_sigbus); 1079 ss.ss_flags = 0;
1296#endif 1080 ss.ss_size = stacksize;
1297 signal (SIGTERM, rec_sigterm); 1081 sigaltstack (&ss, 0);
1082
1083 struct sigaction sa;
1084
1085 sigfillset (&sa.sa_mask);
1086 sa.sa_flags = SA_RESTART;
1087
1088 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
1089 sa.sa_handler = rec_sigabrt; sigaction (SIGABRT, &sa, 0);
1090 sa.sa_handler = rec_sigquit; sigaction (SIGQUIT, &sa, 0);
1091 sa.sa_handler = rec_sigbus; sigaction (SIGBUS, &sa, 0);
1092
1093 sa.sa_flags |= SA_ONSTACK;
1094 sa.sa_handler = rec_sigsegv; sigaction (SIGSEGV, &sa, 0);
1298} 1095}
1299 1096
1300/* init_races() - reads the races file in the lib/ directory, then 1097/* init_races() - reads the races file in the lib/ directory, then
1301 * overwrites old 'race' entries. This routine allow us to quickly 1098 * overwrites old 'race' entries. This routine allow us to quickly
1302 * re-configure the 'alignment' of monsters, objects. Useful for 1099 * re-configure the 'alignment' of monsters, objects. Useful for
1303 * putting together lists of creatures, etc that belong to gods. 1100 * putting together lists of creatures, etc that belong to gods.
1304 */ 1101 */
1305
1306void 1102void
1307init_races (void) 1103init_races (void)
1308{ 1104{
1309 FILE *file; 1105 FILE *file;
1310 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF]; 1106 char race[MAX_BUF], fname[MAX_BUF], buf[MAX_BUF], *cp, variable[MAX_BUF];
… …
1343 set_list = 0; 1139 set_list = 0;
1344 cp++; 1140 cp++;
1345 } 1141 }
1346 1142
1347 if (sscanf (cp, "RACE %s", variable)) 1143 if (sscanf (cp, "RACE %s", variable))
1348 { /* set new race value */ 1144 /* set new race value */
1349 strcpy (race, variable); 1145 strcpy (race, variable);
1350 }
1351 else 1146 else
1352 { 1147 {
1353 char *cp1; 1148 char *cp1;
1354 1149
1355 /* Take out beginning spaces */ 1150 /* Take out beginning spaces */
… …
1369 /* set creature race to race value */ 1164 /* set creature race to race value */
1370 if ((mon = archetype::find (cp)) == NULL) 1165 if ((mon = archetype::find (cp)) == NULL)
1371 LOG (llevError, "Creature %s in race file lacks archetype\n", cp); 1166 LOG (llevError, "Creature %s in race file lacks archetype\n", cp);
1372 else 1167 else
1373 { 1168 {
1374 if (set_race && (!mon->clone.race || strcmp (mon->clone.race, race))) 1169 if (set_race && (!mon->race || strcmp (mon->race, race)))
1375 { 1170 {
1376 if (mon->clone.race) 1171 if (mon->race)
1377 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->clone.race, &mon->name); 1172 LOG (llevDebug, "Resetting race to %s from %s for archetype %s\n", race, &mon->race, &mon->archname);
1378 1173
1379 mon->clone.race = race; 1174 mon->race = race;
1380 } 1175 }
1381 1176
1382 /* if the arch is a monster, add it to the race list */ 1177 /* if the arch is a monster, add it to the race list */
1383 if (set_list && QUERY_FLAG (&mon->clone, FLAG_MONSTER)) 1178 if (set_list && QUERY_FLAG (mon, FLAG_MONSTER))
1384 add_to_racelist (race, &mon->clone); 1179 add_to_racelist (race, mon);
1385 } 1180 }
1386 } 1181 }
1387 } 1182 }
1388 1183
1389 fclose (file); 1184 fclose (file);
… …
1398 1193
1399 for (list = first_race; list; list = list->next) 1194 for (list = first_race; list; list = list->next)
1400 { 1195 {
1401 fprintf (stderr, "\nRACE %s:\t", &list->name); 1196 fprintf (stderr, "\nRACE %s:\t", &list->name);
1402 for (tmp = list->member; tmp; tmp = tmp->next) 1197 for (tmp = list->member; tmp; tmp = tmp->next)
1403 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->name, tmp->ob->level); 1198 fprintf (stderr, "%s(%d), ", &tmp->ob->arch->archname, tmp->ob->level);
1404 } 1199 }
1405 1200
1406 fprintf (stderr, "\n"); 1201 fprintf (stderr, "\n");
1407} 1202}
1408 1203

Diff Legend

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