Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fftools/fopen_utf8: support long paths on Windows for fftools #36

Closed

Conversation

softworkz
Copy link
Collaborator

@softworkz softworkz commented Jun 13, 2022

After Nil's patchset, this is probably the final missing bit.

Signed-off-by: softworkz softworkz@hotmail.com
cc: Martin Storsjö martin@martin.st

Signed-off-by: softworkz <softworkz@hotmail.com>
@softworkz
Copy link
Collaborator Author

/submit

@ffmpeg-codebot
Copy link

Submitted as pull.36.ffstaging.FFmpeg.1655163773842.ffmpegagent@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-36/softworkz/submit_fftools_long_paths-v1

To fetch this version to local tag pr-ffstaging-36/softworkz/submit_fftools_long_paths-v1:

git fetch --no-tags https://github.com/ffstaging/FFmpeg tag pr-ffstaging-36/softworkz/submit_fftools_long_paths-v1

@ffmpeg-codebot
Copy link

On the FFmpeg mailing list, Martin Storsjö wrote (reply to this):

On Mon, 13 Jun 2022, softworkz wrote:

> From: softworkz <softworkz@hotmail.com>
>
> Signed-off-by: softworkz <softworkz@hotmail.com>
> ---
>    fftools/fopen_utf8: support long paths on Windows for fftools
>
>    After Nil's patchset, this is probably the final missing bit.
>
>    Signed-off-by: softworkz softworkz@hotmail.com
>
> Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-36%2Fsoftworkz%2Fsubmit_fftools_long_paths-v1
> Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-36/softworkz/submit_fftools_long_paths-v1
> Pull-Request: https://github.com/ffstaging/FFmpeg/pull/36
>
> fftools/fopen_utf8.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fftools/fopen_utf8.h b/fftools/fopen_utf8.h
> index cd18fe8ce1..e5be84179a 100644
> --- a/fftools/fopen_utf8.h
> +++ b/fftools/fopen_utf8.h
> @@ -35,7 +35,7 @@ static inline FILE *fopen_utf8(const char *path_utf8, const char *mode)
>     FILE *f;
>
>     /* convert UTF-8 to wide chars */
> -    if (utf8towchar(path_utf8, &path_w)) /* This sets errno on error. */
> +    if (get_extended_win32_path(path_utf8, &path_w)) /* This sets errno on error. */
>         return NULL;
>     if (!path_w)
>         goto fallback;
>
> base-commit: 4d45f5acbd9ab55cd8d29d01843f28315ee27fee
> -- 
> ffmpeg-codebot

Looks ok, will push soon.

// Martin

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

@ffmpeg-codebot
Copy link

User Martin Storsjö <martin@martin.st> has been added to the cc: list.

@softworkz
Copy link
Collaborator Author

merged upstream

@softworkz softworkz closed this Jul 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant