On Sun, Dec 01, 2019 at 05:33:16PM +0100, Hendrik Leppkes wrote: > On Sun, Dec 1, 2019 at 3:08 PM <[email protected]> wrote: > > > > From: Limin Wang <[email protected]> > > > > Signed-off-by: Limin Wang <[email protected]> > > --- > > libavformat/utils.c | 16 ++++++++++------ > > 1 file changed, 10 insertions(+), 6 deletions(-) > > > > diff --git a/libavformat/utils.c b/libavformat/utils.c > > index 579e6d6..993e6d2 100644 > > --- a/libavformat/utils.c > > +++ b/libavformat/utils.c > > @@ -4843,12 +4843,17 @@ void av_url_split(char *proto, int proto_size, > > } > > } > > > > +#if HAVE_DOS_PATHS > > +#define SEPARATOR '\\' > > +#else > > +#define SEPARATOR '/' > > +#endif > > + > > int ff_mkdir_p(const char *path) > > { > > int ret = 0; > > char *temp = av_strdup(path); > > char *pos = temp; > > - char tmp_ch = '\0'; > > > > if (!path || !temp) { > > return -1; > > @@ -4856,19 +4861,18 @@ int ff_mkdir_p(const char *path) > > > > if (*temp == '.') > > pos++; > > - if (*temp == '/' || *temp == '\\') > > + if (*temp == SEPARATOR) > > pos++; > > > > for ( ; *pos != '\0'; ++pos) { > > - if (*pos == '/' || *pos == '\\') { > > - tmp_ch = *pos; > > + if (*pos == SEPARATOR) { > > *pos = '\0'; > > ret = mkdir(temp, 0755); > > - *pos = tmp_ch; > > + *pos = SEPARATOR; > > } > > } > > > > - if ((*(pos - 1) != '/') || (*(pos - 1) != '\\')) { > > + if (*(pos - 1) != SEPARATOR) { > > ret = mkdir(temp, 0755); > > } > > I think there is some value to be able to specify a path with both > kinds of slashes. For example, most of everything else on Windows will > accept normal slashes, in addition to the default backslash. Hendrik, I haven't got your point yet, can you make it clear so that I can change the patch for your case.
For example, on Linux, if the path is: ~/Movies/hl\\s/vs%v/manifest.m3u8 The current code will mkdir below path: path: /Users path: /Users/lmwang path: /Users/lmwang/Movies path: /Users/lmwang/Movies/hl >>> unexpected path: /Users/lmwang/Movies/hl\s path: /Users/lmwang/Movies/hl\s/vs0 You can see /Users/lmwang/Movies/hl directory isn't expected directory which is created. After applied the patch, it'll not create it anymore. > > - Hendrik > _______________________________________________ > ffmpeg-devel mailing list > [email protected] > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > [email protected] with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
