Mercurial > gftp.yaz
comparison src/uicommon/gftpui.c @ 555:7f54d0c0edbc
2004-9-17 Brian Masney <masneyb@gftp.org>
* 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
author | masneyb |
---|---|
date | Fri, 17 Sep 2004 23:37:47 +0000 |
parents | b2b4f5fa8fc7 |
children | 1ce11a3d9557 |
comparison
equal
deleted
inserted
replaced
554:a8ca3e349d4a | 555:7f54d0c0edbc |
---|---|
471 } | 471 } |
472 else if (request->protonum == GFTP_LOCAL_NUM) | 472 else if (request->protonum == GFTP_LOCAL_NUM) |
473 { | 473 { |
474 if (*command != '/' && request->directory != NULL) | 474 if (*command != '/' && request->directory != NULL) |
475 { | 475 { |
476 tempstr = gftp_build_path (request->directory, command, NULL); | 476 tempstr = gftp_build_path (request, request->directory, command, |
477 newdir = expand_path (tempstr); | 477 NULL); |
478 newdir = gftp_expand_path (request, tempstr); | |
478 g_free (tempstr); | 479 g_free (tempstr); |
479 } | 480 } |
480 else | 481 else |
481 newdir = expand_path (command); | 482 newdir = gftp_expand_path (request, command); |
482 | 483 |
483 if (newdir == NULL) | 484 if (newdir == NULL) |
484 { | 485 { |
485 request->logging_function (gftp_logging_error, request, | 486 request->logging_function (gftp_logging_error, request, |
486 _("usage: chdir <directory>\n")); | 487 _("usage: chdir <directory>\n")); |