Fixed #2691

gpac · Dec 4, 2023 · cdc6d93 · cdc6d93
1 parent 284f891
commit cdc6d93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/applications/gpac/gpac.h b/applications/gpac/gpac.h
@@ -69,7 +69,7 @@ void gpac_core_help(GF_SysArgMode mode, Bool for_logs);
 void gpac_usage(GF_SysArgMode argmode);
 void gpac_config_help(void);
 void gpac_suggest_arg(char *aname);
-void gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only);
+Bool gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only);
 void gpac_check_session_args(void);
 int gpac_make_lang(char *filename);
 Bool gpac_expand_alias(int o_argc, char **o_argv);

diff --git a/applications/gpac/gpac_help.c b/applications/gpac/gpac_help.c
@@ -1123,12 +1123,12 @@ void gpac_suggest_arg(char *aname)
 	}
 }
 
-void gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
+Bool gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
 {
 	Bool found = GF_FALSE;
 	Bool first = GF_FALSE;
 	u32 i, count, pass_exact = GF_TRUE;
-	if (!fname) return;
+	if (!fname) return GF_FALSE;
 
 	if (filter_only || !is_help) pass_exact = GF_FALSE;
 
@@ -1188,6 +1188,7 @@ void gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
 						if (!doc) doc = "Not documented";
 						GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: %s\n", alias, doc));
 						found = GF_TRUE;
+						if (is_help) return GF_TRUE;
 					}
 				}
 				else if (gf_sys_word_match(fname, alias)) {
@@ -1294,6 +1295,7 @@ void gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
 			is_help ? ", gpac -h or search all help using gpac -hx" : ""
 		));
 	}
+	return GF_FALSE;
 }
 
 static void gpac_suggest_filter_arg(GF_Config *opts, const char *argname, u32 atype)
@@ -2167,7 +2169,8 @@ Bool print_filters(int argc, char **argv, GF_SysArgMode argmode)
 
 	if (found) return GF_TRUE;
 
-	gpac_suggest_filter(fname, GF_TRUE, GF_FALSE);
+	if (gpac_suggest_filter(fname, GF_TRUE, GF_FALSE))
+		return GF_TRUE;
 	return GF_FALSE;
 }