#include <sys/types.h>
#include <sys/stat.h>
-#include <netinet/in.h>
-
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
#define WE_ARE_MEMORY_C
#include "stdinc.h"
#include "setup.h"
-#include "common.h"
#include "ircd_defs.h"
-#include "config.h"
+#include "defaults.h"
#include "client.h"
#include "modules.h"
#include "newconf.h"
for (i = 0; ircd_times[i].name; i++)
{
- if (strcasecmp(ircd_times[i].name, name) == 0 ||
- (ircd_times[i].plural && strcasecmp(ircd_times[i].plural, name) == 0))
+ if (rb_strcasecmp(ircd_times[i].name, name) == 0 ||
+ (ircd_times[i].plural && rb_strcasecmp(ircd_times[i].plural, name) == 0))
return ircd_times[i].val;
}
for (i = 0; yesno[i].word; i++)
{
- if (strcasecmp(str, yesno[i].word) == 0)
+ if (rb_strcasecmp(str, yesno[i].word) == 0)
{
return yesno[i].yesno;
}
%union {
int number;
- char string[IRCD_BUFSIZE + 1];
+ char string[1024];
conf_parm_t * conf_parm;
}
%token <number> NUMBER
%type <string> qstring string
-%type <number> number timespec
+%type <number> number timespec unittimespec
%type <conf_parm> oneitem single itemlist
%start conf
{
add_cur_list(CF_INT, 0, i);
}
+
+ rb_free($1);
+ rb_free($3);
}
}
;
loadmodule:
LOADMODULE QSTRING
{
- char *m_bn;
+ char *m_bn;
+ m_bn = rb_basename((char *) $2);
- m_bn = rb_basename((char *) $2);
-
- if (findmodule_byname(m_bn) == -1)
- load_one_module($2, 0);
+ if (findmodule_byname(m_bn) == NULL)
+ {
+ load_one_module($2, MAPI_ORIGIN_EXTENSION, 0);
+ }
- rb_free(m_bn);
+ rb_free(m_bn);
}
';'
;
string: STRING { strcpy($$, $1); } ;
number: NUMBER { $$ = $1; } ;
-timespec: number string
+unittimespec: number string
{
time_t t;
$$ = $1 * t;
}
- | timespec timespec
+ ;
+
+timespec: unittimespec
+ {
+ $$ = $1;
+ }
+ | timespec unittimespec
{
$$ = $1 + $2;
}