database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-12 05:01:15 +03:00
Code Activity

Cleanup Win32 COPY handling, and move archive examples to SGML.

Browse Source
This commit is contained in:
Bruce Momjian
2004-08-12 19:03:44 +00:00
parent 43ea65a0dc
commit 10249abfa1
5 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/access/transam/xlog.c
View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.161 2004/08/12 18:34:45 momjian Exp $
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.162 2004/08/12 19:03:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1962,18 +1962,6 @@ RestoreArchivedFile(char *path, const char *xlogfname,
/* %p: full path of target file */
sp++;
StrNCpy(dp, xlogpath, endp-dp);
/*
* make_native_path() is required because WIN32 COPY is
* an internal CMD.EXE command and doesn't process
* forward slashes in the same way as external commands.
* Quoting the first argument to COPY does not convert
* forward to backward slashes, but COPY does properly
* process quoted forward slashes in the second argument.
*
* COPY works with quoted forward slashes in the first argument
* only if the current directory is the same as the directory
* of the first argument.
*/
make_native_path(dp);
dp += strlen(dp);
break;

13
src/backend/postmaster/pgarch.c
View File

@@ -19,7 +19,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.6 2004/08/09 16:26:06 tgl Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.7 2004/08/12 19:03:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -436,17 +436,8 @@ pgarch_archiveXlog(char *xlog)
/* %p: full path of source file */
sp++;
StrNCpy(dp, pathname, endp-dp);
#ifndef WIN32
make_native_path(dp);
dp += strlen(dp);
#else
/* On Windows, change / to \ in the substituted path */
while (*dp)
{
if (*dp == '/')
*dp = '\\';
dp++;
}
#endif
break;
case 'f':
/* %f: filename of source file */

10
src/backend/utils/misc/postgresql.conf.sample
View File

@@ -117,16 +117,6 @@
# - Archiving -
#archive_command = '' # command to use to archive a logfile segment
#
# If archive_command is '' then archiving is disabled. Otherwise, set it
# to a command to copy a file to the proper place. Any %p in the string
# is replaced by the absolute path of the file to archive, while any %f is
# replaced by the file name only. NOTE: it is important for the command to
# return zero exit status only if it succeeds.
#
# Examples:
# archive_command = 'cp "%p" /mnt/server/archivedir/"%f"'
# archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Win32
#---------------------------------------------------------------------------