LAV/FFmpeg
1
0
Fork 0
Code

avformat/ftp: send CLNT before enabling UTF8

Browse Source 
This fixes UTF-8 filenames on some peculiar FTP servers.
This commit is contained in:
Hendrik Leppkes 2023-01-10 11:32:21 +01:00
parent 17241e3e11
commit 30afed3913
Signed by: hendrik
GPG Key ID: 846079A4B0A7C1B5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/ftp.c
View File

@ -31,6 +31,7 @@
#include "urldecode.h"
#include "libavutil/opt.h"
#include "libavutil/bprint.h"
#include "version.h"
#define CONTROL_BUFFER_SIZE 1024
#define DIR_BUFFER_SIZE 4096
@ -545,6 +546,7 @@ static int ftp_features(FTPContext *s)
{
static const char *feat_command = "FEAT\r\n";
static const char *enable_utf8_command = "OPTS UTF8 ON\r\n";
static const char *clnt_command = "CLNT " LIBAVFORMAT_IDENT "\r\n";
static const int feat_codes[] = {211, 0};
static const int opts_codes[] = {200, 202, 451, 0};
@ -554,7 +556,13 @@ static int ftp_features(FTPContext *s)
}
if (ftp_has_feature(s, "UTF8")) {
int ret = ftp_send_command(s, enable_utf8_command, opts_codes, NULL);
int ret;
if (ftp_has_feature(s, "CLNT")) {
ftp_send_command(s, clnt_command, NULL, NULL);
}
ret = ftp_send_command(s, enable_utf8_command, opts_codes, NULL);
if (ret == 200 || ret == 202)
s->utf8 = 1;
}