hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to blr_file.

Browse Source
This commit is contained in:
Markus Makela
2015-03-12 18:37:07 +02:00
parent e1c18603a4
commit b6cc739044
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/routing/binlog/blr_file.c
View File

@ -71,7 +71,7 @@ static void blr_log_header(logfile_id_t file, char *msg, uint8_t *ptr);
int int
blr_file_init(ROUTER_INSTANCE *router) blr_file_init(ROUTER_INSTANCE *router)
{ {
char *ptr, path[1025], filename[1051]; char *ptr, path[PATH_MAX], filename[PATH_MAX];
int file_found, n = 1; int file_found, n = 1;
int root_len, i; int root_len, i;
DIR *dirp; DIR *dirp;
@ -80,12 +80,12 @@ struct dirent *dp;
if (router->binlogdir == NULL) if (router->binlogdir == NULL)
{ {
strcpy(path, "/usr/local/skysql/MaxScale"); strcpy(path, "/usr/local/skysql/MaxScale");
if ((ptr = getenv("MAXSCALE_HOME")) != NULL && strnlen(ptr,1025) < 1025) if ((ptr = getenv("MAXSCALE_HOME")) != NULL)
{ {
strncpy(path, ptr,PATH_MAX); strncpy(path, ptr,PATH_MAX);
} }
strncat(path, "/",1024); strncat(path, "/",PATH_MAX);
strncat(path, router->service->name,1024); strncat(path, router->service->name,PATH_MAX);
if (access(path, R_OK) == -1) if (access(path, R_OK) == -1)
mkdir(path, 0777); mkdir(path, 0777);
@ -94,7 +94,7 @@ struct dirent *dp;
} }
else else
{ {
strncpy(path, router->binlogdir, 1024); strncpy(path, router->binlogdir, PATH_MAX);
} }
if (access(router->binlogdir, R_OK) == -1) if (access(router->binlogdir, R_OK) == -1)
{ {
@ -128,7 +128,7 @@ struct dirent *dp;
file_found = 0; file_found = 0;
do { do {
sprintf(filename, "%s/" BINLOG_NAMEFMT, path, router->fileroot, n); snprintf(filename,PATH_MAX, "%s/" BINLOG_NAMEFMT, path, router->fileroot, n);
if (access(filename, R_OK) != -1) if (access(filename, R_OK) != -1)
{ {
file_found = 1; file_found = 1;
@ -142,16 +142,16 @@ struct dirent *dp;
if (n == 0) // No binlog files found if (n == 0) // No binlog files found
{ {
if (router->initbinlog) if (router->initbinlog)
sprintf(filename, BINLOG_NAMEFMT, router->fileroot, snprintf(filename,PATH_MAX, BINLOG_NAMEFMT, router->fileroot,
router->initbinlog); router->initbinlog);
else else
sprintf(filename, BINLOG_NAMEFMT, router->fileroot, 1); snprintf(filename,PATH_MAX, BINLOG_NAMEFMT, router->fileroot, 1);
if (! blr_file_create(router, filename)) if (! blr_file_create(router, filename))
return 0; return 0;
} }
else else
{ {
sprintf(filename, BINLOG_NAMEFMT, router->fileroot, n); snprintf(filename,PATH_MAX, BINLOG_NAMEFMT, router->fileroot, n);
blr_file_append(router, filename); blr_file_append(router, filename);
} }
return 1; return 1;