Do not skip subdirectories if parent directory contains a file

Artur Zakirov · Artur Zakirov · commit 8bd2248ac48c · 2017-03-09T14:01:11.000+03:00
diff --git a/dir.c b/dir.c
@@ -515,13 +515,7 @@ list_data_directories(parray *files, const char *path, bool is_root,
 			elog(ERROR, "cannot stat file \"%s\": %s", child, strerror(errno));
 
 		if (!S_ISDIR(st.st_mode))
-		{
-			/* Stop reading the directory if we met file */
-			if (!is_root)
-				break;
-			else
-				continue;
-		}
+			continue;
 
 		/* Check for exclude for the first level of listing */
 		if (is_root && exclude)
diff --git a/show.c b/show.c
@@ -29,7 +29,6 @@ do_show(time_t backup_id)
 	if (backup_id != 0)
 	{
 		pgBackup   *backup;
-		pid_t		run_pid;
 
 		backup = read_backup(backup_id);
 		if (backup == NULL)
