View | Details | Raw Unified | Return to bug 1632 | Differences between
and this patch

Collapse All | Expand All

(-)a/sftp-server.c (-2 / +13 lines)
Lines 61-66 Buffer oqueue; Link Here
61
/* Version of client */
61
/* Version of client */
62
int version;
62
int version;
63
63
64
/* Charset used to encode names on the file system */
65
char *filename_charset = NULL;
66
64
/* portable attributes, etc. */
67
/* portable attributes, etc. */
65
68
66
typedef struct Stat Stat;
69
typedef struct Stat Stat;
Lines 523-528 process_init(void) Link Here
523
	/* fstatvfs extension */
526
	/* fstatvfs extension */
524
	buffer_put_cstring(&msg, "fstatvfs@openssh.com");
527
	buffer_put_cstring(&msg, "fstatvfs@openssh.com");
525
	buffer_put_cstring(&msg, "2"); /* version */
528
	buffer_put_cstring(&msg, "2"); /* version */
529
	/* filename charset extension */ 
530
	if (filename_charset) {
531
		buffer_put_cstring(&msg, "filename-charset@openssh.com");
532
		buffer_put_cstring(&msg, filename_charset);
533
	}
526
	send_msg(&msg);
534
	send_msg(&msg);
527
	buffer_free(&msg);
535
	buffer_free(&msg);
528
}
536
}
Lines 1314-1321 sftp_server_main(int argc, char **argv, struct passwd *user_pw) Link Here
1314
	extern char *__progname;
1322
	extern char *__progname;
1315
1323
1316
	log_init(__progname, log_level, log_facility, log_stderr);
1324
	log_init(__progname, log_level, log_facility, log_stderr);
1317
1325
	
1318
	while (!skipargs && (ch = getopt(argc, argv, "f:l:u:che")) != -1) {
1326
	while (!skipargs && (ch = getopt(argc, argv, "f:l:u:ches:")) != -1) {
1319
		switch (ch) {
1327
		switch (ch) {
1320
		case 'c':
1328
		case 'c':
1321
			/*
1329
			/*
Lines 1344-1349 sftp_server_main(int argc, char **argv, struct passwd *user_pw) Link Here
1344
				    optarg, errmsg);
1352
				    optarg, errmsg);
1345
			(void)umask(mask);
1353
			(void)umask(mask);
1346
			break;
1354
			break;
1355
		case 's':
1356
		        filename_charset = xstrdup(optarg);
1357
			break;
1347
		case 'h':
1358
		case 'h':
1348
		default:
1359
		default:
1349
			sftp_server_usage();
1360
			sftp_server_usage();

Return to bug 1632