Commit 25a0c31b authored by vaclav's avatar vaclav
Browse files

Merge branch '923-external-command-line-options-in-upper-case-letters' into 'main' 

Resolve "External command-line options in UPPER case letters"

See merge request !1260
parents fc483ef5 8e5da726

lib_com/options.h

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
#define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */

#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/

#define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */



/* #################### End BE switches ################################## */

lib_util/cmdln_parser.c

+19 −0
Original line number Diff line number Diff line
@@ -150,7 +150,26 @@ static int8_t optionMatchesString( 


    const char *optionName = stringToOptionName( str );



#ifdef FIX_923_EXTERNAL_REND_COMMAND_LINE

    char optionName_to_upper[FILENAME_MAX];

    strncpy( optionName_to_upper, optionName, sizeof( optionName_to_upper ) - 1 );

    optionName_to_upper[sizeof( optionName_to_upper ) - 1] = '\0';

    to_upper( optionName_to_upper );



    char match_to_upper[FILENAME_MAX];

    strncpy( match_to_upper, opt.props.match, sizeof( match_to_upper ) - 1 );

    optionName_to_upper[sizeof( match_to_upper ) - 1] = '\0';

    to_upper( match_to_upper );



    char matchShort_to_upper[FILENAME_MAX];

    strncpy( matchShort_to_upper, opt.props.matchShort, sizeof( matchShort_to_upper ) - 1 );

    optionName_to_upper[sizeof( matchShort_to_upper ) - 1] = '\0';

    to_upper( matchShort_to_upper );



    if ( strncmp( optionName_to_upper, match_to_upper, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName_to_upper, matchShort_to_upper, MAX_OPTION_LENGTH ) == 0 )

#else

    if ( strncmp( optionName, opt.props.match, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName, opt.props.matchShort, MAX_OPTION_LENGTH ) == 0 )

#endif

    {

        return 1;

    }