Changeset 533

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

Location:

trunk/client/src

Files:

• debug.c (modified) (3 diffs)
• ndpsmb.c (modified) (18 diffs)
• smbwrp.c (modified) (6 diffs)

trunk/client/src/debug.c

@@ -32 +32 @@
 
 int debuglevel = 9; // we set it to 9, so we get all messages
-char logfile[_MAX_PATH +1]  = {0};
-char debugfile[_MAX_PATH +1] = {0};
+char logfile[_MAX_PATH +1];
+char debugfile[_MAX_PATH +1];
 char logfilename[] = "log.ndpsmb";
-BOOL do_logging = FALSE;
-BOOL firstLogLine = TRUE;
+BOOL do_logging;
+BOOL firstLogLine;
+HMTX logMutex;
+char nameMutex[] = "\\SEM32\\NDPSMB";
 
 int debuglvl(int level)
@@ -48 +50 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void debuglocal(int level, const char * fmt, ...)
 {
         FILE *f=NULL;
-        struct stat filestat;
 
-        // do we have to log at all (not needed atm)
-/*      if (!debuglvl(level))
+        // do we have to log at all
+)
         {
                 return;
-        }*/
+        }
 
-        // if the file ndpsmb.dbg is around we write a logfile
-        if (!debugfile[0])
+        // if the 
+        if ()
         {
-           strncpy(debugfile, getenv("ETC"), 2);
-           strncat(debugfile, "\\", sizeof(debugfile) - strlen(debugfile) -1);
-           strncat(debugfile, "ndpsmb.dbg", sizeof(debugfile) - strlen(debugfile) -1);
-        } /* endif */
-        
-        if (stat(debugfile, &filestat) !=0)
-           return;
-
-        //we create the logfile variable only once
-        if (!logfile[0])
-        {
-                char *env = getenv("LOGFILES");
-                if (env != NULL)
-                {
-                   strncpy(logfile, env, sizeof(logfile) -1);
-                   strncat(logfile, "\\", sizeof(logfile) - strlen(logfile) -1);
-                   strncat(logfile, logfilename, sizeof(logfile) - strlen(logfile) -1);  
-                }
-                else
-                {
-                   strncpy(logfile, logfilename, sizeof(logfile) -1);
-                }
-                // set the samba logging stuff
-                do_logging = TRUE;
-        } /* endif */
+           DosRequestMutexSem(logMutex, (ULONG) SEM_INDEFINITE_WAIT);
+        }
 
         do
@@ -121 +149 @@
                 if (logfile)
                 {
-                        fclose(f);
+//                      fflush(f);
+                        fclose(f);
                 }
         }
         while (0);
+
+
+
+
+
+
+
+
 }

trunk/client/src/ndpsmb.c

@@ -150 +150 @@
                 ifL = 1;
         }
+
         debuglocal(9,"Working with %s bit fileio NDFS\n", ifL ? "64" : "32");
         return NO_ERROR;
@@ -157 +158 @@
 int APIENTRY NdpPluginFree (void)
 {
+
         return NO_ERROR;
 }
@@ -982 +984 @@
                                         {       
                                             rc = (finfo.attr & FILE_DIRECTORY) !=0 ?
-                                                ERROR_PATH_NOT_FOUND :
-                                                ERROR_INVALID_PARAMETER;
+                                                ERROR_:
+                                                ERROR_;
                                         }
                                         else if (rc != ERROR_REM_NOT_LIST)
@@ -1217 +1219 @@
         NDDATABUF fdata = {0};
         smbwrp_fileinfo *finfo;
-        char    pBuffer[64*1024];
+        c;
 
         if (!pfi || !pfi->pszName || !pFEAList)
@@ -1239 +1241 @@
         debuglocal(9,"NdpEAQuery in [%p] <%s> %08x %d\n", pConn, path, pGEAList, pGEAList ? pGEAList->cbList : 0);
 
+
+
+
+
         do {
-                rc = smbwrp_listea( pConn->cli, path, pBuffer, sizeof( pBuffer));
-                pFEASrc = (FEALIST*) pBuffer;
+                rc = smbwrp_listea( pConn->cli, path, p);
+                pFEASrc = (FEALIST*) pBuffer;
                 if (rc)
                 {
@@ -1268 +1274 @@
                 }
         } while (0);
+
         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];
+        c;
         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);
 
+
+
+
+
         do {
-                rc = smbwrp_listea(pConn->cli, path, pBuffer, sizeof( pBuffer));
-                pfealist = (FEALIST*)pBuffer;
+                rc = smbwrp_listea(pConn->cli, path, p);
+                pfealist = (FEALIST*)pBuffer;
                 if (rc)
                 {
@@ -1390 +1402 @@
                 *pulEASize = pfealist->cbList;
         } while (0);
+
         debuglocal(9,"NdpEASize <%s> %d %d\n", pfi->pszName, *pulEASize, rc);
 
@@ -1740 +1753 @@
         int rc = 0;
         unsigned long action;
-        char pBuffer[64*1024];
+        c;
         FEALIST * pFEASrc;
 
@@ -1753 +1766 @@
 
         debuglocal(9,"NdpFileEAQuery in [%p] <%s>/%d pGEAList=%08x\n", pConn, pConn->file.fname, pConn->file.fd, pGEAList);
+
+
+
+
+
         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, p);
+                pFEASrc = (FEALIST *)Buffer;
                 if (rc)
                 {
@@ -1787 +1805 @@
                 }
         } while (0);
+
         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];
+        c;
 
         if (!pulEASize)
@@ -1858 +1877 @@
 
         debuglocal(9,"NdpFileEASize in [%p] <%s>/%d \n", pConn, pConn->file.fname, pConn->file.fd);
+
+
+
+
+
         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, p);
+                pFEAList = (FEALIST*)Buffer;
                 if (rc)
                 {
@@ -1888 +1912 @@
                 *pulEASize = pFEAList->cbList;
         } while (0);
+
         debuglocal(9,"NdpFileEASize %d %d\n", *pulEASize, rc);
 

trunk/client/src/smbwrp.c

@@ -1113 +1113 @@
         }
 
-        ZERO_STRUCTP(finfo);
+/*      ZERO_STRUCTP(finfo); */
+        finfo->atime = 0;
+        finfo->ctime = 0;
+        finfo->mtime = 0;
+        *finfo->fname = '\0';
         
         switch (level) {
@@ -1157 +1161 @@
                         p += ret;
                         finfo->easize = -1;
-                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
+                        strnc(finfo->fname, fname, sizeof(finfo->fname) -1);
                         return PTR_DIFF(p, base);
 
@@ -1185 +1189 @@
                         }
                         p += ret;
-                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
+                        strnc(finfo->fname, fname, sizeof(finfo->fname) -1);
                         return PTR_DIFF(p, base) + 1;
                         
@@ -1246 +1250 @@
                                 return pdata_end - base;
                         }
-                        strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
+                        strnc(finfo->fname, fname, sizeof(finfo->fname) -1);
 
                         /* To be robust in the face of unicode conversion failures
@@ -1469 +1473 @@
                                                         &resume_key, &last_name_raw);
 
+
                         if (!finfo.fname) {
                                 debuglocal(0,"Error: unable to parse name from info level %d\n",
@@ -1537 +1542 @@
                         p += _os2_interpret_long_filename(frame, cli, info_level, p, rdata_end,
                                                      &finfo,NULL,NULL);
+
                         if (!finfo.fname) {
                                 debuglocal(0,"list_new: unable to parse name from info level %d\n",