Fix little bugs.

za-arthur · za-arthur · commit 28626dcdb1f7 · 2017-04-20T15:01:29.000+03:00
- scan segno in dir_read_file_list()
- check backup_path in main() if 'backup_path == NULL'
diff --git a/backup.c b/backup.c
@@ -128,7 +128,7 @@ do_backup_database(parray *backup_list)
 	{
 		prev_backup = catalog_get_last_data_backup(backup_list, current.tli);
 		if (prev_backup == NULL)
-			elog(ERROR, "Valid backup on current timeline is not found."
+			elog(ERROR, "Valid backup on current timeline is not found. "
 						"Create new FULL backup before an incremental one.");
 	}
 
diff --git a/dir.c b/dir.c
@@ -723,7 +723,7 @@ dir_read_file_list(const char *root, const char *file_txt)
 			sscanf(buf, "linked:%s", linked);
 		ptr = strstr(buf,"segno");
 		if (ptr)
-			sscanf(buf, "linked:%s", linked);
+			sscanf(buf, "segno:%d", &segno);
 #ifdef PGPRO_EE
 		ptr = strstr(buf,"CFS_generation");
 		sscanf(buf, "CFS_generation:%lu", &generation);
diff --git a/pg_probackup.c b/pg_probackup.c
@@ -107,7 +107,10 @@ static pgut_option options[] =
 int
 main(int argc, char *argv[])
 {
-	int				i;
+	char		path[MAXPGPATH];
+	/* Check if backup_path is directory. */
+	struct stat stat_buf;
+	int			rc = stat(backup_path, &stat_buf);
 
 	/* initialize configuration */
 	pgBackup_init(&current);
@@ -147,7 +150,7 @@ main(int argc, char *argv[])
 	}
 
 	/* Parse command line arguments */
-	i = pgut_getopt(argc, argv, options);
+	pgut_getopt(argc, argv, options);
 
 	if (backup_path == NULL)
 	{
@@ -156,27 +159,20 @@ main(int argc, char *argv[])
 		if (backup_path == NULL)
 			elog(ERROR, "required parameter not specified: BACKUP_PATH (-B, --backup-path)");
 	}
-	else
-	{
-		char		path[MAXPGPATH];
-		/* Check if backup_path is directory. */
-		struct stat stat_buf;
-		int			rc = stat(backup_path, &stat_buf);
 
-		/* If rc == -1,  there is no file or directory. So it's OK. */
-		if (rc != -1 && !S_ISDIR(stat_buf.st_mode))
-			elog(ERROR, "-B, --backup-path must be a path to directory");
+	/* If rc == -1,  there is no file or directory. So it's OK. */
+	if (rc != -1 && !S_ISDIR(stat_buf.st_mode))
+		elog(ERROR, "-B, --backup-path must be a path to directory");
 
-		/* Do not read options from file or env if we're going to set them */
-		if (backup_subcmd != CONFIGURE)
-		{
-			/* Read options from configuration file */
-			join_path_components(path, backup_path, BACKUP_CATALOG_CONF_FILE);
-			pgut_readopt(path, options, ERROR);
+	/* Do not read options from file or env if we're going to set them */
+	if (backup_subcmd != CONFIGURE)
+	{
+		/* Read options from configuration file */
+		join_path_components(path, backup_path, BACKUP_CATALOG_CONF_FILE);
+		pgut_readopt(path, options, ERROR);
 
-			/* Read environment variables */
-			pgut_getopt_env(options);
-		}
+		/* Read environment variables */
+		pgut_getopt_env(options);
 	}
 
 	if (backup_id_string_param != NULL)
@@ -205,10 +201,15 @@ main(int argc, char *argv[])
 	join_path_components(arclog_path, backup_path, "wal");
 
 	/* setup exclusion list for file search */
-	for (i = 0; pgdata_exclude_dir[i]; i++);		/* find first empty slot */
+	if (!backup_logs)
+	{
+		int			i;
+
+		for (i = 0; pgdata_exclude_dir[i]; i++);		/* find first empty slot */
 
-	if(!backup_logs)
-		pgdata_exclude_dir[i++] = "pg_log";
+		/* Set 'pg_log' in first empty slot */
+		pgdata_exclude_dir[i] = "pg_log";
+	}
 
 	if (target_time != NULL && target_xid != NULL)
 		elog(ERROR, "You can't specify recovery-target-time and recovery-target-xid at the same time");

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ do_backup_database(parray *backup_list)`
`128`	`128`	`{`
`129`	`129`	`prev_backup = catalog_get_last_data_backup(backup_list, current.tli);`
`130`	`130`	`if (prev_backup == NULL)`
`131`		`- elog(ERROR, "Valid backup on current timeline is not found."`
	`131`	`+ elog(ERROR, "Valid backup on current timeline is not found. "`
`132`	`132`	`"Create new FULL backup before an incremental one.");`
`133`	`133`	`}`
`134`	`134`