git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c

index 0f53b4d439a4078fc99335b00e434ec97bf74394..3d12acbdb0a0059ace718a0de93ab85a4a2ae30c 100644 (file)

--- a/contrib/pg_archivecleanup/pg_archivecleanup.c

+++ b/contrib/pg_archivecleanup/pg_archivecleanup.c

/*

- * $PostgreSQL: pgsql/contrib/pg_archivecleanup/pg_archivecleanup.c,v 1.3 2010年07月06日 19:18:55 momjian Exp $

+ * $PostgreSQL: pgsql/contrib/pg_archivecleanup/pg_archivecleanup.c,v 1.4 2010年08月23日 02:56:24 tgl Exp $

*

* pg_archivecleanup.c

*

#include <fcntl.h>

#include <signal.h>

-#ifdef WIN32

-int getopt(int argc, char *const argv[], const char *optstring);

-#else

+#ifndef WIN32

#include <sys/time.h>

#include <unistd.h>

#ifdef HAVE_GETOPT_H

#include <getopt.h>

#endif

-#endif /* ! WIN32 */

+#else /* WIN32 */

+extern int getopt(int argc, char *const argv[], const char *optstring);

+#endif /* ! WIN32 */

extern char *optarg;

extern int optind;

strspn(xlde->d_name, "0123456789ABCDEF") == XLOG_DATA_FNAME_LEN &&

strcmp(xlde->d_name + 8, exclusiveCleanupFileName + 8) < 0)

{

-#ifdef WIN32

- snprintf(WALFilePath, MAXPGPATH, "%s\\%s", archiveLocation, xlde->d_name);

-#else

- snprintf(WALFilePath, MAXPGPATH, "%s/%s", archiveLocation, xlde->d_name);

-#endif

-

+ snprintf(WALFilePath, MAXPGPATH, "%s/%s",

+ archiveLocation, xlde->d_name);

if (debug)

fprintf(stderr, "%s: removing file \"%s\"\n",

progname, WALFilePath);

SetWALFileNameForCleanup();

if (debug)

+ {

+ snprintf(WALFilePath, MAXPGPATH, "%s/%s",

+ archiveLocation, exclusiveCleanupFileName);

fprintf(stderr, "%s: keep WAL file \"%s\" and later\n",

- progname, exclusiveCleanupFileName);

+ progname, WALFilePath);

+ }

/*

* Remove WAL files older than cut-off