From fc5a9c57c235f41675261057df90ed981c1c0347 Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Mon, 7 Dec 1998 10:15:17 +0000 Subject: [PATCH] Small fixes, now fish should actually work. Dropped ELAST hack. --- ChangeLog | 4 ++++ vfs/ChangeLog | 5 +++++ vfs/fish.c | 5 +++-- vfs/vfs.h | 8 ++------ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81982496a..20d08200c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Dec 1 11:58:55 1998 Pavel Machek + + * doc/mc.1.in, mc.sgml: added my name to list ov authors + 1998-12-02 Miguel de Icaza * Makefile.in (codedirs): Dropped xv and tk ports from the diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 33422c257..2a230515d 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 7 11:04:57 1998 Pavel Machek + + * fish.c: default to normal ssh + (open_archive_int): debugging hack killed + 1998-12-02 Raja R Harinath * Makefile.am (EXTRA_DIST): Distribute files that the diff --git a/vfs/fish.c b/vfs/fish.c index b0e860a5b..36144f4b8 100644 --- a/vfs/fish.c +++ b/vfs/fish.c @@ -33,7 +33,7 @@ /* Define this if your ssh can take -I option */ -#define HAVE_HACKED_SSH +#undef HAVE_HACKED_SSH #include "xdirentry.h" #include "../src/tty.h" /* enable/disable interrupt key */ @@ -203,10 +203,11 @@ open_archive_int (vfs *me, vfs_s_super *super) argv[i++] = "echo FISH:; /bin/sh"; argv[i++] = NULL; +#if 0 /* Debugging hack */ -#warning Debugging hack, delete me if (!MEDATA->logfile) MEDATA->logfile = fopen( "/home/pavel/talk.fish", "w+" ); /* FIXME */ +#endif pipeopen(super, xsh, argv ); diff --git a/vfs/vfs.h b/vfs/vfs.h index 08104a5b1..0c0158223 100644 --- a/vfs/vfs.h +++ b/vfs/vfs.h @@ -403,14 +403,10 @@ extern void mc_vfs_done( void ); /* And now some defines for our errors. */ -#ifndef ELAST -#define ELAST 300 /* bad hack, but what can we do */ -#endif - #ifdef ENOSYS #define E_NOTSUPP ENOSYS /* for use in vfs when module does not provide function */ #else -#define E_NOTSUPP (ELAST+1) /* for use in vfs when module does not provide function */ +#warning Does this really happen? #endif #ifdef ENOMSG @@ -422,7 +418,7 @@ extern void mc_vfs_done( void ); #ifdef EREMOTEIO #define E_REMOTE EREMOTEIO /* if other side of ftp/fish reports error */ #else -#define E_REMOTE (ELAST+3) /* if other side of ftp/fish reports error */ +#define E_REMOTE ENETUNREACH #endif #ifdef EPROTO