Changeset 960 for trunk/client/src/debug.c

Timestamp:

Aug 16, 2016, 5:41:49 PM (9 years ago)

Author:

Silvan Scherrer

Message:

samba client: add the possibility to have logfiles per share

File:

• trunk/client/src/debug.c (modified) (6 diffs)

trunk/client/src/debug.c

@@ -31 +31 @@
 #include <sys/stat.h>
 #include "nversion.h"
+#include "smbwrp.h"
 
-int debuglevel = 9; // we set it to 9, so we get all messages
-char logfile[_MAX_PATH +1];
-char debugfile[_MAX_PATH +1];
-char logfilename[] = "log.ndpsmb";
-BOOL do_logging;
-BOOL firstLogLine;
-HMTX logMutex;
-char nameMutex[] = "\\SEM32\\NDPSMB";
+void debugInit(Resource *pRes, char *logfileext, int ifL)
+{
+        if (!pRes)
+           return;
 
-int debuglvl(int level)
-{
-        return (level <= debuglevel) ? 1 : 0;
-}
-
-BOOL writeLog()
-{
-        return do_logging;
-}
-
-void debugInit()
-{
-        *logfile = '\0';
-        *debugfile = '\0';
-        do_logging = FALSE;
-        firstLogLine = TRUE;
-        logMutex = NULLHANDLE;
-        struct stat filestat;
+        pRes->firstLogLine = 1;
+        pRes->ifL = ifL;
         APIRET rc = NO_ERROR;
-
-        // create the debugfile name
-        strncat(debugfile, getenv("ETC"), 2);
-        strncat(debugfile, "\\", sizeof(debugfile) - strlen(debugfile) -1);
-        strncat(debugfile, "ndpsmb.dbg", sizeof(debugfile) - strlen(debugfile) -1);
-
-        // is the file around? if not we have no debug
-        if (stat(debugfile, &filestat) !=0)
-           return;
 
         //create the logfile variable
@@ -74 +46 @@
         if (env != NULL)
         {
-           strncat(logfile, env, sizeof(logfile) -1);
-           strncat(logfile, "\\", sizeof(logfile) - strlen(logfile) -1);
-           strncat(logfile, logfilename, sizeof(logfile) - strlen(logfile) -1);  
+           snprintf(pRes->logfile, sizeof(pRes->logfile), "%s/%s.%s", env, "log.ndpsmb", logfileext);
+           snprintf(pRes->smb_logfile, sizeof(pRes->smb_logfile), "%s/%s.%s", env, "log.smbc", logfileext);
         }
         else
-           strncat(logfile, logfilename, sizeof(logfile) -1);
-        
-        // set the samba logging stuff
-        do_logging = TRUE;
-
-        // now we create a sem, so that logging from different threads works
-        rc = DosCreateMutexSem(nameMutex, &logMutex, 0, FALSE);
-        if (rc == ERROR_DUPLICATE_NAME)
-           rc = DosOpenMutexSem(nameMutex, &logMutex);
+        {
+           snprintf(pRes->logfile, sizeof(pRes->logfile), "%s.%s", "log.ndpsmb", logfileext);
+           snprintf(pRes->smb_logfile, sizeof(pRes->smb_logfile), "%s.%s", "log.smbc", logfileext);
+        }
+        pRes->logfileFH = NULL;
 
         return;
@@ -94 +61 @@
 void debugDelete()
 {
-        DosCloseMutexSem(logMutex);
         return;
 }
 
-void debuglocal(int level, const char * fmt, ...)
+void debugClose(Resource *pRes)
 {
-        FILE *f=NULL;
+        if (pRes && pRes->logfileFH)
+        {
+           fclose(pRes->logfileFH);
+           pRes->logfileFH = NULL;
+        }
+        return;
+}
 
+void debuglocal(Resource *pRes, int level, const char * fmt, ...)
+{
+        FILE *f = NULL;
         // do we have to log at all
-        if (!do_logging)
+        if (pRes && (level > pRes->loglevel))
            return;
-
-        // if the sem is created we request it
-        if (logMutex)
-           DosRequestMutexSem(logMutex, (ULONG) SEM_INDEFINITE_WAIT);
 
         do {
@@ -114 +85 @@
            char buf[80] = {0};
            va_list args;
-           if (logfile[0])
+           if (pRes)
            {
-              f = fopen(logfile, "a");
-              if (!f)
+              if (!pRes->logfileFH)
+                 pRes->logfileFH = fopen(pRes->logfile, "a");
+              if (!pRes->logfileFH)
                  break;
+              else
+                 f = pRes->logfileFH;
            }
            else
@@ -124 +98 @@
 
            // in the first log line we write our version of the client
-           if (firstLogLine)
+           if (pRes && pRes->firstLogLine)
            {
               fprintf(f, "Samba client %s build %s based on %s\n", VERSION, BUILD, smbwrp_getVersion());
               fprintf(f, "This build is maintained by %s\n", VENDOR);
-              firstLogLine = FALSE;
+              fprintf(f, "Working with %s bit fileio NDFS\n", pRes->ifL ? "64" : "32");
+
+              pRes->firstLogLine = 0;
            }
 
@@ -137 +113 @@
            vfprintf(f, fmt, args);
            va_end(args);
-           if (logfile)
-              fclose(f);
 
         } while (0);
 
-        // if the sem is created we release it
-        if (logMutex)
-           DosReleaseMutexSem(logMutex);
-
         return;
 }