Changeset 105 for branches/samba-3.0/source/client/clitar.c

Timestamp:

Nov 26, 2007, 9:24:27 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.27a

File:

• branches/samba-3.0/source/client/clitar.c (modified) (4 diffs)

branches/samba-3.0/source/client/clitar.c

@@ -610 +610 @@
         char ftype;
         file_info2 finfo;
-        BOOL close_done = False;
         BOOL shallitime=True;
         char data[65520];
@@ -696 +695 @@
                         finfo.name, (double)finfo.size, lname));
       
-                while (nread < finfo.size && !close_done) {
+                do {
               
                         DEBUG(3,("nread=%.0f\n",(double)nread));
@@ -735 +734 @@
                         }
               
-                        if (datalen == 0) {
+                        if ( (datalen == 0) && (finfo.size != 0) ) {
                                 DEBUG(0,("Error reading file %s. Got 0 bytes\n", rname));
                                 break;
@@ -741 +740 @@
 
                         datalen=0;
-                }
+                } while ( nread < finfo.size );
 
                 if (wrote_tar_header) {