diff --git a/src/intrfn.c b/src/intrfn.c
index fff5e2d2..f0b67567 100644
--- a/src/intrfn.c
+++ b/src/intrfn.c
@@ -970,15 +970,7 @@ static char *filename_to_directory(const char *filename)
     res=buf;
   }
 #endif
-#ifdef __CYGWIN__
-  {
-    char beautifull_dst_directory[2048];
-    cygwin_conv_to_win32_path(res, beautifull_dst_directory);
-    return strdup(beautifull_dst_directory);
-  }
-#else
   return strdup(res);
-#endif
 }
 
 int start_ncurses(const char *prog_name, const char *real_prog_name)
@@ -1013,7 +1005,7 @@ int start_ncurses(const char *prog_name, const char *real_prog_name)
 #endif
       screenp=newterm(NULL,stdout,stdin);
 #ifdef HAVE_SETENV
-      if(screenp==NULL && terminfo!=NULL)
+      if(screenp==NULL && terminfo!=NULL && terminfo[0]!='\0')
       {
         setenv("TERMINFO", terminfo, 1);
         screenp=newterm(NULL,stdout,stdin);