diff lib/sshv2.c @ 555:7f54d0c0edbc

2004-9-17 Brian Masney <[e-mail]> * lib/misc.c lib/cache.c lib/config_file.c lib/gftp.h lib/protocols.c lib/rfc2068.c lib/sshv2.c src/gtk/bookmarks.c src/gtk/dnd.c src/gtk/gftp-gtk.c src/gtk/gtkui.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/transfer.c src/uicommon/gftpui.c - added gftp_request argument to gftp_build_path() and expand_path(). Renamed expand_path() to gftp_expand_path() * lib/gftp.h - fixed compile error in gftp_need_username macro

--- a/lib/sshv2.c	Tue Sep 14 10:24:01 2004 +0000
+++ b/lib/sshv2.c	Fri Sep 17 23:37:47 2004 +0000
@@ -183,7 +183,7 @@
     }
   else
     {
-      tempstr = gftp_build_path (request->directory, path, NULL);
+      tempstr = gftp_build_path (request, request->directory, path, NULL);
       pathlen = strlen (tempstr);
       *len += pathlen + 8;
       ret = sshv2_initialize_string (request, *len);
@@ -1586,12 +1586,12 @@
   if (*oldname == '/')
     oldstr = g_strdup (oldname);
   else
-    oldstr = gftp_build_path (request->directory, oldname, NULL);
+    oldstr = gftp_build_path (request, request->directory, oldname, NULL);
 
   if (*newname == '/')
     newstr = g_strdup (newname);
   else
-    newstr = gftp_build_path (request->directory, newname, NULL);
+    newstr = gftp_build_path (request, request->directory, newname, NULL);
 
   oldlen = strlen (oldstr); 
   newlen = strlen (newname);