Hi,
On Fri, May 12, 2017 at 01:59:47PM +0200, Pavel Grunt wrote:
> On Fri, 2017-05-12 at 13:19 +0200, Victor Toso wrote:
> > From: Victor Toso <me@xxxxxxxxxxxxxx>
> >
> > This patch creates two functions:
> > - xfer_get_download_directory()
> > - vdagent_start_file_xfer()
> >
> > The logic should be similar as it was before this patch, taking in
> > consideration the global variables fx_open_dir and fx_dir which are
> > set from command line.
> >
> > Signed-off-by: Victor Toso <victortoso@xxxxxxxxxx>
> > ---
> > src/vdagent/vdagent.c | 76 +++++++++++++++++++++++++++++++++++++---
> > -----------
> > 1 file changed, 56 insertions(+), 20 deletions(-)
> >
> > diff --git a/src/vdagent/vdagent.c b/src/vdagent/vdagent.c
> > index 9900303..08ebd92 100644
> > --- a/src/vdagent/vdagent.c
> > +++ b/src/vdagent/vdagent.c
> > @@ -25,6 +25,7 @@
> >
> > #include <stdio.h>
> > #include <stdlib.h>
> > +#include <stdbool.h>
> > #include <string.h>
> > #include <syslog.h>
> > #include <unistd.h>
> > @@ -55,6 +56,59 @@ static struct udscs_connection *client = NULL;
> > static int quit = 0;
> > static int version_mismatch = 0;
> >
> > +/**
> > + * xfer_get_download_directory
> > + *
> > + * Return path were file-transfer will save the files. Should be
> > freed with
> > + * g_free().
> > + **/
> > +static char *
> should be g_char (g_strdup returns g_char *)
> Is anything preventing to return const gchar * ?
Not really, changing to const gchar * looks fine.
>
> > +xfer_get_download_directory(bool *open_dir_on_save)
> > +{
> > + if (open_dir_on_save != NULL)
> > + *open_dir_on_save = fx_open_dir != -1 ||
> > !vdagent_x11_has_icons_on_desktop(x11);
> > +
> > + if (fx_dir)
> I prefer an explicit comparison to NULL (like you do in the previous
> 'if')
Agreed
> > + return g_strdup(fx_dir);
> > +
> > + if (vdagent_x11_has_icons_on_desktop(x11))
> > + return
> > g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP));
> > +
> > + return
> > g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD));
> > +}
> > +
> > +/**
> > + * vdagent_start_file_xfer
> > + *
> > + * Initialize handler for file xfer and returns true if
> > vdagent_file_xfers is
>
> Why 'start' ? it does not start anything
In oppose to stop. We check the path and get the struct handler and
return true if all is good, false otherwise. Suggestions?
>
> > + * not NULL.
> > + **/
> > +static bool
> > +vdagent_start_file_xfer(void)
> > +{
> > + bool xfer_open_dir;
> > + char *xfer_dir;
> > +
> > + if (vdagent_file_xfers != NULL) {
> > + syslog(LOG_WARNING, "File-xfer already initialized");
> > + return true;
> > + }
> > +
> > + xfer_dir = xfer_get_download_directory(&xfer_open_dir);
> > + if (xfer_dir == NULL) {
> > + syslog(LOG_WARNING,
> > + "warning could not get file xfer save dir, "
> > + "file transfers will be disabled");
> > + vdagent_file_xfers = NULL;
> > + return false;
> > + }
> > +
> > + vdagent_file_xfers = vdagent_file_xfers_create(client,
> > xfer_dir,
> > + xfer_open_dir,
> > debug);
> > + g_free(xfer_dir);
> > + return (vdagent_file_xfers != NULL);
> > +}
> > +
> > static void daemon_read_complete(struct udscs_connection **connp,
> > struct udscs_message_header *header, uint8_t *data)
> > {
> > @@ -313,26 +367,8 @@ reconnect:
> > return 1;
> > }
> >
> > - if (!fx_dir) {
> > - if (vdagent_x11_has_icons_on_desktop(x11))
> > - fx_dir = "xdg-desktop";
> > - else
> > - fx_dir = "xdg-download";
> > - }
> > - if (fx_open_dir == -1)
> > - fx_open_dir = !vdagent_x11_has_icons_on_desktop(x11);
> > - if (!strcmp(fx_dir, "xdg-desktop"))
> > - fx_dir = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
> > - else if (!strcmp(fx_dir, "xdg-download"))
> > - fx_dir = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
> > - if (fx_dir) {
> > - vdagent_file_xfers = vdagent_file_xfers_create(client,
> > fx_dir,
> > - fx_open_dir,
> > debug);
> > - } else {
> > - syslog(LOG_WARNING,
> > - "warning could not get file xfer save dir, file
> > transfers will be disabled");
> > - vdagent_file_xfers = NULL;
> > - }
> > + if (!vdagent_start_file_xfer())
> > + syslog(LOG_WARNING, "File transfer is disabled");
> >
> > if (parent_socket) {
> > if (write(parent_socket, "OK", 2) != 2)
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel