comparison mencoder.c @ 34172:5761a9a31bcb

Sanitize include option behaviour. If the file could not be opened/read/processed, print a message and quit instead of completely silently ignoring it.

34171:cca4f430b0f4

static void parse_cfgfiles( m_config_t* conf )
{
  char *conffile;
  if (!disable_system_conf &&
      m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0)
    mencoder_exit(1,MSGTR_ConfigFileError);

  if (!disable_user_conf) {
    if ((conffile = get_path("mencoder.conf")) == NULL) {
      mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
    } else {
      if (m_config_parse_config_file(conf, conffile) < 0)
        mencoder_exit(1,MSGTR_ConfigFileError);
      free(conffile);
    }
  }
}

34172:5761a9a31bcb

static void parse_cfgfiles( m_config_t* conf )
{
  char *conffile;
  if (!disable_system_conf &&
      m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf", 1) < 0)
    mencoder_exit(1,MSGTR_ConfigFileError);

  if (!disable_user_conf) {
    if ((conffile = get_path("mencoder.conf")) == NULL) {
      mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
    } else {
      if (m_config_parse_config_file(conf, conffile, 1) < 0)
        mencoder_exit(1,MSGTR_ConfigFileError);
      free(conffile);
    }
  }
}