some changes

Author: VictorSpirin

src/backup.c

@@ -552,9 +552,16 @@ do_backup_instance(void)
 		join_path_components(dst_backup_path, database_path, PG_XLOG_DIR);
 		dir_create_dir(dst_backup_path, DIR_PERMISSION);
 
+		if (start_stream_mut == NULL){
+			pthread_mutex_init(&start_stream_mut,NULL);
+		}
+
 		pthread_mutex_lock(&start_stream_mut);
 		pthread_create(&stream_thread, NULL, (void *(*)(void *)) StreamLog, dst_backup_path);
 		pthread_mutex_lock(&start_stream_mut);
+#ifdef WIN32
+		sleep(10);
+#endif
 		if (conn == NULL)
 			elog(ERROR, "Cannot continue backup because stream connect has failed.");
 
@@ -936,7 +943,7 @@ check_system_identifiers(void)
 
 	system_id_pgdata = get_system_identifier(pgdata);
 	system_id_conn = get_remote_system_identifier(backup_conn);
-
+	
 	if (system_id_conn != system_identifier)
 		elog(ERROR, "Backup data directory was initialized for system id %ld, but connected instance system id is %ld",
 			 system_identifier, system_id_conn);
@@ -959,14 +966,15 @@ confirm_block_size(const char *name, int blcksz)
 	res = pgut_execute(backup_conn, "SELECT current_setting($1)", 1, &name, true);
 	if (PQntuples(res) != 1 || PQnfields(res) != 1)
 		elog(ERROR, "cannot get %s: %s", name, PQerrorMessage(backup_conn));
-
+	
 	block_size = strtol(PQgetvalue(res, 0, 0), &endp, 10);
-	PQclear(res);
-
 	if ((endp && *endp) || block_size != blcksz)
 		elog(ERROR,
 			 "%s(%d) is not compatible(%d expected)",
 			 name, block_size, blcksz);
+	
+	PQclear(res);//bad pointer to endp
+
 }
 
 /*
@@ -2864,4 +2872,5 @@ pthread_join(pthread_t th, void **thread_return)
 	return 0;
 }
 
+
 #endif /* WIN32 */

src/configure.c

@@ -114,7 +114,8 @@ writeBackupCatalogConfig(FILE *out, pgBackupConfig *config)
 
 	fprintf(out, "#Backup instance info\n");
 	fprintf(out, "PGDATA = %s\n", config->pgdata);
-	fprintf(out, "system-identifier = %li\n", config->system_identifier);
+	//fprintf(out, "system-identifier = %li\n", config->system_identifier);
+	fprintf(out, "system-identifier = %" INT64_MODIFIER "u\n", config->system_identifier);
 
 	fprintf(out, "#Connection parameters:\n");
 	if (config->pgdatabase)

src/dir.c

@@ -150,6 +150,8 @@ pgFileInit(const char *path)
 	pgFile		   *file;
 	file = (pgFile *) pgut_malloc(sizeof(pgFile));
 
+	file->name = 0;
+
 	file->size = 0;
 	file->mode = 0;
 	file->read_size = 0;
@@ -520,7 +522,7 @@ dir_list_file_internal(parray *files, const char *root, bool exclude,
 						break;
 					}
 				}
-				else if (strcmp(file->name, pgdata_exclude_dir[i]) == 0)
+				else if (file->name!=0 && strcmp(file->name, pgdata_exclude_dir[i]) == 0)
 				{
 					skip = true;
 					break;

src/pg_probackup.c

@@ -434,6 +434,7 @@ main(int argc, char *argv[])
 
 				start_time = time(NULL);
 				backup_mode = deparse_backup_mode(current.backup_mode);
+				current.stream = stream_wal;
 
 				elog(INFO, "Backup start, pg_probackup version: %s, backup ID: %s, backup mode: %s, instance: %s, stream: %s, remote: %s",
 						  PROGRAM_VERSION, base36enc(start_time), backup_mode, instance_name,

src/pg_probackup.h

@@ -506,5 +506,15 @@ extern void pgBackup_init(pgBackup *backup);
 
 /* in status.c */
 extern bool is_pg_running(void);
+#ifdef WIN32
+#ifdef _DEBUG
+#define lseek _lseek
+#define open _open
+#define fstat _fstat
+#define read _read
+#define close _close
+#define write _write
+#endif
+#endif
 
 #endif /* PG_PROBACKUP_H */

src/utils/pgut.c

@@ -1221,7 +1221,7 @@ get_next_token(const char *src, char *dst, const char *line)
 	}
 	else
 	{
-		i = j = strcspn(s, "# \n\r\t\v");
+		i = j = strcspn(s, "#\n\r\t\v");//removed space 
 		memcpy(dst, s, j);
 	}