Merge pull request #60 from glyptodon/create-drive
GUAC-515: Automatically create RDP drive path if requested.
This commit is contained in:
commit
8935160c72
1
AUTHORS
1
AUTHORS
@ -11,3 +11,4 @@ Felipe Weckx <felipe@weckx.net>
|
|||||||
Ruggero Vecchio <ruggero.vecchio@datev.it>
|
Ruggero Vecchio <ruggero.vecchio@datev.it>
|
||||||
Denis Bernacci <dbernaci@hotmail.com>
|
Denis Bernacci <dbernaci@hotmail.com>
|
||||||
Frode Langelo <frode@skytap.com>
|
Frode Langelo <frode@skytap.com>
|
||||||
|
Daryl Borth <dborth@gmail.com>
|
||||||
|
@ -111,6 +111,7 @@ const char* GUAC_CLIENT_ARGS[] = {
|
|||||||
"enable-printing",
|
"enable-printing",
|
||||||
"enable-drive",
|
"enable-drive",
|
||||||
"drive-path",
|
"drive-path",
|
||||||
|
"create-drive-path",
|
||||||
"console",
|
"console",
|
||||||
"console-audio",
|
"console-audio",
|
||||||
"server-layout",
|
"server-layout",
|
||||||
@ -158,6 +159,7 @@ enum RDP_ARGS_IDX {
|
|||||||
IDX_ENABLE_PRINTING,
|
IDX_ENABLE_PRINTING,
|
||||||
IDX_ENABLE_DRIVE,
|
IDX_ENABLE_DRIVE,
|
||||||
IDX_DRIVE_PATH,
|
IDX_DRIVE_PATH,
|
||||||
|
IDX_CREATE_DRIVE_PATH,
|
||||||
IDX_CONSOLE,
|
IDX_CONSOLE,
|
||||||
IDX_CONSOLE_AUDIO,
|
IDX_CONSOLE_AUDIO,
|
||||||
IDX_SERVER_LAYOUT,
|
IDX_SERVER_LAYOUT,
|
||||||
@ -303,7 +305,8 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
|
|||||||
/* Load filesystem if drive enabled */
|
/* Load filesystem if drive enabled */
|
||||||
if (guac_client_data->settings.drive_enabled) {
|
if (guac_client_data->settings.drive_enabled) {
|
||||||
guac_client_data->filesystem =
|
guac_client_data->filesystem =
|
||||||
guac_rdp_fs_alloc(client, guac_client_data->settings.drive_path);
|
guac_rdp_fs_alloc(client, guac_client_data->settings.drive_path,
|
||||||
|
guac_client_data->settings.create_drive_path);
|
||||||
client->file_handler = guac_rdp_upload_file_handler;
|
client->file_handler = guac_rdp_upload_file_handler;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -773,6 +776,9 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
|
|||||||
|
|
||||||
guac_client_data->settings.drive_path = strdup(argv[IDX_DRIVE_PATH]);
|
guac_client_data->settings.drive_path = strdup(argv[IDX_DRIVE_PATH]);
|
||||||
|
|
||||||
|
guac_client_data->settings.create_drive_path =
|
||||||
|
(strcmp(argv[IDX_CREATE_DRIVE_PATH], "true") == 0);
|
||||||
|
|
||||||
/* Store client data */
|
/* Store client data */
|
||||||
guac_client_data->rdp_inst = rdp_inst;
|
guac_client_data->rdp_inst = rdp_inst;
|
||||||
guac_client_data->mouse_button_mask = 0;
|
guac_client_data->mouse_button_mask = 0;
|
||||||
|
@ -35,12 +35,28 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/statvfs.h>
|
#include <sys/statvfs.h>
|
||||||
|
#include <sys/types.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <guacamole/object.h>
|
#include <guacamole/object.h>
|
||||||
#include <guacamole/pool.h>
|
#include <guacamole/pool.h>
|
||||||
|
|
||||||
guac_rdp_fs* guac_rdp_fs_alloc(guac_client* client, const char* drive_path) {
|
guac_rdp_fs* guac_rdp_fs_alloc(guac_client* client, const char* drive_path,
|
||||||
|
int create_drive_path) {
|
||||||
|
|
||||||
|
/* Create drive path if it does not exist */
|
||||||
|
if (create_drive_path) {
|
||||||
|
guac_client_log(client, GUAC_LOG_DEBUG,
|
||||||
|
"%s: Creating directory \"%s\" if necessary.",
|
||||||
|
__func__, drive_path);
|
||||||
|
|
||||||
|
/* Log error if directory creation fails */
|
||||||
|
if (mkdir(drive_path, S_IRWXU) && errno != EEXIST) {
|
||||||
|
guac_client_log(client, GUAC_LOG_ERROR,
|
||||||
|
"Unable to create directory \"%s\": %s",
|
||||||
|
drive_path, strerror(errno));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
guac_rdp_fs* fs = malloc(sizeof(guac_rdp_fs));
|
guac_rdp_fs* fs = malloc(sizeof(guac_rdp_fs));
|
||||||
|
|
||||||
|
@ -325,7 +325,7 @@ typedef struct guac_rdp_fs_info {
|
|||||||
/**
|
/**
|
||||||
* Allocates a new filesystem given a root path.
|
* Allocates a new filesystem given a root path.
|
||||||
*/
|
*/
|
||||||
guac_rdp_fs* guac_rdp_fs_alloc(guac_client* client, const char* drive_path);
|
guac_rdp_fs* guac_rdp_fs_alloc(guac_client* client, const char* drive_path, int create_drive_path);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Frees the given filesystem.
|
* Frees the given filesystem.
|
||||||
|
@ -155,6 +155,12 @@ typedef struct guac_rdp_settings {
|
|||||||
*/
|
*/
|
||||||
char* drive_path;
|
char* drive_path;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether to automatically create the local system path if it does not
|
||||||
|
* exist.
|
||||||
|
*/
|
||||||
|
int create_drive_path;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether this session is a console session.
|
* Whether this session is a console session.
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user