[Javanetsim-cvs] IceScan icescan.cc,1.12,1.13

[QweR <qw...@us...>]

Update of /cvsroot/javanetsim/IceScan
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16202

Modified Files:
	icescan.cc 
Log Message:


Index: icescan.cc
===================================================================
RCS file: /cvsroot/javanetsim/IceScan/icescan.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** icescan.cc	13 Dec 2006 12:59:06 -0000	1.12
--- icescan.cc	13 Dec 2006 13:13:30 -0000	1.13
***************
*** 138,151 ****
                                                              IceRegex re("(\\d+(-\\d+)*),*");
  
!                                                             std::vector<icestring> v;
                                                              
                                                              string var, var2 = "";      
                                                              
                                                              //re.Consume(&input, &var, &var2)
!                                                             do {
!                                                                 re1.match(argv[i+1], v);
!                                                                 DBGOUTPUT(v.size());
!                                                                 DBGOUTPUT(v[0]);
!                                                                 /*struct port_range pr;
  
                                                                  if(var2 == ""){
--- 138,155 ----
                                                              IceRegex re("(\\d+(-\\d+)*),*");
  
!                                                             //std::vector<icestring> v;
                                                              
                                                              string var, var2 = "";      
                                                              
+                                                             re1.match(argv[i+1]);
+ 							    rel.findReset();
                                                              //re.Consume(&input, &var, &var2)
!                                                             while(! re1.findNext()){
! //                                                                DBGOUTPUT(v.size());
! //                                                                DBGOUTPUT(v[0]);
! 								
! 								if( rel.group(1,var) && rel.group(2,var2) ){
! 								
!                                                                 struct port_range pr;
  
                                                                  if(var2 == ""){
***************
*** 156,161 ****
                                                                  }
  
!                                                                 par->ports.push_back(pr);*/
!                                                             }while(! re1.findNext());
                                                              exit(-1);
                                                              i++;
--- 160,166 ----
                                                                  }
  
!                                                                 par->ports.push_back(pr);
! 								}
!                                                             }
                                                              exit(-1);
                                                              i++;
***************
*** 182,186 ****
                          
                              par->target.assign(argv[i]);
!                             //DBGOUTPUT(par->target);		
                      }
  
--- 187,191 ----
                          
                              par->target.assign(argv[i]);
!                             //DBGOUTPUT(par->target);	
                      }
  
***************
*** 206,210 ****
      iceoutput out;
      iceparams par;   
!     
      struct timeb tp1, tp2;
  	
--- 211,215 ----
      iceoutput out;
      iceparams par;   
! 
      struct timeb tp1, tp2;