Fix ext/ftp

nikic · nikic · commit d18741d00209 · 2016-11-22T19:06:59.000+01:00
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -703,7 +703,7 @@ ftp_list(ftpbuf_t *ftp, const char *path, const size_t path_len, int recursive)
 int
 ftp_type(ftpbuf_t *ftp, ftptype_t type)
 {
-	char typechar[2];
+	const char *typechar;
 
 	if (ftp == NULL) {
 		return 0;
@@ -712,13 +712,13 @@ ftp_type(ftpbuf_t *ftp, ftptype_t type)
 		return 1;
 	}
 	if (type == FTPTYPE_ASCII) {
-		typechar[0] = 'A';
+		typechar = "A";
 	} else if (type == FTPTYPE_IMAGE) {
-		typechar[0] = 'I';
+		typechar = "I";
 	} else {
 		return 0;
 	}
-	if (!ftp_putcmd(ftp, "TYPE", sizeof("TYPE")-1, typechar, 2)) {
+	if (!ftp_putcmd(ftp, "TYPE", sizeof("TYPE")-1, typechar, 1)) {
 		return 0;
 	}
 	if (!ftp_getresp(ftp) || ftp->resp != 200) {

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ ftp_list(ftpbuf_t ftp, const char path, const size_t path_len, int recursive)`
`703`	`703`	`int`
`704`	`704`	`ftp_type(ftpbuf_t *ftp, ftptype_t type)`
`705`	`705`	`{`
`706`		`- char typechar[2];`
	`706`	`+ const char *typechar;`
`707`	`707`
`708`	`708`	`if (ftp == NULL) {`
`709`	`709`	`return 0;`
`@@ -712,13 +712,13 @@ ftp_type(ftpbuf_t *ftp, ftptype_t type)`
`712`	`712`	`return 1;`
`713`	`713`	`}`
`714`	`714`	`if (type == FTPTYPE_ASCII) {`
`715`		`- typechar[0] = 'A';`
	`715`	`+ typechar = "A";`
`716`	`716`	`} else if (type == FTPTYPE_IMAGE) {`
`717`		`- typechar[0] = 'I';`
	`717`	`+ typechar = "I";`
`718`	`718`	`} else {`
`719`	`719`	`return 0;`
`720`	`720`	`}`
`721`		`- if (!ftp_putcmd(ftp, "TYPE", sizeof("TYPE")-1, typechar, 2)) {`
	`721`	`+ if (!ftp_putcmd(ftp, "TYPE", sizeof("TYPE")-1, typechar, 1)) {`
`722`	`722`	`return 0;`
`723`	`723`	`}`
`724`	`724`	`if (!ftp_getresp(ftp) \|\| ftp->resp != 200) {`