diff lib/sshv2.c @ 124:65048c959029

2003-4-6 Brian Masney <[e-mail]> * lib/config_file.c src/text/gftp-text.c - changed arguments of gftp_read_config_file() and gftp_read_bookmarks() to take an argument to the path of the global config directory. The text/gtk+ port will just pass SHARE_DIR. The native MacOS X port that is in the works needs this (Nathan Robertson is currently working on this port) * lib/gftp.h lib/config_file.c - removed config variable type gftp_option_type_textarray * lib/gftp.h lib/config_file.c - removed copy_function from gftp_option_type_var. This is implemented with memcpy() instead * lib/rfc959.c - remember to rename all instances of firewall_* to ftp_proxy_* * lib/sshv2.c - improved generating the argument list for the ssh client * lib/sshv2.c lib/misc.c lib/gftp.h - added len argument to ptym_open() * lib/protocols.c lib/misc.c lib/config_file.c - use g_strdup() instead of g_malloc()/strcpy()

--- a/lib/sshv2.c	Sun Apr 06 15:38:27 2003 +0000
+++ b/lib/sshv2.c	Tue Apr 08 01:43:33 2003 +0000
@@ -32,7 +32,7 @@
    gftp_option_type_text, "ssh", NULL, 0,
    N_("The path to the SSH executable"), GFTP_PORT_ALL, NULL},
   {"ssh_extra_params", N_("SSH Extra Params:"), 
-   gftp_option_type_textarray, NULL, NULL, 0,  
+   gftp_option_type_text, NULL, NULL, 0,  
    N_("Extra parameters to pass to the SSH program"), GFTP_PORT_ALL, NULL},
   {"ssh2_sftp_path", N_("SSH2 sftp-server path:"), 
    gftp_option_type_text, NULL, NULL, 0,
@@ -147,109 +147,110 @@
 #define SSH_ERROR_QUESTION	-2
 #define SSH_WARNING 		-3
 
-/* We have the caller send us a pointer to a string so we can write the port
-   into it. It makes it easier so we don't have to worry about freeing it 
-   later on, the caller can just send us an auto variable, The string
-   should be at least 6 chars. I know this is messy... */
+static void
+sshv2_add_exec_args (char **logstr, size_t *logstr_len, char ***args, 
+                     size_t *args_len, size_t *args_cur, char *first, ...)
+{
+  char tempstr[2048], *curpos, *endpos, save_char;
+  va_list argp;
+  int at_end;
+
+  va_start (argp, first);
+  g_vsnprintf (tempstr, sizeof (tempstr), first, argp);
+  va_end (argp);
+
+  *logstr_len += strlen (tempstr);
+  *logstr = g_realloc (*logstr, *logstr_len + 1);
+  strcat (*logstr, tempstr);
+
+  curpos = tempstr;
+  while (*curpos == ' ')
+    curpos++;
+
+  save_char = ' ';
+  at_end = 0;
+  while (!at_end)
+    {
+      if (*curpos == '"')
+        {
+          curpos++;
+          endpos = strchr (curpos + 1, '"');
+        }
+      else
+        endpos = strchr (curpos, ' ');
+
+      if (endpos == NULL)
+        at_end = 1;
+      else
+        {
+          save_char = *endpos;
+          *endpos = '\0';
+        }
+
+      if (*args_cur == *args_len + 1)
+        {
+          *args_cur += 10;
+          *args = g_realloc (*args, sizeof (char *) * *args_cur);
+        }
+
+      (*args)[(*args_len)++] = g_strdup (curpos);
+      (*args)[*args_len] = NULL;
+
+      if (!at_end)
+        {
+          *endpos = save_char;
+          curpos = endpos + 1;
+          while (*curpos == ' ')
+            curpos++;
+        }
+    }
+}
+
 
 static char **
 sshv2_gen_exec_args (gftp_request * request, char *execname, 
-                    int use_sftp_subsys, char *portstring)
+                    int use_sftp_subsys)
 {
-  char **args, *oldstr, *tempstr, *ssh_prog_name, **ssh_extra_params_list;
-  int i, j, num_ssh_extra_params;
-  struct servent serv_struct;
-
-  ssh_extra_params_list = NULL;
-  gftp_lookup_request_option (request, "ssh_extra_params", 
-                              &ssh_extra_params_list);
+  size_t logstr_len, args_len, args_cur;
+  char **args, *tempstr, *logstr;
 
-  num_ssh_extra_params = 0;
-  if (ssh_extra_params_list != NULL)
-    {
-      for (j=0; ssh_extra_params_list[j] != NULL; j++)
-        {
-          num_ssh_extra_params++;
-        }
-     }
-
-  args = g_malloc (sizeof (char *) * (num_ssh_extra_params + 15));
+  gftp_lookup_request_option (request, "ssh_prog_name", &tempstr);
+  if (tempstr == NULL || *tempstr == '\0')
+    tempstr = "ssh";
 
-  ssh_prog_name = "ssh";
-  gftp_lookup_request_option (request, "ssh_prog_name", &ssh_prog_name);
-  args[0] = ssh_prog_name;
+  args_len = 1;
+  args_cur = 15;
+  args = g_malloc (sizeof (char *) * args_cur);
+  args[0] = g_strdup (tempstr);
 
-  i = 1;
-  tempstr = g_strdup (args[0]);
-
+  logstr = g_strdup (args[0]);
+  logstr_len = strlen (logstr);
 
-  if (ssh_extra_params_list != NULL)
-    {
-      for (j=0; ssh_extra_params_list[j] != NULL; j++)
-        {
-          oldstr = tempstr;
-          args[i++] = ssh_extra_params_list[j];
-          tempstr = g_strconcat (oldstr, " ", ssh_extra_params_list[j], NULL);
-          g_free (oldstr);
-        }
-    }
+  gftp_lookup_request_option (request, "ssh_extra_params", &tempstr);
+  if (tempstr != NULL && *tempstr != '\0')
+    sshv2_add_exec_args (&logstr, &logstr_len, &args, &args_len, &args_cur,
+                         "%s", tempstr);
 
-  oldstr = tempstr;
-  tempstr = g_strconcat (oldstr, " -e none", NULL);
-  g_free (oldstr);
-  args[i++] = "-e";
-  args[i++] = "none";
+  sshv2_add_exec_args (&logstr, &logstr_len, &args, &args_len, &args_cur,
+                       " -e none");
 
   if (request->username && *request->username != '\0')
-    {
-      oldstr = tempstr;
-      tempstr = g_strconcat (oldstr, " -l ", request->username, NULL);
-      g_free (oldstr);
-      args[i++] = "-l";
-      args[i++] = request->username;
-    }
+    sshv2_add_exec_args (&logstr, &logstr_len, &args, &args_len, &args_cur,
+                         " -l %s", request->username);
 
-  if (request->port != 0)
-    {
-      g_snprintf (portstring, 6, "%d", request->port);
-      oldstr = tempstr;
-      tempstr = g_strconcat (oldstr, " -p ", portstring, NULL);
-      g_free (oldstr);
-      args[i++] = "-p";
-      args[i++] = portstring;
-    }
-  else
-    {
-      if (!r_getservbyname ("ssh", "tcp", &serv_struct, NULL))
-        request->port = 22;
-      else
-        request->port = ntohs (serv_struct.s_port);
-    }
+  sshv2_add_exec_args (&logstr, &logstr_len, &args, &args_len, &args_cur,
+                       " -p %d", request->port);
 
   if (use_sftp_subsys)
-    {
-      oldstr = tempstr;
-      tempstr = g_strconcat (oldstr, " ", request->hostname, " -s sftp", NULL);
-      g_free (oldstr);
-      args[i++] = request->hostname;
-      args[i++] = "-s";
-      args[i++] = "sftp";
-      args[i] = NULL;
-    }
+    sshv2_add_exec_args (&logstr, &logstr_len, &args, &args_len, &args_cur,
+                         " %s -s sftp", request->hostname);
   else
-    {
-      oldstr = tempstr;
-      tempstr = g_strconcat (oldstr, " ", request->hostname, " \"", execname, 
-                             "\"", NULL);
-      g_free (oldstr);
-      args[i++] = request->hostname;
-      args[i++] = execname;
-      args[i] = NULL;
-    }
+    sshv2_add_exec_args (&logstr, &logstr_len, &args, &args_len, &args_cur,
+                         " %s \"%s\"", request->hostname, execname);
 
   request->logging_function (gftp_logging_misc, request->user_data, 
-                             _("Running program %s\n"), tempstr);
-  g_free (tempstr);
+                             _("Running program %s\n"), logstr);
+  g_free (logstr);
   return (args);
 }
 
@@ -798,12 +799,23 @@
 }
 
 
+static void
+sshv2_free_args (char **args)
+{
+  int i;
+
+  for (i=0; args[i] != NULL; i++)
+    g_free (args[i]);
+  g_free (args);
+}
+
+
 static int
 sshv2_connect (gftp_request * request)
 {
   int version, fdm, fds, s[2], ret, ssh_use_askpass, sshv2_use_sftp_subsys;
-  char **args, *tempstr, pts_name[20], *p1, p2, *exepath, port[6],
-       *ssh2_sftp_path;
+  char **args, *tempstr, pts_name[20], *p1, p2, *exepath, *ssh2_sftp_path;
+  struct servent serv_struct;
   sshv2_message message;
   pid_t child;
 
@@ -839,9 +851,20 @@
       p2 = '/';
     }
 
-  *port = '\0';
+  if (request->port == 0)
+    {
+      if (!r_getservbyname ("ssh", "tcp", &serv_struct, NULL))
+        {
+         request->logging_function (gftp_logging_error, request->user_data,
+                                    _("Cannot look up service name %s/tcp. Please check your services file\n"),
+                                    "ssh");
+        }
+      else
+        request->port = ntohs (serv_struct.s_port);
+    }
+
   exepath = g_strdup_printf ("echo -n xsftp ; %s%csftp-server", p1, p2);
-  args = sshv2_gen_exec_args (request, exepath, sshv2_use_sftp_subsys, port);
+  args = sshv2_gen_exec_args (request, exepath, sshv2_use_sftp_subsys);
 
   if (ssh_use_askpass || sshv2_use_sftp_subsys)
     {
@@ -857,7 +880,7 @@
   else
     {
       s[0] = s[1] = 0;
-      if ((fdm = ptym_open (pts_name)) < 0)
+      if ((fdm = ptym_open (pts_name, sizeof (pts_name))) < 0)
         {
           request->logging_function (gftp_logging_error, request->user_data,
                                 _("Cannot open master pty %s: %s\n"), pts_name,
@@ -911,13 +934,13 @@
               !(strlen (tempstr) > 4 && strcmp (tempstr + strlen (tempstr) - 5,
                                                 "xsftp") == 0))
             {
-              g_free (args);
+              sshv2_free_args (args);
               g_free (exepath);
               return (GFTP_EFATAL);
             }
           g_free (tempstr);
         }
-      g_free (args);
+      sshv2_free_args (args);
       g_free (exepath);
 
       request->sockfd = fdm;