/[pkg-mixmaster]/trunk/Mix/Src/mix.c
ViewVC logotype

Diff of /trunk/Mix/Src/mix.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 189 by weaselp, Mon Aug 26 19:38:51 2002 UTC revision 197 by weaselp, Wed Aug 28 09:35:25 2002 UTC
# Line 6  Line 6 
6     details.     details.
7    
8     Mixmaster initialization, configuration     Mixmaster initialization, configuration
9     $Id: mix.c,v 1.18 2002/08/26 19:38:51 weaselp Exp $ */     $Id: mix.c,v 1.19 2002/08/28 09:35:25 weaselp Exp $ */
10    
11    
12  #include "mix3.h"  #include "mix3.h"
# Line 66  char POOL[PATHMAX]; Line 66  char POOL[PATHMAX];
66  char TYPE1LIST[PATHMAX];  char TYPE1LIST[PATHMAX];
67  char TYPE2REL[PATHMAX];  char TYPE2REL[PATHMAX];
68  char TYPE2LIST[PATHMAX];  char TYPE2LIST[PATHMAX];
69    char PIDFILE[PATHMAX];
70    
71  char PGPREMPUBRING[PATHMAX];  char PGPREMPUBRING[PATHMAX];
72  char PGPREMPUBASC[PATHMAX];  char PGPREMPUBASC[PATHMAX];
# Line 363  void mix_setdefaults() Line 364  void mix_setdefaults()
364          strnncpy(TYPE1LIST    , DEFAULT_TYPE1LIST);          strnncpy(TYPE1LIST    , DEFAULT_TYPE1LIST);
365          strnncpy(TYPE2REL     , DEFAULT_TYPE2REL);          strnncpy(TYPE2REL     , DEFAULT_TYPE2REL);
366          strnncpy(TYPE2LIST    , DEFAULT_TYPE2LIST);          strnncpy(TYPE2LIST    , DEFAULT_TYPE2LIST);
367            strnncpy(PIDFILE      , DEFAULT_PIDFILE);
368    
369          strnncpy(PGPREMPUBRING, DEFAULT_PGPREMPUBRING);          strnncpy(PGPREMPUBRING, DEFAULT_PGPREMPUBRING);
370          strnncpy(PGPREMPUBASC , DEFAULT_PGPREMPUBASC);          strnncpy(PGPREMPUBASC , DEFAULT_PGPREMPUBASC);
# Line 523  int mix_configline(char *line) Line 525  int mix_configline(char *line)
525            read_conf(TYPE2REL) || read_conf(TYPE2LIST) ||            read_conf(TYPE2REL) || read_conf(TYPE2LIST) ||
526            read_conf(PGPREMPUBRING) || read_conf(PGPREMPUBASC) ||            read_conf(PGPREMPUBRING) || read_conf(PGPREMPUBASC) ||
527            read_conf(PGPREMSECRING) || read_conf(NYMSECRING) ||            read_conf(PGPREMSECRING) || read_conf(NYMSECRING) ||
528            read_conf(NYMDB) );            read_conf(NYMDB) || read_conf(PIDFILE) );
529  }  }
530    
531  static int mix_config(void)  static int mix_config(void)
# Line 956  int mix_daemon(void) Line 958  int mix_daemon(void)
958    setsignalhandler(1); /* set signal handlers and restart any interrupted system calls */    setsignalhandler(1); /* set signal handlers and restart any interrupted system calls */
959    for(;;) {    for(;;) {
960      if (terminatedaemon)      if (terminatedaemon)
961        exit(0);        break;
962      if (rereadconfig) {      if (rereadconfig) {
963        rereadconfig = 0;        rereadconfig = 0;
964        mix_config();        mix_config();
# Line 989  int mix_daemon(void) Line 991  int mix_daemon(void)
991        setsignalhandler(1); /* set signal handlers and restart any interrupted system calls */        setsignalhandler(1); /* set signal handlers and restart any interrupted system calls */
992      }      }
993    }    }
994      return (0);
995  }  }
996    
997  /** error ***************************************************************/  /** error ***************************************************************/

Legend:
Removed from v.189  
changed lines
  Added in v.197

  ViewVC Help
Powered by ViewVC 1.1.5