Changeset 1000

Timestamp:

Dec 28, 2016, 10:19:24 PM (9 years ago)

Author:

Paul Smedley

Message:

logging cleanups + temp fix for failing cli_ftruncate - related to #279

Location:

branches/client-3.0/src

Files:

• ndpsmb.c (modified) (1 diff)
• smbwrp.c (modified) (3 diffs)

branches/client-3.0/src/ndpsmb.c

@@ -2219 +2219 @@
 
 #define NDPSMB_READ_MAX_SIZE (65536 - 4096)
-
+//TODO simplify this code
 int APIENTRY NdpFileRead (HCONNECTION conn, NDFILEHANDLE handle, void *pBuffer, ULONG ulRead, ULONG *pulActual)
 {

branches/client-3.0/src/smbwrp.c

@@ -574 +574 @@
         }
 
-        debuglocal(4,"cli_setnewfilesize(%s) %lld\n", file->fname, newsize);
+        debuglocal(4,"smbwrp_setnewfilesize(%s) %lld\n", file->fname, newsize);
         if (!NT_STATUS_IS_OK(cli_ftruncate(cli, file->fd, newsize)))
         {
+        debuglocal(4,"smbwrp_setnewfilesize - cli_ftruncate errno = %d\n",cli_errno(cli));
+#if 0 /* This is all sorts of bad - if cli_ftruncate fails, it creates a new file in it's place */
                 if (newsize)
                 {
@@ -591 +593 @@
                 file->openmode &= ~(O_CREAT | O_EXCL);
                 file->openmode |= O_TRUNC;
-                debuglocal(4,"cli_setnewfileszie : cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
+                debuglocal(4,"smbwrp_setnewfilesize : cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
                 if (!NT_STATUS_IS_OK(cli_open(cli, file->fname, file->openmode, file->denymode, &fd)))
                 {       
@@ -597 +599 @@
                 }
                 file->fd = fd;
+#endif
         }       
         return 0;