Merge 3.3.8 upstream setools

2 files changed, 4 insertions, 3 deletions

diff --git a/seaudit/progress.c b/seaudit/progress.c
index 01b01fb..2e0abeb 100644
--- a/seaudit/progress.c
+++ b/seaudit/progress.c
@@ -99,10 +99,11 @@ void progress_hide(progress_t * progress)
 
 int progress_wait(progress_t * progress)
 {
-	GTimeVal wait_time = { 0, 50000 };
+	gint64 end_time;
 	g_mutex_lock(progress->mutex);
 	while (!progress->done) {
-		g_cond_timed_wait(progress->cond, progress->mutex, &wait_time);
+		end_time = g_get_monotonic_time () + 50000; // need to be set before each wait
+		g_cond_wait_until(progress->cond, progress->mutex, end_time);
 		if (progress->s != NULL) {
 			gtk_label_set_text(GTK_LABEL(progress->label2), progress->s);
 			free(progress->s);
diff --git a/seaudit/seaudit-report.c b/seaudit/seaudit-report.c
index af3c6fb..d436c18 100644
--- a/seaudit/seaudit-report.c
+++ b/seaudit/seaudit-report.c
@@ -100,7 +100,7 @@ static void seaudit_report_info_usage(const char *program_name, int brief)
 	printf("  -s, --stdin              read log data from standard input\n");
 	printf("  -m, --malformed          include malformed log messages\n");
 	printf("  -o FILE, --output=FILE   output to FILE\n");
-	printf("  --config=FILE            read configuration from FILE\n");
+	printf("  -c FILE, --config=FILE   read configuration from FILE\n");
 	printf("  --html                   set output format to HTML\n");
 	printf("  --stylesheet=FILE        HTML style sheet for formatting HTML report\n");
 	printf("                           (ignored if --html is not given)\n");