[Perfparse-cvs] _perfparse/db_tools convert.c,1.15,1.16

[Florian G. <re...@us...>]

Update of /cvsroot/perfparse/_perfparse/db_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19360/db_tools

Modified Files:
	convert.c 
Log Message:
more conversion


Index: convert.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/db_tools/convert.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** convert.c	11 Mar 2007 01:28:44 -0000	1.15
--- convert.c	13 Mar 2007 06:45:03 -0000	1.16
***************
*** 64,67 ****
--- 64,68 ----
  void dbtool_freeResult(MYSQL_RES *p_tmp_query_result);
  int dbtool_rows(MYSQL_RES *p_tmp_query_result);
+ char *read_line (char *buf, size_t length);
  
  void
***************
*** 119,126 ****
      char yesno;
      
!     char *sODBhost,*sODBuser,*sODBpass,*sODBdatabase,*sODBsocket;
!     int iODBport;
!     char *sNDBhost,*sNDBuser,*sNDBpass,*sNDBdatabase,*sNDBsocket;
!     int iNDBport;
      
      int iStep=1;
--- 120,128 ----
      char yesno;
      
!     char *sODBhost="localhost",*sODBuser="root",*sODBpass="",*sODBdatabase="",*sODBsocket="/var/lib/mysql/mysql.sock";
!     int iODBport=3306;
!     char *sNDBhost="localhost",*sNDBuser="root",*sNDBpass="",*sNDBdatabase="",*sNDBsocket="/var/lib/mysql/mysql.sock";
!     int iNDBport=3306;
!     char *sTmpBuf=malloc(256);
      
      int iStep=1;
***************
*** 189,193 ****
        sODBhost=malloc(65);
        printf(_("Database Host: "));
!       fscanf(stdin,"%s64",sODBhost);
        
        sODBuser=malloc(65);
--- 191,203 ----
        sODBhost=malloc(65);
        printf(_("Database Host: "));
!       while(TRUE) {
!         if(read_line(sTmpBuf,64)!=NULL) {
!           //printf("readed line %s \n",sTmpBuf);
!           if(sscanf(sTmpBuf,"%s64",sODBhost)) {
!             break;
!           }
!         }
!         printf(_("Wrong input!\n"));
!       }
        
        sODBuser=malloc(65);
***************
*** 244,249 ****
        printf(_("Database Socket: "));
        fscanf(stdin,"%s64",sNDBsocket);
      }
! 
      // connect to both databases
       
--- 254,264 ----
        printf(_("Database Socket: "));
        fscanf(stdin,"%s64",sNDBsocket);
+       
+     
      }
!     printf(_("Summary old Database:\nDatabase Host: '%s'\nDatabase User: '%s'\nDatabase Password: '%s'\nDatabase Name: '%s'\nDatabase Port: '%d'\nDatabase Socket: '%s'\n"),
!         sODBhost,sODBuser,sODBpass,sODBdatabase,iODBport,sODBsocket);
!     printf(_("Summary new Database:\nDatabase Host: '%s'\nDatabase User: '%s'\nDatabase Password: '%s'\nDatabase Name: '%s'\nDatabase Port: '%d'\nDatabase Socket: '%s'\n"),
!         sNDBhost,sNDBuser,sNDBpass,sNDBdatabase,iNDBport,sNDBsocket);
      // connect to both databases
       
***************
*** 433,436 ****
--- 448,470 ----
  }
  
+ char *read_line (char *buf, size_t length)
+ {
+   char *input_line;
+ 
+   if (input_line = fgets (buf, length, stdin)) {
+     size_t last = strlen (buf) - 1;
+ 
+     if (buf[last] == '\n') {
+       buf[last] = '\0';
+     } else {
+       //clear stdin
+       fscanf (stdin, "%*[^\n]");
+       (void) fgetc (stdin);
+     }
+   }
+   return input_line;
+ }
+ 
+ 
  void dbtool_mysql_query(const char *sql, MYSQL *p_tmp_db_mysql, MYSQL_RES *p_tmp_query_result)
  {