Attachment 1668 Details for Bug 1632 – Add support for utf8 hint sftp extension to sftp-server

[patch] Add support for utf8 hint sftp extension to sftp-server

openssh-utf8.patch (text/plain), 1.96 KB, created by Marton Balint on 2009-08-12 02:07:43 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Marton Balint

Created: 2009-08-12 02:07:43 AEST

Size: 1.96 KB

patch

obsolete

>Index: sftp-server.8
>===================================================================
>RCS file: /cvs/openssh/sftp-server.8,v
>retrieving revision 1.18
>diff -u -r1.18 sftp-server.8
>--- sftp-server.8	21 Jun 2009 07:52:28 -0000	1.18
>+++ sftp-server.8	17 Jul 2009 10:42:41 -0000
>@@ -30,6 +30,7 @@
> .Nd SFTP server subsystem
> .Sh SYNOPSIS
> .Nm sftp-server
>+.Op Fl u
> .Op Fl f Ar log_facility
> .Op Fl l Ar log_level
> .Sh DESCRIPTION
>@@ -54,6 +55,9 @@
> .Pp
> Valid options are:
> .Bl -tag -width Ds
>+.It Fl u
>+Notifies the clients about the utf-8 encoding of the filenames with the
>+utf-8@openssh.com sftp extension.
> .It Fl f Ar log_facility
> Specifies the facility code that is used when logging messages from
> .Nm .
>Index: sftp-server.c
>===================================================================
>RCS file: /cvs/openssh/sftp-server.c,v
>retrieving revision 1.101
>diff -u -r1.101 sftp-server.c
>--- sftp-server.c	21 Jun 2009 07:53:48 -0000	1.101
>+++ sftp-server.c	17 Jul 2009 10:42:42 -0000
>@@ -70,6 +70,9 @@
> /* Version of client */
> int version;
> 
>+/* Tell the clients we're using utf8 */
>+int utf8_hint = 0;
>+
> /* portable attributes, etc. */
> 
> typedef struct Stat Stat;
>@@ -532,6 +535,11 @@
> 	/* fstatvfs extension */
> 	buffer_put_cstring(&msg, "fstatvfs@openssh.com");
> 	buffer_put_cstring(&msg, "2"); /* version */
>+	if (utf8_hint) {
>+		/* utf-8 hint for sftp version 3 */
>+		buffer_put_cstring(&msg, "utf-8@openssh.com");
>+		buffer_put_cstring(&msg, "1"); /* version */
>+	}
> 	send_msg(&msg);
> 	buffer_free(&msg);
> }
>@@ -1341,7 +1349,7 @@
> 	__progname = ssh_get_progname(argv[0]);
> 	log_init(__progname, log_level, log_facility, log_stderr);
> 
>-	while (!skipargs && (ch = getopt(argc, argv, "f:l:che")) != -1) {
>+	while (!skipargs && (ch = getopt(argc, argv, "f:l:cheu")) != -1) {
> 		switch (ch) {
> 		case 'c':
> 			/*
>@@ -1349,6 +1357,9 @@
> 			 * shell using "sftp-server -c command"
> 			 */
> 			skipargs = 1;
>+			break;
>+		case 'u':
>+			utf8_hint = 1;
> 			break;
> 		case 'e':
> 			log_stderr = 1;

Actions: View | Diff

Attachments on bug 1632: 1668 | 1769 | 1770 | 1773