[Xfce4-commits] [panel-plugins/xfce4-verve-plugin] 01/01: Perform word expansion on directory names to allow tilde and environment variables

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

isaacschemm pushed a commit to branch master
in repository panel-plugins/xfce4-verve-plugin.

commit 1f17c0687bcea8b11e7936cfedb87ead4cabc8fc
Author: Isaac Schemm <isaacschemm at gmail.com>
Date:   Sun Feb 15 17:38:56 2015 -0600

    Perform word expansion on directory names to allow tilde and environment variables
---
 panel-plugin/verve.c |   37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/panel-plugin/verve.c b/panel-plugin/verve.c
index e8de229..01b78db 100644
--- a/panel-plugin/verve.c
+++ b/panel-plugin/verve.c
@@ -25,6 +25,8 @@
 
 #include <glib-object.h>
 
+#include <wordexp.h>
+
 #include <libxfce4ui/libxfce4ui.h>
 
 #include "verve.h"
@@ -35,7 +37,7 @@
 
 static gboolean verve_is_url       (const gchar *str);
 static gboolean verve_is_email     (const gchar *str);
-static gboolean verve_is_directory (const gchar *str);
+static gchar *verve_is_directory   (const gchar *str);
 
 
 
@@ -83,7 +85,7 @@ verve_shutdown (void)
 
 static void verve_setsid (gpointer p)
 {
-	setsid();
+    setsid();
 }
 
 /*********************************************************************
@@ -157,14 +159,21 @@ verve_execute (const gchar *input,
                VerveLaunchParams launch_params)
 {
   gchar   *command;
+  gchar   *directory_exp;
   gboolean result = FALSE;
     
   /* Open URLs, eMail addresses and directories using exo-open */
-  if (verve_is_url (input) || verve_is_email (input) || verve_is_directory (input))
+  if (verve_is_url (input) || verve_is_email (input))
   {
     /* Build exo-open command */
     command = g_strconcat ("exo-open ", input, NULL);
   }
+  else if (directory_exp = verve_is_directory (input))
+  {
+    /* Build exo-open command */
+    command = g_strconcat ("exo-open ", directory_exp, NULL);
+    g_free (directory_exp);
+  }
   else if ((launch_params.use_bang && input[0] == '!') || (launch_params.use_backslash && input[0] == '\\'))
   {
     /* Launch DuckDuckGo */
@@ -282,17 +291,27 @@ verve_is_email (const gchar *str)
 
 
 
-gboolean
+gchar *
 verve_is_directory (const gchar *str)
 {
+  wordexp_t w;
+  int result;
+
   /* Avoid opening directories with the same name as an existing executable. */
   if (g_find_program_in_path (str))
-    return FALSE;
-
-  if (g_file_test (str, G_FILE_TEST_IS_DIR))
-    return TRUE;
+    return NULL;
+
+  /* Run wordexp with command substitution turned off */
+  result = wordexp(str, &w, WRDE_NOCMD);
+  /* Only use result if it expanded successfully to exactly one "word" and the result is a directory */
+  if (result != 0)
+    return NULL;
+  else if (w.we_wordc != 1)
+    return NULL;
+  else if (g_file_test (w.we_wordv[0], G_FILE_TEST_IS_DIR))
+    return g_strdup (w.we_wordv[0]);
   else
-    return FALSE;
+    return NULL;
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.