From 79b0bee7c7af3c5035cddde18497e54d38cf8dbc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 19 Nov 2010 12:21:42 +0000
Subject: Switched to original version of plink in release branch.

---
 tools/plink/makefile   | 12 ------------
 tools/plink/winplink.c | 53 --------------------------------------------------
 2 files changed, 65 deletions(-)
 delete mode 100644 tools/plink/makefile

(limited to 'tools/plink')

diff --git a/tools/plink/makefile b/tools/plink/makefile
deleted file mode 100644
index 973f48afd..000000000
--- a/tools/plink/makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-ifeq ($(MAKESERVER),1)
-$(error Please do not specify MAKESERVER=1 on the command line or as environment variable)
-endif
-
-CSRCS = winplink.c winhandl.c misc.c settings.c winstore.c windefs.c winmisc.c wincons.c \
-        logging.c winnet.c tree234.c winnoise.c sshrand.c cmdline.c sshsha.c timing.c \
-        be_all.c rlogin.c proxy.c winproxy.c cproxy.c sshmd5.c time.c version.c ssh.c \
-        sshdh.c sshzlib.c sshbn.c sshrsa.c sshcrcda.c sshpubk.c sshdes.c wingss.c \
-        sshblowf.c sshsh512.c sshsh256.c sshaes.c pinger.c ssharcf.c x11fwd.c winpgntc.c \
-        winx11.c portfwd.c sshcrc.c wildcard.c ldisc.c sshdss.c raw.c telnet.c
-
-WINAPP=plink
diff --git a/tools/plink/winplink.c b/tools/plink/winplink.c
index 0d7c501fe..525b1a212 100644
--- a/tools/plink/winplink.c
+++ b/tools/plink/winplink.c
@@ -3,7 +3,6 @@
  */
 
 #include <stdio.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <stdarg.h>
@@ -718,55 +717,3 @@ int main(int argc, char **argv)
     cleanup_exit(exitcode);
     return 0;			       /* placate compiler warning */
 }
-
-#ifdef _MSC_VER
-#pragma warning(disable:4273)
-#endif
-
-_Check_return_opt_ int __cdecl printf(_In_z_ _Printf_format_string_ const char * pFmt, ...)
-{
-  static int ConsoleCreated=0;
-  va_list arglist;
-  if (!ConsoleCreated)
-  {
-    int hConHandle;
-    long lStdHandle;
-    CONSOLE_SCREEN_BUFFER_INFO coninfo;
-
-    FILE *fp;
-    const unsigned int MAX_CONSOLE_LINES = 500;
-    ConsoleCreated=1;
-    if (!AttachConsole(ATTACH_PARENT_PROCESS))
-      AllocConsole();
-
-      // set the screen buffer to be big enough to let us scroll text
-    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE),	&coninfo);
-    coninfo.dwSize.Y = MAX_CONSOLE_LINES;
-    SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE),	coninfo.dwSize);
-
-    // redirect unbuffered STDOUT to the console
-    lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
-    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
-    fp = _fdopen( hConHandle, "w" );
-    *stdout = *fp;
-    setvbuf( stdout, NULL, _IONBF, 0 );
-
-    // redirect unbuffered STDIN to the console
-    lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
-    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
-    fp = _fdopen( hConHandle, "r" );
-    *stdin = *fp;
-    setvbuf( stdin, NULL, _IONBF, 0 );
-
-    // redirect unbuffered STDERR to the console
-    lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
-    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
-    fp = _fdopen( hConHandle, "w" );
-    *stderr = *fp;
-    setvbuf( stderr, NULL, _IONBF, 0 );
-
-  }
-
-  va_start(arglist, pFmt );
-  return vfprintf(stderr, pFmt, arglist);
-}
-- 
cgit v1.2.3