summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--options/m_option.c67
-rw-r--r--options/m_option.h3
-rw-r--r--options/options.c6
-rw-r--r--player/command.c21
-rw-r--r--player/command.h1
-rw-r--r--player/osd.c4
-rw-r--r--player/playloop.c3
7 files changed, 37 insertions, 68 deletions
diff --git a/options/m_option.c b/options/m_option.c
index e0ab4ed6c8..7cfd518eb1 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -745,36 +745,6 @@ const m_option_type_t m_option_type_float = {
#undef VAL
#define VAL(x) (*(char **)(x))
-static char *unescape_string(void *talloc_ctx, bstr str)
-{
- bstr dst = {0};
- while (str.len) {
- if (!mp_append_escaped_string(talloc_ctx, &dst, &str)) {
- talloc_free(dst.start);
- return NULL;
- }
- if (!bstr_eatstart0(&str, "\""))
- break;
- bstr_xappend(talloc_ctx, &dst, bstr0("\""));
- }
- return dst.start;
-}
-
-static char *escape_string(char *str0)
-{
- char *res = talloc_strdup(NULL, "");
- bstr str = bstr0(str0);
- while (str.len) {
- bstr rest;
- bool esc = bstr_split_tok(str, "\\", &str, &rest);
- res = talloc_strndup_append_buffer(res, str.start, str.len);
- if (esc)
- res = talloc_strdup_append_buffer(res, "\\\\");
- str = rest;
- }
- return res;
-}
-
static int clamp_str(const m_option_t *opt, void *val)
{
char *v = VAL(val);
@@ -789,43 +759,26 @@ static int clamp_str(const m_option_t *opt, void *val)
static int parse_str(struct mp_log *log, const m_option_t *opt,
struct bstr name, struct bstr param, void *dst)
{
- int r = 1;
- void *tmp = talloc_new(NULL);
-
- if (param.start == NULL) {
- r = M_OPT_MISSING_PARAM;
- goto exit;
- }
+ if (param.start == NULL)
+ return M_OPT_MISSING_PARAM;
m_opt_string_validate_fn validate = opt->priv;
if (validate) {
- r = validate(log, opt, name, param);
+ int r = validate(log, opt, name, param);
if (r < 0)
- goto exit;
- }
-
- if (opt->flags & M_OPT_PARSE_ESCAPES) {
- char *res = unescape_string(tmp, param);
- if (!res) {
- mp_err(log, "Parameter has broken escapes: %.*s\n", BSTR_P(param));
- r = M_OPT_INVALID;
- goto exit;
- }
- param = bstr0(res);
+ return r;
}
if ((opt->flags & M_OPT_MIN) && (param.len < opt->min)) {
mp_err(log, "Parameter must be >= %d chars: %.*s\n",
(int) opt->min, BSTR_P(param));
- r = M_OPT_OUT_OF_RANGE;
- goto exit;
+ return M_OPT_OUT_OF_RANGE;
}
if ((opt->flags & M_OPT_MAX) && (param.len > opt->max)) {
mp_err(log, "Parameter must be <= %d chars: %.*s\n",
(int) opt->max, BSTR_P(param));
- r = M_OPT_OUT_OF_RANGE;
- goto exit;
+ return M_OPT_OUT_OF_RANGE;
}
if (dst) {
@@ -833,16 +786,12 @@ static int parse_str(struct mp_log *log, const m_option_t *opt,
VAL(dst) = bstrdup0(NULL, param);
}
-exit:
- talloc_free(tmp);
- return r;
+ return 0;
}
static char *print_str(const m_option_t *opt, const void *val)
{
- bool need_escape = opt->flags & M_OPT_PARSE_ESCAPES;
- char *s = val ? VAL(val) : NULL;
- return s ? (need_escape ? escape_string(s) : talloc_strdup(NULL, s)) : NULL;
+ return talloc_strdup(NULL, val ? VAL(val) : NULL);
}
static void copy_str(const m_option_t *opt, void *dst, const void *src)
diff --git a/options/m_option.h b/options/m_option.h
index 9178231b2b..fc46599483 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -338,9 +338,6 @@ struct m_option {
// See M_OPT_TYPE_OPTIONAL_PARAM.
#define M_OPT_OPTIONAL_PARAM (1 << 10)
-// Parse C-style escapes like "\n" (for CONF_TYPE_STRING only)
-#define M_OPT_PARSE_ESCAPES (1 << 11)
-
// These are kept for compatibility with older code.
#define CONF_MIN M_OPT_MIN
#define CONF_MAX M_OPT_MAX
diff --git a/options/options.c b/options/options.c
index 700415a443..4bac77c7b7 100644
--- a/options/options.c
+++ b/options/options.c
@@ -602,9 +602,9 @@ const m_option_t mp_opts[] = {
OPT_FLAG("term-osd-bar", term_osd_bar, 0),
OPT_STRING("term-osd-bar-chars", term_osd_bar_chars, 0),
- OPT_STRING("playing-msg", playing_msg, M_OPT_PARSE_ESCAPES),
- OPT_STRING("status-msg", status_msg, M_OPT_PARSE_ESCAPES),
- OPT_STRING("osd-status-msg", osd_status_msg, M_OPT_PARSE_ESCAPES),
+ OPT_STRING("playing-msg", playing_msg, 0),
+ OPT_STRING("status-msg", status_msg, 0),
+ OPT_STRING("osd-status-msg", osd_status_msg, 0),
OPT_FLAG("slave-broken", slave_mode, CONF_GLOBAL),
OPT_FLAG("idle", player_idle_mode, CONF_GLOBAL),
diff --git a/player/command.c b/player/command.c
index d9984fc8cb..96b9484781 100644
--- a/player/command.c
+++ b/player/command.c
@@ -2221,6 +2221,27 @@ char *mp_property_expand_string(struct MPContext *mpctx, const char *str)
return m_properties_expand_string(mp_properties, str, mpctx);
}
+// Before expanding properties, parse C-style escapes like "\n"
+char *mp_property_expand_escaped_string(struct MPContext *mpctx, const char *str)
+{
+ void *tmp = talloc_new(NULL);
+ bstr strb = bstr0(str);
+ bstr dst = {0};
+ while (strb.len) {
+ if (!mp_append_escaped_string(tmp, &dst, &strb)) {
+ talloc_free(tmp);
+ return talloc_strdup(NULL, "(broken escape sequences)");
+ }
+ // pass " through literally
+ if (!bstr_eatstart0(&strb, "\""))
+ break;
+ bstr_xappend(tmp, &dst, bstr0("\""));
+ }
+ char *r = mp_property_expand_string(mpctx, dst.start);
+ talloc_free(tmp);
+ return r;
+}
+
void property_print_help(struct mp_log *log)
{
m_properties_print_help_list(log, mp_properties);
diff --git a/player/command.h b/player/command.h
index 61fe1ffad0..a04bfac343 100644
--- a/player/command.h
+++ b/player/command.h
@@ -28,6 +28,7 @@ void command_uninit(struct MPContext *mpctx);
void run_command(struct MPContext *mpctx, struct mp_cmd *cmd);
char *mp_property_expand_string(struct MPContext *mpctx, const char *str);
+char *mp_property_expand_escaped_string(struct MPContext *mpctx, const char *str);
void property_print_help(struct mp_log *log);
int mp_property_do(const char* name, int action, void* val,
struct MPContext *mpctx);
diff --git a/player/osd.c b/player/osd.c
index abfe826a81..d8ba356b33 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -159,7 +159,7 @@ void print_status(struct MPContext *mpctx)
}
if (opts->status_msg) {
- char *r = mp_property_expand_string(mpctx, opts->status_msg);
+ char *r = mp_property_expand_escaped_string(mpctx, opts->status_msg);
term_osd_set_status(mpctx, r);
talloc_free(r);
return;
@@ -428,7 +428,7 @@ static void sadd_osd_status(char **buffer, struct MPContext *mpctx, bool full)
saddf_osd_function_sym(buffer, sym);
char *custom_msg = mpctx->opts->osd_status_msg;
if (custom_msg && full) {
- char *text = mp_property_expand_string(mpctx, custom_msg);
+ char *text = mp_property_expand_escaped_string(mpctx, custom_msg);
*buffer = talloc_strdup_append(*buffer, text);
talloc_free(text);
} else {
diff --git a/player/playloop.c b/player/playloop.c
index 88adf9e35c..87236a34f0 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -1244,7 +1244,8 @@ void run_playloop(struct MPContext *mpctx)
if (opts->playing_msg && !mpctx->playing_msg_shown && new_frame_shown) {
mpctx->playing_msg_shown = true;
- char *msg = mp_property_expand_string(mpctx, opts->playing_msg);
+ char *msg =
+ mp_property_expand_escaped_string(mpctx, opts->playing_msg);
MP_INFO(mpctx, "%s\n", msg);
talloc_free(msg);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 15:53:25 +0000