Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r2465 - branches/fsvs-1.2.x/fsvs/src/waa.c

fsvs
Discussion topic

Back to topic list

svn commit: r2465 - branches/fsvs-1.2.x/fsvs/src/waa.c

Author pmarek
Full name P.Marek
Date 2012-10-29 23:26:57 PDT
Message Author: pmarek
Date: 2012-10-29 23:26:57-0700
New Revision: 2465

Modified:
   branches/fsvs-1.2.x/​fsvs/src/waa.c

Log:
Fix the recursion issue for "fsvs copy".

Modified: branches/fsvs-1.2.x/​fsvs/src/waa.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/branches/fsvs-1.2.​x/fsvs/src/waa.c?vie​w=diff&pathrev=2​465&r1=2464&​r2=2465
====================​====================​====================​==================
--- branches/fsvs-1.2.x/​fsvs/src/waa.c (original)
+++ branches/fsvs-1.2.x/​fsvs/src/waa.c 2012-10-29 23:26:57-0700
@@ -2860,10 +2860,14 @@
 int waa__copy_entries(struct estat *src, struct estat *dest)
 {
     int status;
- struct estat *newdata, **tmp;
+ struct estat *newdata, **tmp, **_old_to_append;
     int left, space;
+ int _old_append_count;
 
 
+ _old_append_count = append_count;
+ _old_to_append = to_append;
+
     to_append=NULL;
     append_count = 0;
     status=0;
@@ -2877,7 +2881,6 @@
     STOPIF( hlp__calloc( &to_append,
                 src->entry_count+1, sizeof(src->by_name[0])), NULL);
 
-// recursive calls trash the common array.
     STOPIF( ops__correlate_dirs( src, dest,
                 remember_to_copy,
                 waa__copy_entries,
@@ -2913,6 +2916,8 @@
 
 ex:
     IF_FREE(to_append);
+ append_count = _old_append_count ;
+ to_append = _old_to_append ;
     return status;
 }

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r2465 - branches/fsvs-1.2.x/fsvs/src/waa.c pmarek P.Marek 2012-10-29 23:26:57 PDT
Messages per page: