Changeset 9afeefa

Timestamp:

2008-07-22T12:36:56Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

8a90001

Parents:

3355a82

Message:

fixes bug in handling file names with spaces.

File:

• dcc.c (modified) (5 diffs)

dcc.c

@@ -628 +628 @@
 {
         char *pattern = "SEND"
-                " (([^\"][^ ]*)|\"([^\"]|\\\")*\")"
+                " (([^\"][^ ]*)|\"(([^\"]|\\\")*)\")"
                 " (([0-9]*)|([^ ]*))"
                 " ([0-9]*)"
                 " ([0-9]*)\001";
-        regmatch_t pmatch[9];
+        regmatch_t pmatch[10];
         regex_t re;
         file_transfer_t *ft;
@@ -640 +640 @@
 
         if( ( regerrcode = regcomp( &re, pattern, REG_EXTENDED ) ) ||
-            ( regerrcode = regexec( &re, line, 9, pmatch, 0 ) ) ) {
+            ( regerrcode = regexec( &re, line, 10, pmatch, 0 ) ) ) {
                 regerror( regerrcode,&re,errbuf,sizeof( errbuf ) );
                 imcb_log( ic, 
@@ -649 +649 @@
 
         if( ( pmatch[1].rm_so > 0 ) &&
-            ( pmatch[4].rm_so > 0 ) &&
-            ( pmatch[7].rm_so > 0 ) &&
-            ( pmatch[8].rm_so > 0 ) )
+            ( pmatch[5].rm_so > 0 ) &&
+            ( pmatch[8].rm_so > 0 ) &&
+            ( pmatch[9].rm_so > 0 ) )
         {
                 char *input = g_strdup( line );
@@ -669 +669 @@
                 }
                         
-                input[pmatch[4].rm_eo] = '\0';
+                input[pmatch[5].rm_eo] = '\0';
 
                 /* number means ipv4, something else means ipv6 */
-                if ( pmatch[5].rm_so > 0 )
+                if ( pmatch[6].rm_so > 0 )
                 {
                         struct in_addr ipaddr = { .s_addr = htonl( atoi( input + pmatch[5].rm_so ) ) };
@@ -679 +679 @@
                 {
                         /* Contains non-numbers, hopefully an IPV6 address */
-                        host = input + pmatch[6].rm_so;
+                        host = input + pmatch[7].rm_so;
                 }
 
-                input[pmatch[7].rm_eo] = '\0';
                 input[pmatch[8].rm_eo] = '\0';
-
-                port = input + pmatch[7].rm_so;
-                filesize = atoll( input + pmatch[8].rm_so );
+                input[pmatch[9].rm_eo] = '\0';
+
+                port = input + pmatch[8].rm_so;
+                filesize = atoll( input + pmatch[9].rm_so );
 
                 memset( &hints, 0, sizeof ( struct addrinfo ) );