From 3ba4abac41a44521164eb0dc31a9e987c30ad354 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Wed, 13 Oct 2010 13:09:43 +0400 Subject: [PATCH 1/6] Ticket #2268 (FISH: hide panels before connecting) FISH: now hide the panel before connecting. Signed-off-by: Ilia Maslakov Signed-off-by: Andrew Borodin --- lib/vfs/mc-vfs/fish.c | 11 ++++++++++- src/execute.c | 12 ++++++++++-- src/execute.h | 5 ++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c index 57cf9a8e8..568dfb712 100644 --- a/lib/vfs/mc-vfs/fish.c +++ b/lib/vfs/mc-vfs/fish.c @@ -6,7 +6,8 @@ Written by: 1998 Pavel Machek Spaces fix: 2000 Michal Svec - 2010 Andrew Borobin + 2010 Andrew Borodin + 2010 Slava Zanko 2010 Ilia Maslakov Derived from ftpfs.c. @@ -73,6 +74,7 @@ #include "fish.h" #include "fishdef.h" +#include "src/execute.h" /* pre_exec, post_exec */ int fish_directory_timeout = 900; @@ -355,6 +357,9 @@ fish_getcwd (struct vfs_class *me, struct vfs_s_super *super) static int fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) { + + /* hide panels */ + pre_exec (); { char gbuf[10]; const char *argv[10]; /* All of 10 is used now */ @@ -440,6 +445,10 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) * Run `start_fish_server'. If it doesn't exist - no problem, * we'll talk directly to the shell. */ + + /* show panels */ + post_exec (); + if (fish_command (me, super, WAIT_REPLY, "#FISH\necho; start_fish_server 2>&1; echo '### 200'\n") != COMPLETE) diff --git a/src/execute.c b/src/execute.c index 28baa6ca6..984510769 100644 --- a/src/execute.c +++ b/src/execute.c @@ -91,13 +91,21 @@ edition_pre_exec (void) /* Set up the terminal before executing a program */ -static void +void pre_exec (void) { - use_dash (0); + use_dash (FALSE); edition_pre_exec (); } +/* Hide the terminal after executing a program */ +void +post_exec (void) +{ + edition_post_exec (); + use_dash (TRUE); +} + #ifdef HAVE_SUBSHELL_SUPPORT static void diff --git a/src/execute.h b/src/execute.h index 977961cc2..87b8f4fc1 100644 --- a/src/execute.h +++ b/src/execute.h @@ -26,4 +26,7 @@ void suspend_cmd (void); /* Execute command on a filename that can be on VFS */ void execute_with_vfs_arg (const char *command, const char *filename); -#endif /* !MC_EXECUTE_H */ +void post_exec (void); +void pre_exec (void); + +#endif /* MC_EXECUTE_H */ From 3cef64306e5793ce87a57822c00d03316f045390 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Thu, 14 Oct 2010 11:36:30 +0400 Subject: [PATCH 2/6] Split function fish_open_archive_int() to fish_open_archive_pipeopen() and fish_open_archive_talk(). Signed-off-by: Slava Zanko Signed-off-by: Ilia Maslakov --- lib/vfs/mc-vfs/fish.c | 175 +++++++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 78 deletions(-) diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c index 568dfb712..147168b06 100644 --- a/lib/vfs/mc-vfs/fish.c +++ b/lib/vfs/mc-vfs/fish.c @@ -354,90 +354,109 @@ fish_getcwd (struct vfs_class *me, struct vfs_s_super *super) ERRNOR (EIO, NULL); } + +static void +fish_open_archive_pipeopen (struct vfs_s_super *super) +{ + char gbuf[10]; + const char *argv[10]; /* All of 10 is used now */ + const char *xsh = (SUP.flags == FISH_FLAG_RSH ? "rsh" : "ssh"); + int i = 0; + + argv[i++] = xsh; + if (SUP.flags == FISH_FLAG_COMPRESSED) + argv[i++] = "-C"; + + if (SUP.flags > FISH_FLAG_RSH) + { + argv[i++] = "-p"; + g_snprintf (gbuf, sizeof (gbuf), "%d", SUP.flags); + argv[i++] = gbuf; + } + + /* + * Add the user name to the ssh command line only if it was explicitly + * set in vfs URL. rsh/ssh will get current user by default + * plus we can set convenient overrides in ~/.ssh/config (explicit -l + * option breaks it for some) + */ + + if (SUP.user) + { + argv[i++] = "-l"; + argv[i++] = SUP.user; + } + else + { + /* The rest of the code assumes it to be a valid username */ + SUP.user = vfs_get_local_username (); + } + + argv[i++] = SUP.host; + argv[i++] = "echo FISH:; /bin/sh"; + argv[i++] = NULL; + + fish_pipeopen (super, xsh, argv); +} + +static gboolean +fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) +{ + char answer[2048]; + + print_vfs_message (_("fish: Waiting for initial line...")); + + if (!vfs_s_get_line (me, SUP.sockr, answer, sizeof (answer), ':')) + return FALSE; + + print_vfs_message ("%s", answer); + if (strstr (answer, "assword")) + { + /* Currently, this does not work. ssh reads passwords from + /dev/tty, not from stdin :-(. */ + + message (D_ERROR, MSG_ERROR, + _("Sorry, we cannot do password authenticated connections for now.")); + return FALSE; +#if 0 + if (!SUP.password) + { + char *p, *op; + p = g_strdup_printf (_("fish: Password is required for %s"), SUP.user); + op = vfs_get_password (p); + g_free (p); + if (op == NULL) + return FALSE; + SUP.password = op; + } + print_vfs_message (_("fish: Sending password...")); + { + size_t str_len; + str_len = strlen (SUP.password); + if ((write (SUP.sockw, SUP.password, str_len) != (ssize_t) str_len) + || (write (SUP.sockw, "\n", 1) != 1)) + { + return FALSE; + } + } +#endif + } + return TRUE; +} + static int fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) { - /* hide panels */ pre_exec (); + + /* open pipe */ + fish_open_archive_pipeopen (super); + + /* Start talk with ssh-server (password prompt, etc ) */ + if (!fish_open_archive_talk (me, super)) { - char gbuf[10]; - const char *argv[10]; /* All of 10 is used now */ - const char *xsh = (SUP.flags == FISH_FLAG_RSH ? "rsh" : "ssh"); - int i = 0; - - argv[i++] = xsh; - if (SUP.flags == FISH_FLAG_COMPRESSED) - argv[i++] = "-C"; - - if (SUP.flags > FISH_FLAG_RSH) - { - argv[i++] = "-p"; - g_snprintf (gbuf, sizeof (gbuf), "%d", SUP.flags); - argv[i++] = gbuf; - } - - /* - * Add the user name to the ssh command line only if it was explicitly - * set in vfs URL. rsh/ssh will get current user by default - * plus we can set convenient overrides in ~/.ssh/config (explicit -l - * option breaks it for some) - */ - - if (SUP.user) - { - argv[i++] = "-l"; - argv[i++] = SUP.user; - } - else - { - /* The rest of the code assumes it to be a valid username */ - SUP.user = vfs_get_local_username (); - } - - argv[i++] = SUP.host; - argv[i++] = "echo FISH:; /bin/sh"; - argv[i++] = NULL; - - fish_pipeopen (super, xsh, argv); - } - { - char answer[2048]; - print_vfs_message (_("fish: Waiting for initial line...")); - if (!vfs_s_get_line (me, SUP.sockr, answer, sizeof (answer), ':')) - ERRNOR (E_PROTO, -1); - print_vfs_message ("%s", answer); - if (strstr (answer, "assword")) - { - /* Currently, this does not work. ssh reads passwords from - /dev/tty, not from stdin :-(. */ - - message (D_ERROR, MSG_ERROR, - _("Sorry, we cannot do password authenticated connections for now.")); - ERRNOR (EPERM, -1); - if (!SUP.password) - { - char *p, *op; - p = g_strdup_printf (_("fish: Password is required for %s"), SUP.user); - op = vfs_get_password (p); - g_free (p); - if (op == NULL) - ERRNOR (EPERM, -1); - SUP.password = op; - } - - print_vfs_message (_("fish: Sending password...")); - - { - size_t str_len; - str_len = strlen (SUP.password); - if ((write (SUP.sockw, SUP.password, str_len) != (ssize_t) str_len) - || (write (SUP.sockw, "\n", 1) != 1)) - { - ERRNOR (EIO, -1); - } - } - } + ERRNOR (E_PROTO, -1); } print_vfs_message (_("fish: Sending initial line...")); From 0a5f93eeb5c339fe7430677ddc66ed223122c7a2 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Wed, 13 Oct 2010 22:04:35 +0400 Subject: [PATCH 3/6] fish.c: some fixups. Signed-off-by: Andrew Borodin --- lib/vfs/mc-vfs/fish.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c index 147168b06..5e9a6d58d 100644 --- a/lib/vfs/mc-vfs/fish.c +++ b/lib/vfs/mc-vfs/fish.c @@ -1038,8 +1038,9 @@ fish_send_command (struct vfs_class *me, struct vfs_s_super *super, const char * #define PREFIX \ char buf[BUF_LARGE]; \ const char *crpath; \ - char *rpath, *mpath = g_strdup (path); \ + char *rpath, *mpath; \ struct vfs_s_super *super; \ + mpath = g_strdup (path); \ crpath = vfs_s_get_path_mangle (me, mpath, &super, 0); \ if (crpath == NULL) \ { \ @@ -1057,13 +1058,16 @@ fish_rename (struct vfs_class *me, const char *path1, const char *path2) const char *crpath1, *crpath2; char *rpath1, *rpath2, *mpath1, *mpath2; struct vfs_s_super *super, *super2; - crpath1 = vfs_s_get_path_mangle (me, mpath1 = g_strdup(path1), &super, 0); + + mpath1 = g_strdup (path1); + crpath1 = vfs_s_get_path_mangle (me, mpath1, &super, 0); if (crpath1 == NULL) { g_free (mpath1); return -1; } - crpath2 = vfs_s_get_path_mangle (me, mpath2 = g_strdup(path2), &super2, 0); + mpath2 = g_strdup (path2); + crpath2 = vfs_s_get_path_mangle (me, mpath2, &super2, 0); if (crpath2 == NULL) { g_free (mpath1); From 8b46518619187ebd580ddeace9346a0e050047fe Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Thu, 14 Oct 2010 12:31:19 +0400 Subject: [PATCH 4/6] Apply code identation policy. Signed-off-by: Ilia Maslakov --- lib/vfs/mc-vfs/fish.c | 45 +++++++++++++++++++++---------------------- src/execute.c | 2 +- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c index 5e9a6d58d..8fc6b49e1 100644 --- a/lib/vfs/mc-vfs/fish.c +++ b/lib/vfs/mc-vfs/fish.c @@ -300,25 +300,25 @@ fish_set_env (int flags) g_string_assign (tmp, "export "); if ((flags & FISH_HAVE_HEAD) != 0) - g_string_append (tmp, "FISH_HAVE_HEAD=1 "); + g_string_append (tmp, "FISH_HAVE_HEAD=1 "); if ((flags & FISH_HAVE_SED) != 0) - g_string_append (tmp, "FISH_HAVE_SED=1 "); + g_string_append (tmp, "FISH_HAVE_SED=1 "); if ((flags & FISH_HAVE_AWK) != 0) - g_string_append (tmp, "FISH_HAVE_AWK=1 "); + g_string_append (tmp, "FISH_HAVE_AWK=1 "); if ((flags & FISH_HAVE_PERL) != 0) - g_string_append (tmp, "FISH_HAVE_PERL=1 "); + g_string_append (tmp, "FISH_HAVE_PERL=1 "); if ((flags & FISH_HAVE_LSQ) != 0) - g_string_append (tmp, "FISH_HAVE_LSQ=1 "); + g_string_append (tmp, "FISH_HAVE_LSQ=1 "); if ((flags & FISH_HAVE_DATE_MDYT) != 0) - g_string_append (tmp, "FISH_HAVE_DATE_MDYT=1 "); + g_string_append (tmp, "FISH_HAVE_DATE_MDYT=1 "); if ((flags & FISH_HAVE_TAIL) != 0) - g_string_append (tmp, "FISH_HAVE_TAIL=1 "); + g_string_append (tmp, "FISH_HAVE_TAIL=1 "); return g_string_free (tmp, FALSE); } @@ -480,8 +480,7 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) /* Set up remote locale to C, otherwise dates cannot be recognized */ if (fish_command (me, super, WAIT_REPLY, - "export LANG=C LC_ALL=C LC_TIME=C\n" - "echo '### 200'\n") != COMPLETE) + "export LANG=C LC_ALL=C LC_TIME=C\n" "echo '### 200'\n") != COMPLETE) ERRNOR (E_PROTO, -1); print_vfs_message (_("fish: Getting host info...")); @@ -533,7 +532,7 @@ fish_open_archive (struct vfs_class *me, struct vfs_s_super *super, SUP.scr_mv = fish_load_script_from_file (host, FISH_MV_FILE, FISH_MV_DEF_CONTENT); SUP.scr_hardlink = fish_load_script_from_file (host, FISH_HARDLINK_FILE, FISH_HARDLINK_DEF_CONTENT); SUP.scr_get = fish_load_script_from_file (host, FISH_GET_FILE, FISH_GET_DEF_CONTENT); - SUP.scr_send = fish_load_script_from_file (host, FISH_SEND_FILE,FISH_SEND_DEF_CONTENT); + SUP.scr_send = fish_load_script_from_file (host, FISH_SEND_FILE, FISH_SEND_DEF_CONTENT); SUP.scr_append = fish_load_script_from_file (host, FISH_APPEND_FILE, FISH_APPEND_DEF_CONTENT); SUP.scr_info = fish_load_script_from_file (host, FISH_INFO_FILE, FISH_INFO_DEF_CONTENT); return fish_open_archive_int (me, super); @@ -832,14 +831,16 @@ fish_file_store (struct vfs_class *me, struct vfs_s_fh *fh, char *name, char *lo { shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s FISH_FILESIZE=%ju;\n", SUP.scr_append, (char *) NULL); - n = fish_command (me, super, WAIT_REPLY, shell_commands, quoted_name, (uintmax_t) s.st_size); + n = fish_command (me, super, WAIT_REPLY, shell_commands, quoted_name, + (uintmax_t) s.st_size); g_free (shell_commands); } else { shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s FISH_FILESIZE=%ju;\n", SUP.scr_send, (char *) NULL); - n = fish_command (me, super, WAIT_REPLY, shell_commands, quoted_name, (uintmax_t) s.st_size); + n = fish_command (me, super, WAIT_REPLY, shell_commands, quoted_name, + (uintmax_t) s.st_size); g_free (shell_commands); } if (n != PRELIM) @@ -965,7 +966,7 @@ fish_linear_read (struct vfs_class *me, struct vfs_s_fh *fh, void *buf, size_t l { struct vfs_s_super *super = FH_SUPER; ssize_t n = 0; - len = MIN ((size_t)(fh->u.fish.total - fh->u.fish.got), len); + len = MIN ((size_t) (fh->u.fish.total - fh->u.fish.got), len); tty_disable_interrupt_key (); while (len != 0 && ((n = read (SUP.sockr, buf, len)) < 0)) { @@ -1121,9 +1122,10 @@ fish_link (struct vfs_class *me, const char *path1, const char *path2) g_free (shell_commands); g_free (rpath1); g_free (rpath2); - return fish_send_command(me, super2, buf, OPT_FLUSH); + return fish_send_command (me, super2, buf, OPT_FLUSH); } + static int fish_symlink (struct vfs_class *me, const char *setto, const char *path) { @@ -1159,7 +1161,6 @@ fish_chmod (struct vfs_class *me, const char *path, int mode) { gchar *shell_commands = NULL; PREFIX - shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s FISH_FILEMODE=%4.4o;\n", SUP.scr_chmod, (char *) NULL); g_snprintf (buf, sizeof (buf), shell_commands, rpath, mode & 07777); @@ -1189,8 +1190,8 @@ fish_chown (struct vfs_class *me, const char *path, uid_t owner, gid_t group) gchar *shell_commands = NULL; PREFIX - - shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s FISH_FILEOWNER=%s FISH_FILEGROUP=%s;\n", + shell_commands = g_strconcat (SUP.scr_env, + "FISH_FILENAME=%s FISH_FILEOWNER=%s FISH_FILEGROUP=%s;\n", SUP.scr_chown, (char *) NULL); g_snprintf (buf, sizeof (buf), shell_commands, rpath, sowner, sgroup); g_free (shell_commands); @@ -1207,8 +1208,8 @@ fish_unlink (struct vfs_class *me, const char *path) { gchar *shell_commands = NULL; PREFIX - - shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s;\n", SUP.scr_unlink, (char *) NULL); + shell_commands = + g_strconcat (SUP.scr_env, "FISH_FILENAME=%s;\n", SUP.scr_unlink, (char *) NULL); g_snprintf (buf, sizeof (buf), shell_commands, rpath); g_free (shell_commands); g_free (rpath); @@ -1220,7 +1221,6 @@ fish_exists (struct vfs_class *me, const char *path) { gchar *shell_commands = NULL; PREFIX - shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s;\n", SUP.scr_exists, (char *) NULL); g_snprintf (buf, sizeof (buf), shell_commands, rpath); g_free (shell_commands); @@ -1236,7 +1236,8 @@ fish_mkdir (struct vfs_class *me, const char *path, mode_t mode) gchar *shell_commands = NULL; int ret_code; - PREFIX (void) mode; + PREFIX + (void) mode; shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s;\n", SUP.scr_mkdir, (char *) NULL); g_snprintf (buf, sizeof (buf), shell_commands, rpath); @@ -1260,7 +1261,6 @@ fish_rmdir (struct vfs_class *me, const char *path) { gchar *shell_commands = NULL; PREFIX - shell_commands = g_strconcat (SUP.scr_env, "FISH_FILENAME=%s;\n", SUP.scr_rmdir, (char *) NULL); g_snprintf (buf, sizeof (buf), shell_commands, rpath); g_free (shell_commands); @@ -1343,7 +1343,6 @@ fish_open (struct vfs_class *me, const char *file, int flags, mode_t mode) return vfs_s_open (me, file, flags, mode); } - void init_fish (void) { diff --git a/src/execute.c b/src/execute.c index 984510769..a219f55a9 100644 --- a/src/execute.c +++ b/src/execute.c @@ -273,7 +273,7 @@ toggle_panels (void) #ifdef HAVE_SUBSHELL_SUPPORT if (use_subshell) { - new_dir_p = vfs_current_is_local () ? &new_dir : NULL; + new_dir_p = vfs_current_is_local ()? &new_dir : NULL; invoke_subshell (NULL, VISIBLY, new_dir_p); } else From 8be556abc52c4c1029c093a1123806622c417650 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Thu, 14 Oct 2010 13:35:57 +0400 Subject: [PATCH 5/6] Declarations of use_dash() and rotate_dash() were moved form lib/util.h to src/layout.h. Signed-off-by: Andrew Borodin --- lib/util.h | 4 ---- src/dir.c | 1 + src/execute.c | 2 +- src/file.c | 2 +- src/layout.c | 2 +- src/layout.h | 5 +++++ 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/util.h b/lib/util.h index b688ae83e..a690963d6 100644 --- a/lib/util.h +++ b/lib/util.h @@ -166,10 +166,6 @@ void canonicalize_pathname (char *); int my_mkdir (const char *s, mode_t mode); int my_rmdir (const char *s); -/* Rotating dash routines */ -void use_dash (int flag); /* Disable/Enable rotate_dash routines */ -void rotate_dash (void); - /* Creating temporary files safely */ const char *mc_tmpdir (void); int mc_mkstemps (char **pname, const char *prefix, const char *suffix); diff --git a/src/dir.c b/src/dir.c index 62f40a24f..237f03b14 100644 --- a/src/dir.c +++ b/src/dir.c @@ -38,6 +38,7 @@ #include "treestore.h" #include "dir.h" #include "setup.h" /* panels_options */ +#include "layout.h" /* rotate_dash() */ /* Reverse flag */ static int reverse = 1; diff --git a/src/execute.c b/src/execute.c index a219f55a9..d12fac2a3 100644 --- a/src/execute.c +++ b/src/execute.c @@ -34,7 +34,7 @@ #include "main.h" #include "consaver/cons.saver.h" #include "subshell.h" -#include "layout.h" +#include "layout.h" /* use_dash() */ #include "dialog.h" #include "wtools.h" #include "panel.h" /* update_panels() */ diff --git a/src/file.c b/src/file.c index b4293eb71..5fd182cda 100644 --- a/src/file.c +++ b/src/file.c @@ -67,7 +67,7 @@ #include "dialog.h" #include "widget.h" #include "main.h" -#include "layout.h" +#include "layout.h" /* rotate_dash() */ #include "widget.h" #include "wtools.h" #include "background.h" /* we_are_background */ diff --git a/src/layout.c b/src/layout.c index f773758b5..410507713 100644 --- a/src/layout.c +++ b/src/layout.c @@ -802,7 +802,7 @@ change_screen_size (void) static int ok_to_refresh = 1; void -use_dash (int flag) +use_dash (gboolean flag) { if (flag) ok_to_refresh++; diff --git a/src/layout.h b/src/layout.h index 4ce5ab7ca..2df85c9b0 100644 --- a/src/layout.h +++ b/src/layout.h @@ -6,6 +6,7 @@ #ifndef MC_LAYOUT_H #define MC_LAYOUT_H +#include "lib/global.h" #include "panel.h" #include "widget.h" @@ -34,6 +35,10 @@ const char *get_panel_dir_for (const WPanel *widget); void set_hintbar (const char *str); +/* Rotating dash routines */ +void use_dash (gboolean flag); /* Disable/Enable rotate_dash routines */ +void rotate_dash (void); + /* Clear screen */ void clr_scr (void); void repaint_screen (void); From 88dc2e93bdc49ca40352078e94c68cc20a23a108 Mon Sep 17 00:00:00 2001 From: Ilia Maslakov Date: Thu, 14 Oct 2010 16:17:14 +0400 Subject: [PATCH 6/6] replace print_vfs_message to printf Signed-off-by: Ilia Maslakov --- lib/vfs/mc-vfs/fish.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/vfs/mc-vfs/fish.c b/lib/vfs/mc-vfs/fish.c index 8fc6b49e1..ff120a48d 100644 --- a/lib/vfs/mc-vfs/fish.c +++ b/lib/vfs/mc-vfs/fish.c @@ -404,19 +404,18 @@ fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) { char answer[2048]; - print_vfs_message (_("fish: Waiting for initial line...")); + printf ("\n%s\n", _("fish: Waiting for initial line...")); if (!vfs_s_get_line (me, SUP.sockr, answer, sizeof (answer), ':')) return FALSE; - print_vfs_message ("%s", answer); if (strstr (answer, "assword")) { /* Currently, this does not work. ssh reads passwords from /dev/tty, not from stdin :-(. */ - message (D_ERROR, MSG_ERROR, - _("Sorry, we cannot do password authenticated connections for now.")); + printf ("\n%s\n", _("Sorry, we cannot do password authenticated connections for now.")); + return FALSE; #if 0 if (!SUP.password) @@ -429,7 +428,7 @@ fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) return FALSE; SUP.password = op; } - print_vfs_message (_("fish: Sending password...")); + printf ("\n%s\n", _("fish: Sending password...")); { size_t str_len; str_len = strlen (SUP.password); @@ -447,6 +446,7 @@ fish_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super) static int fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) { + gboolean ftalk; /* hide panels */ pre_exec (); @@ -454,10 +454,13 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) fish_open_archive_pipeopen (super); /* Start talk with ssh-server (password prompt, etc ) */ - if (!fish_open_archive_talk (me, super)) - { + ftalk = fish_open_archive_talk (me, super); + + /* show panels */ + post_exec (); + + if (!ftalk) ERRNOR (E_PROTO, -1); - } print_vfs_message (_("fish: Sending initial line...")); /* @@ -465,9 +468,6 @@ fish_open_archive_int (struct vfs_class *me, struct vfs_s_super *super) * we'll talk directly to the shell. */ - /* show panels */ - post_exec (); - if (fish_command (me, super, WAIT_REPLY, "#FISH\necho; start_fish_server 2>&1; echo '### 200'\n") != COMPLETE)