db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-12-02 09:53:24 +02:00
Code Issues Releases Activity

fix usage of symlink specific code

Browse Source
This commit is contained in:
Anastasia 2018-02-26 18:44:22 +03:00
parent 2689ddb9ba
commit 1adde8f19f
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backup.c
View File

@ -239,7 +239,11 @@ ReceiveFileList(parray* files, PGconn *conn, PGresult *res, int rownum)
else if (copybuf[156] == '2')
{
/* Symlink */
#ifndef WIN32
pgfile->mode |= S_IFLNK;
#else
pgfile->mode |= S_IFDIR;
#endif
}
else
elog(ERROR, "Unrecognized link indicator \"%c\"\n",

16
src/dir.c
View File

@ -380,7 +380,13 @@ dir_list_file_internal(parray *files, const char *root, bool exclude,
* Add to files list only files, links and directories. Skip sockets and
* other unexpected file formats.
*/
if (!S_ISDIR(file->mode) && !S_ISLNK(file->mode) && !S_ISREG(file->mode))
if (!S_ISDIR(file->mode) && !S_ISREG(file->mode) &&
#ifndef WIN32
!(S_ISLNK(file->mode))
#else
!(pgwin32_is_junction(file->path))
#endif
)
{
elog(WARNING, "Skip file \"%s\": unexpected file format", file->path);
return;
@ -430,7 +436,11 @@ dir_list_file_internal(parray *files, const char *root, bool exclude,
}
/* chase symbolic link chain and find regular file or directory */
#ifndef WIN32
while (S_ISLNK(file->mode))
#else
while (pgwin32_is_junction(file->path))
#endif
{
ssize_t len;
char linked[MAXPGPATH];
@ -718,7 +728,11 @@ print_file_list(FILE *out, const parray *files, const char *root)
if (file->is_datafile)
fprintf(out, ",\"segno\":\"%d\"", file->segno);
#ifndef WIN32
if (S_ISLNK(file->mode))
#else
if (pgwin32_is_junction(file->path))
#endif
fprintf(out, ",\"linked\":\"%s\"", file->linked);
fprintf(out, "}\n");

2
src/restore.c
View File

@ -85,7 +85,7 @@ do_restore_or_validate(time_t target_backup_id,
{
int i;
parray *backups;
parray *timelines;
parray *timelines = NULL;
pgRecoveryTarget *rt = NULL;
pgBackup *current_backup = NULL;
pgBackup *dest_backup = NULL;