various: expand paths for several file/directory related options

There's several path-related options that do not handle common shortcuts
(like ~). Fix this by using mp_get_user_path where appropriate which
expands the path so users get more intuitive behavior. Fixes mpv-player#15598.

Author: Dudemanguy

Diff for: audio/out/ao_pcm.c

@@ -28,6 +28,7 @@
 #include "mpv_talloc.h"
 
 #include "options/m_option.h"
+#include "options/path.h"
 #include "audio/format.h"
 #include "ao.h"
 #include "internal.h"
@@ -109,7 +110,7 @@ static int init(struct ao *ao)
 {
     struct priv *priv = ao->priv;
 
-    char *outputfilename = priv->outputfilename;
+    char *outputfilename = mp_get_user_path(priv, ao->global, priv->outputfilename);
     if (!outputfilename) {
         outputfilename = talloc_strdup(priv, priv->waveheader ? "audiodump.wav"
                                                               : "audiodump.pcm");

Diff for: common/encode_lavc.c

@@ -31,6 +31,7 @@
 #include "options/m_config.h"
 #include "options/m_option.h"
 #include "options/options.h"
+#include "options/path.h"
 #include "osdep/timer.h"
 #include "video/out/vo.h"
 #include "mpv_talloc.h"
@@ -135,7 +136,9 @@ struct encode_lavc_context *encode_lavc_init(struct mpv_global *global)
 
     p->muxer->oformat = ctx->oformat;
 
-    p->muxer->url = av_strdup(filename);
+    char *path = mp_get_user_path(ctx, global, filename);
+    p->muxer->url = av_strdup(path);
+    talloc_free(path);
     MP_HANDLE_OOM(p->muxer->url);
 
     return ctx;

Diff for: common/playlist.c

@@ -403,17 +403,16 @@ struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel,
     struct mp_log *log = mp_log_new(NULL, global->log, "!playlist_parser");
     mp_verbose(log, "Parsing playlist file %s...\n", file);
 
+    char *path = mp_get_user_path(NULL, global, file);
     struct demuxer_params p = {
         .force_format = "playlist",
         .stream_flags = STREAM_ORIGIN_DIRECT,
     };
-    struct demuxer *d = demux_open_url(file, &p, cancel, global);
-    if (!d) {
-        talloc_free(log);
-        return NULL;
-    }
-
+    struct demuxer *d = demux_open_url(path, &p, cancel, global);
     struct playlist *ret = NULL;
+    if (!d)
+        goto done;
+
     if (d && d->playlist) {
         ret = talloc_zero(NULL, struct playlist);
         playlist_populate_playlist_path(d->playlist, file);
@@ -434,7 +433,9 @@ struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel,
     if (ret && !ret->num_entries)
         mp_warn(log, "Warning: empty playlist\n");
 
+done:
     talloc_free(log);
+    talloc_free(path);
     return ret;
 }
 

Diff for: options/path.c

@@ -115,7 +115,7 @@ void mp_init_paths(struct mpv_global *global, struct MPOpts *opts)
     if (!opts->load_config)
         force_configdir = "";
 
-    global->configdir = talloc_strdup(global, force_configdir);
+    global->configdir = mp_get_user_path(opts, global, force_configdir);
 }
 
 char *mp_find_user_file(void *talloc_ctx, struct mpv_global *global,

Diff for: player/loadfile.c

@@ -852,8 +852,9 @@ int mp_add_external_file(struct MPContext *mpctx, char *filename,
 
     mp_core_unlock(mpctx);
 
+    char *path = mp_get_user_path(NULL, mpctx->global, filename);
     struct demuxer *demuxer =
-        demux_open_url(filename, &params, cancel, mpctx->global);
+        demux_open_url(path, &params, cancel, mpctx->global);
     if (demuxer)
         enable_demux_thread(mpctx, demuxer);
 
@@ -907,11 +908,13 @@ int mp_add_external_file(struct MPContext *mpctx, char *filename,
     }
 
     mp_cancel_set_parent(demuxer->cancel, mpctx->playback_abort);
+    talloc_free(path);
 
     return first_num;
 
 err_out:
     demux_cancel_and_free(demuxer);
+    talloc_free(path);
     if (!mp_cancel_test(cancel))
         MP_ERR(mpctx, "Can not open external file %s.\n", disp_filename);
     return -1;
@@ -1057,7 +1060,7 @@ static void load_chapters(struct MPContext *mpctx)
     bool free_src = false;
     char *chapter_file = mpctx->opts->chapter_file;
     if (chapter_file && chapter_file[0]) {
-        chapter_file = talloc_strdup(NULL, chapter_file);
+        chapter_file = mp_get_user_path(NULL, mpctx->global, chapter_file);
         mp_core_unlock(mpctx);
         struct demuxer_params p = {.stream_flags = STREAM_ORIGIN_DIRECT};
         struct demuxer *demux = demux_open_url(chapter_file, &p,

Diff for: player/misc.c

@@ -31,6 +31,7 @@
 #include "options/options.h"
 #include "options/m_property.h"
 #include "options/m_config.h"
+#include "options/path.h"
 #include "common/common.h"
 #include "common/encode.h"
 #include "common/playlist.h"
@@ -277,7 +278,8 @@ int stream_dump(struct MPContext *mpctx, const char *source_filename)
 
     int64_t size = stream_get_size(stream);
 
-    FILE *dest = fopen(opts->stream_dump, "wb");
+    char *filename = mp_get_user_path(NULL, mpctx->global, opts->stream_dump);
+    FILE *dest = fopen(filename, "wb");
     if (!dest) {
         MP_ERR(mpctx, "Error opening dump file: %s\n", mp_strerror(errno));
         goto done;
@@ -305,6 +307,7 @@ int stream_dump(struct MPContext *mpctx, const char *source_filename)
     ok &= fclose(dest) == 0;
 done:
     free_stream(stream);
+    talloc_free(filename);
     return ok ? 0 : -1;
 }
 

Diff for: video/out/vo_image.c

@@ -66,13 +66,16 @@ struct priv {
     struct vo_image_opts *opts;
 
     struct mp_image *current;
+    char *dir;
     int frame;
 };
 
 static bool checked_mkdir(struct vo *vo, const char *buf)
 {
-    MP_INFO(vo, "Creating output directory '%s'...\n", buf);
-    if (mkdir(buf, 0755) < 0) {
+    struct priv *p = vo->priv;
+    p->dir = mp_get_user_path(vo, vo->global, buf);
+    MP_INFO(vo, "Creating output directory '%s'...\n", p->dir);
+    if (mkdir(p->dir, 0755) < 0) {
         char *errstr = mp_strerror(errno);
         if (errno == EEXIST) {
             struct stat stat_p;
@@ -117,8 +120,8 @@ static void flip_page(struct vo *vo)
     char *filename = talloc_asprintf(t, "%08d.%s", p->frame,
                                      image_writer_file_ext(p->opts->opts));
 
-    if (p->opts->outdir && strlen(p->opts->outdir))
-        filename = mp_path_join(t, p->opts->outdir, filename);
+    if (p->dir && strlen(p->dir))
+        filename = mp_path_join(t, p->dir, filename);
 
     MP_INFO(vo, "Saving %s\n", filename);
     write_image(p->current, p->opts->opts, filename, vo->global, vo->log, true);