[Spread-cvs] cvs commit: spread/daemon config_gram.l config_parse.y

[spread-users@lists.spread.org]

jonathan    02/09/27 17:10:08

  Modified:    daemon   config_gram.l config_parse.y
  Log:
  Remove dependence on strcasecmp as it doesn't exist on some platforms.
  
  Revision  Changes    Path
  1.7       +6 -0      spread/daemon/config_gram.l
  
  Index: config_gram.l
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/config_gram.l,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- config_gram.l	23 Sep 2002 20:16:13 -0000	1.6
  +++ config_gram.l	27 Sep 2002 17:10:08 -0000	1.7
  @@ -58,8 +58,11 @@
   string  [^ \t\r\n#{}]+
   true    [Tt][Rr][Uu][Ee]
   yes     [Yy][Ee][Ss]
  +on      [Oo][Nn]
   false   [Ff][Aa][Ll][Ss][Ee]
   no      [Nn][Oo]
  +off     [Oo][Ff][Ff]
  +auto    [Aa][Uu][Tt][Oo]
   ipaddr  [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}
   ipport  [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:[0-9]{1,5}
   %option noyywrap
  @@ -90,6 +93,9 @@
   RouteMatrix                     { return ROUTEMATRIX; }
   true|yes                        { yylval.boolean = TRUE; return SP_BOOL; }
   false|no                        { yylval.boolean = FALSE; return SP_BOOL; }
  +on                              { yylval.number = 1; return SP_TRIVAL; }
  +off                             { yylval.number = 0; return SP_TRIVAL; }
  +auto                            { yylval.number = 2; return SP_TRIVAL; }
   DEBUG	 			{ yylval.mask = 0x00000001; return DDEBUG; }
   EXIT				{ yylval.mask = 0x00000002; return DEXIT; }
   PRINT				{ yylval.mask = 0x00000004; return DPRINT; }
  
  
  
  1.6       +4 -6      spread/daemon/config_parse.y
  
  Index: config_parse.y
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/config_parse.y,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- config_parse.y	22 Sep 2002 02:56:52 -0000	1.5
  +++ config_parse.y	27 Sep 2002 17:10:08 -0000	1.6
  @@ -187,7 +187,7 @@
   %token DCONF DMEMB DFLOW_CONTROL DSTATUS DEVENTS DGROUPS DMEMORY
   %token DSKIPLIST DACM DALL DNONE
   %token DANGEROUSMONITOR SOCKETPORTREUSE RUNTIMEDIR SPUSER SPGROUP ALLOWEDAUTHMETHODS REQUIREDAUTHMETHODS ACCESSCONTROLPOLICY
  -%token SP_BOOL LINKPROTOCOL PHOP PTCPHOP
  +%token SP_BOOL SP_TRIVAL LINKPROTOCOL PHOP PTCPHOP
   %token IMONITOR ICLIENT IDAEMON
   %token ROUTEMATRIX LINKCOST
   %%
  @@ -270,16 +270,14 @@
                               Conf_set_dangerous_monitor_state($3.boolean);
                             }
   			}
  -                |       SOCKETPORTREUSE EQUALS STRING
  +                |       SOCKETPORTREUSE EQUALS SP_TRIVAL
                           {
                               port_reuse state;
  -                            char option[5];
  -                            strncpy(option, $3.string, 5);
  -                            if (strcasecmp(option, "on") == 0)
  +                            if ($3.number == 1)
                               {
                                   state = port_reuse_on;
                               }
  -                            else if (strcasecmp(option, "off") == 0)
  +                            else if ($3.number = 0)
                               {
                                   state = port_reuse_off;
                               }