Merge lp:~jobinau/drizzle/mingwport into lp:~drizzle-trunk/drizzle/development

[Jobin Augustine]

Please Review Revisions after last merge
and advice me if any changes are to be done.

These modifications are for compiling the drizzle client tools in windows.

[Lee Bieber (kalebral-deactivatedaccount)]

Can't build on Linux:

  CXX client/drizzle.o
client/drizzle.cc: In function ‘int main(int, char**)’:
client/drizzle.cc:1562: error: ‘_isatty’ was not declared in this scope
client/drizzle.cc: In function ‘void window_resize(int)’:
client/drizzle.cc:1934: error: aggregate ‘winsize window_size’ has incomplete type and cannot be defined
client/drizzle.cc:1936: error: ‘TIOCGWINSZ’ was not declared in this scope
client/drizzle.cc:1936: error: ‘ioctl’ was not declared in this scope
make[2]: *** [client/drizzle.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory `/home/lbieber/repos/build'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/lbieber/repos/build'
make: *** [all] Error 2

review: Needs Fixing

[Jobin Augustine (jobinau)]

Thank you Lee for the test.
The decision to push as small patches is paying off.

Monty,
I need a help on build.
HAVE_SYS_IOCTL_H is not getting defined in config.h in Linux.

Unmerged revisions

1706. By jobin <jobin@jobin-laptop> on 2010-08-23

modification requied to compile on windows

1705. By jobin <jobin@jobin-laptop> on 2010-08-23

in windows, read password from keyboard and put * into screen

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2010-08-21 17:16:51 +0000
+++ client/drizzle.cc	2010-08-24 02:26:41 +0000
@@ -63,10 +63,16 @@
 #include <math.h>
 #include "client/linebuffer.h"
 #include <signal.h>
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif 
 #include <drizzled/configmake.h>
 #include "drizzled/utf8/utf8.h"
-#include <cstdlib>
+#include <cstdlib> /*not sure where it is used */
+#ifdef _WIN32
+#include <io.h>
+#endif
+
 
 #if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
 #include <curses.h>
@@ -1553,7 +1559,7 @@
       default_pager.assign(tmp);
     }
   }
-  if (! isatty(0) || ! isatty(1))
+  if (! _isatty(0) || ! _isatty(1))
   {
     status.setBatch(1); opt_silent=1;
     ignore_errors=0;
@@ -1806,6 +1812,8 @@
       if (histfile)
         sprintf(histfile,"%s/.drizzle_history",getenv("HOME"));
       char link_name[FN_REFLEN];
+#ifndef _WIN32
+	  /*links won't work in windows */
       ssize_t sym_link_size= readlink(histfile,link_name,FN_REFLEN-1);
       if (sym_link_size >= 0)
       {
@@ -1817,6 +1825,7 @@
           histfile= 0;
         }
       }
+#endif
     }
     if (histfile)
     {
@@ -4360,16 +4369,24 @@
     putc(c, OUTFILE);
 }
 
+#ifdef _WIN32
+#include <time.h> 
+#else
 #include <sys/times.h>
 #ifdef _SC_CLK_TCK        // For mit-pthreads
 #undef CLOCKS_PER_SEC
 #define CLOCKS_PER_SEC (sysconf(_SC_CLK_TCK))
 #endif
+#endif
 
 static uint32_t start_timer(void)
 {
+#ifdef _WIN32
+  return clock();
+#else
   struct tms tms_tmp;
   return times(&tms_tmp);
+#endif
 }
 
 

=== modified file 'client/get_password.cc'
--- client/get_password.cc	2010-06-19 16:36:52 +0000
+++ client/get_password.cc	2010-08-24 02:26:41 +0000
@@ -33,6 +33,7 @@
 #include <ctype.h>
 #include <unistd.h>
 
+#ifndef _WIN32
 #include <sys/ioctl.h>
 #ifdef HAVE_TERMIOS_H				/* For tty-password */
 # include	<termios.h>
@@ -46,6 +47,9 @@
 #    define TERMIO	struct sgttyb
 #  endif
 #endif
+#else 				/*in windows, include conio.h*/
+#include <conio.h>
+#endif
 
 using namespace std;
 
@@ -100,7 +104,6 @@
 
 char *client_get_tty_password(const char *opt_message)
 {
-  TERMIO org,tmp;
   char buff[80];
 
   if (isatty(fileno(stdout)))
@@ -108,9 +111,42 @@
     fputs(opt_message ? opt_message : "Enter password: ",stdout);
     fflush(stdout);
   }
+
+#if defined(_WIN32)
+	/*windows specific password reading logic goes here (read it from keyboard) */
+  char *pos=buff,*end=buff+sizeof(buff)-1;
+  int i=0; 
+  for (;;)
+  {
+    char tmp;
+    tmp=_getch();
+    if (tmp == '\b' || (int) tmp == 127)
+    {
+      if (pos != buff)
+      {
+	_cputs("\b \b");
+	pos--;
+	continue;
+      }
+    }
+    if (tmp == '\n' || tmp == '\r' || tmp == 3)
+      break;
+    if (iscntrl(tmp) || pos == end)
+      continue;
+    _cputs("*");
+    *(pos++) = tmp;
+  }
+  while (pos != buff && isspace(pos[-1]) == ' ')
+    pos--;					/* Allow dummy space at end */
+  *pos=0;
+  _cputs("\n"); 
+#else   /*if not windows, Declare and initialize TERMIO variables */
+	TERMIO org,tmp;
+	tmp = org;
+#endif
+  
 #  if defined(HAVE_TERMIOS_H)
   tcgetattr(fileno(stdin), &org);
-  tmp = org;
   tmp.c_lflag &= ~(ECHO | ISIG | ICANON);
   tmp.c_cc[VMIN] = 1;
   tmp.c_cc[VTIME] = 0;
@@ -119,16 +155,14 @@
   tcsetattr(fileno(stdin), TCSADRAIN, &org);
 #  elif defined(HAVE_TERMIO_H)
   ioctl(fileno(stdin), (int) TCGETA, &org);
-  tmp=org;
   tmp.c_lflag &= ~(ECHO | ISIG | ICANON);
   tmp.c_cc[VMIN] = 1;
   tmp.c_cc[VTIME]= 0;
   ioctl(fileno(stdin),(int) TCSETA, &tmp);
   get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
   ioctl(fileno(stdin),(int) TCSETA, &org);
-#  else
+#  elif !defined(_WIN32)
   gtty(fileno(stdin), &org);
-  tmp=org;
   tmp.sg_flags &= ~ECHO;
   tmp.sg_flags |= RAW;
   stty(fileno(stdin), &tmp);