Changeset 533 for trunk/client/src/ndpsmb.c

Timestamp:

Jan 26, 2011, 3:31:18 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: degug changes, attemp to fix the trap

File:

• trunk/client/src/ndpsmb.c (modified) (18 diffs)

trunk/client/src/ndpsmb.c

@@ -150 +150 @@
                 ifL = 1;
         }
+        debugInit();
         debuglocal(9,"Working with %s bit fileio NDFS\n", ifL ? "64" : "32");
         return NO_ERROR;
@@ -157 +158 @@
 int APIENTRY NdpPluginFree (void)
 {
+        debugDelete();
         return NO_ERROR;
 }
@@ -982 +984 @@
                                         {       
                                             rc = (finfo.attr & FILE_DIRECTORY) !=0 ?
-                                                ERROR_PATH_NOT_FOUND :
-                                                ERROR_INVALID_PARAMETER;
+                                                ERROR_FILE_NOT_FOUND:
+                                                ERROR_PATH_NOT_FOUND;
                                         }
                                         else if (rc != ERROR_REM_NOT_LIST)
@@ -1217 +1219 @@
         NDDATABUF fdata = {0};
         smbwrp_fileinfo *finfo;
-        char    pBuffer[64*1024];
+        const int cbBuffer = 64*1024;
 
         if (!pfi || !pfi->pszName || !pFEAList)
@@ -1239 +1241 @@
         debuglocal(9,"NdpEAQuery in [%p] <%s> %08x %d\n", pConn, path, pGEAList, pGEAList ? pGEAList->cbList : 0);
 
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+                return ERROR_NOT_ENOUGH_MEMORY;
+
         do {
-                rc = smbwrp_listea( pConn->cli, path, pBuffer, sizeof( pBuffer));
-                pFEASrc = (FEALIST*) pBuffer;
+                rc = smbwrp_listea( pConn->cli, path, pchBuffer, cbBuffer);
+                pFEASrc = (FEALIST*) pchBuffer;
                 if (rc)
                 {
@@ -1268 +1274 @@
                 }
         } while (0);
+        free(pchBuffer);
         debuglocal(9,"NdpEAQuery <%s> %d %d %d\n", pfi->pszName, rc, pFEASrc->cbList, pFEAList->cbList);
 
@@ -1334 +1341 @@
         NDDATABUF fdata = {0};
         smbwrp_fileinfo *finfo;
-        char    pBuffer[64*1024];
+        const int cbBuffer = 64*1024;
         int easize;
 
@@ -1352 +1359 @@
                 return ERROR_EAS_NOT_SUPPORTED;
         }
+
         finfo = (smbwrp_fileinfo *)fdata.pData;
         easize = finfo->easize;
@@ -1365 +1373 @@
         debuglocal(9,"NdpEASize in [%p] <%s> \n", pConn, path);
 
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+                return ERROR_NOT_ENOUGH_MEMORY;
+
         do {
-                rc = smbwrp_listea(pConn->cli, path, pBuffer, sizeof( pBuffer));
-                pfealist = (FEALIST*)pBuffer;
+                rc = smbwrp_listea(pConn->cli, path, pchBuffer, cbBuffer);
+                pfealist = (FEALIST*)pchBuffer;
                 if (rc)
                 {
@@ -1390 +1402 @@
                 *pulEASize = pfealist->cbList;
         } while (0);
+        free(pchBuffer);
         debuglocal(9,"NdpEASize <%s> %d %d\n", pfi->pszName, *pulEASize, rc);
 
@@ -1740 +1753 @@
         int rc = 0;
         unsigned long action;
-        char pBuffer[64*1024];
+        const int cbBuffer = 64*1024;
         FEALIST * pFEASrc;
 
@@ -1753 +1766 @@
 
         debuglocal(9,"NdpFileEAQuery in [%p] <%s>/%d pGEAList=%08x\n", pConn, pConn->file.fname, pConn->file.fd, pGEAList);
+
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+                return ERROR_NOT_ENOUGH_MEMORY;
+
         do {
                 if (pConn->file.fd < 0)
@@ -1759 +1777 @@
                         break;
                 }
-                rc = smbwrp_flistea(pConn->cli, &pConn->file, pBuffer, sizeof( pBuffer));
-                pFEASrc = (FEALIST *) pBuffer;
+                rc = smbwrp_flistea(pConn->cli, &pConn->file, pchBuffer, cbBuffer);
+                pFEASrc = (FEALIST *)pchBuffer;
                 if (rc)
                 {
@@ -1787 +1805 @@
                 }
         } while (0);
+        free(pchBuffer);
         debuglocal(9,"NdpFileEAQuery out <%s>/%d pFEASrc->cbList=%d pFEAList->cbList=%d rc=%d\n", pConn->file.fname, pConn->file.fd, pFEASrc->cbList, pFEAList->cbList, rc);
 
@@ -1846 +1865 @@
         char path[CCHMAXPATH+1] = {0};
         FEALIST * pFEAList;
-        char pBuffer[64*1024];
+        const int cbBuffer = 64*1024;
 
         if (!pulEASize)
@@ -1858 +1877 @@
 
         debuglocal(9,"NdpFileEASize in [%p] <%s>/%d \n", pConn, pConn->file.fname, pConn->file.fd);
+
+        char *pchBuffer = (char *)malloc(cbBuffer);
+        if (!pchBuffer)
+                return ERROR_NOT_ENOUGH_MEMORY;
+
         do {
                 if (pConn->file.fd < 0)
@@ -1864 +1888 @@
                         break;
                 }
-                rc = smbwrp_flistea(pConn->cli, &pConn->file, pBuffer, sizeof(pBuffer));
-                pFEAList = (FEALIST*) pBuffer;
+                rc = smbwrp_flistea(pConn->cli, &pConn->file, pchBuffer, cbBuffer);
+                pFEAList = (FEALIST*)pchBuffer;
                 if (rc)
                 {
@@ -1888 +1912 @@
                 *pulEASize = pFEAList->cbList;
         } while (0);
+        free(pchBuffer);
         debuglocal(9,"NdpFileEASize %d %d\n", *pulEASize, rc);