github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-23 23:26:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into heroku

Browse Source 
The Great Whitespace Reconciliation

Conflicts:
	check_dir.c
	config.c
	dbutils.c
	repmgr.c
	repmgr.h
	repmgrd.c

Signed-off-by: Dan Farina <drfarina@acm.org>
This commit is contained in:
Dan Farina
2011-02-04 18:27:28 -08:00
parent 156714f3f1 d4de19bc78
commit a52ebc412c
13 changed files with 340 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
check_dir.c
View File

@@ -1,10 +1,21 @@
/*
* check_dir.c
* check_dir.c - Directories management functions
*
* Copyright (c) 2ndQuadrant, 2010
* Copyright (c) Heroku, 2010
* Copyright (C) 2ndQuadrant, 2010
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Directories management functions
*/
#include <sys/stat.h>
@@ -36,9 +47,9 @@ static int mkdir_p(char *path, mode_t omode);
int
check_dir(char *dir)
{
DIR *chkdir;
struct dirent *file;
int result = 1;
DIR *chkdir;
struct dirent *file;
int result = 1;
errno = 0;
@@ -50,7 +61,7 @@ check_dir(char *dir)
while ((file = readdir(chkdir)) != NULL)
{
if (strcmp(".", file->d_name) == 0 ||
strcmp("..", file->d_name) == 0)
strcmp("..", file->d_name) == 0)
{
/* skip this and parent directory */
continue;
@@ -74,7 +85,7 @@ check_dir(char *dir)
closedir(chkdir);
if (errno != 0)
return -1; /* some kind of I/O error? */
return -1; /* some kind of I/O error? */
return result;
}
@@ -90,7 +101,7 @@ create_directory(char *dir)
return true;
fprintf(stderr, _("Could not create directory \"%s\": %s\n"),
dir, strerror(errno));
dir, strerror(errno));
return false;
}
@@ -119,10 +130,10 @@ mkdir_p(char *path, mode_t omode)
{
struct stat sb;
mode_t numask,
oumask;
oumask;
int first,
last,
retval;
last,
retval;
char *p;
p = path;
@@ -141,8 +152,8 @@ mkdir_p(char *path, mode_t omode)
return 1;
}
else if (p[1] == ':' &&
((p[0] >= 'a' && p[0] <= 'z') ||
(p[0] >= 'A' && p[0] <= 'Z')))
((p[0] >= 'a' && p[0] <= 'z') ||
(p[0] >= 'A' && p[0] <= 'Z')))
{
/* local drive */
p += 2;