Changeset 105 for branches/samba-3.0/source/client

Timestamp:

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

Author:

Paul Smedley

Message:

Update source to 3.0.27a

Location:

branches/samba-3.0/source/client

Files:

• client.c (modified) (1 diff)
• clitar.c (modified) (4 diffs)
• umount.cifs.c (modified) (1 diff)

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

@@ -193 +193 @@
                                 msg[l++] = '\r';
                         msg[l] = c;   
+                }
+
+                if ((total_len > 0) && (strlen(msg) == 0)) {
+                        break;
                 }
 

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) {

branches/samba-3.0/source/client/umount.cifs.c

@@ -343 +343 @@
         /* fixup path if needed */
 
+        /* Trim any trailing slashes */
+        while ((strlen(mountpoint) > 1) &&
+                (mountpoint[strlen(mountpoint)-1] == '/'))
+        {
+                mountpoint[strlen(mountpoint)-1] = '\0';
+        }
+
         /* make sure that this is a cifs filesystem */
         rc = statfs(mountpoint, &statbuf);