Changeset 445

Timestamp:

Apr 22, 2010, 7:18:13 PM (16 years ago)

Author:

Silvan Scherrer

Message:

samba client 1.6: added version to logfile

Location:

branches/client-1.6/src

Files:

• Makefile.kmk (modified) (1 diff)
• debug.c (modified) (3 diffs)
• version.tpl (moved) (moved from branches/client-1.6/src/version.h_ ) (1 diff)

branches/client-1.6/src/Makefile.kmk

@@ -129 +129 @@
 
 # substitute macros in version.h
-version.h: Config.kmk version.h_
-        $(SED) "s;_VERSION_;$(VERSION);g" version.h_ \
+version.h: Config.kmk version.tpl
+        $(SED) "s;_VERSION_;$(VERSION);g" version.tpl \
                 | $(SED) "s;_WPIVERSION_;$(subst .,\\\,$(VERSION));g" \
                 | $(SED) "s;_BUILD_;$(BUILD);g" \

branches/client-1.6/src/debug.c

@@ -29 +29 @@
 #include <sys/time.h>
 #include <sys/stat.h>
+#include "version.h"
 
 int debuglevel = 9; // we set it to 9, so we get all messages
@@ -35 +36 @@
 char logfilename[] = "log.ndpsmb";
 BOOL do_logging = FALSE;
+BOOL firstLogLine = TRUE;
 
 int debuglvl(int level)
@@ -101 +103 @@
                         f = stdout;
                 }
+
+                // in the first log line we write our version of the client
+                if (firstLogLine)
+                {
+                   fprintf(f, "samba client %s build %s\n", VERSION, BUILD);
+                   firstLogLine = FALSE;
+                }
+
                 gettimeofday(&tv, NULL);
                 strftime(buf,sizeof(buf)-1,"%Y/%m/%d %H:%M:%S", localtime((time_t *)&tv.tv_sec));

branches/client-1.6/src/version.tpl

@@ -6 +6 @@
 #define NDPSMB_BUILD    _BUILD_
 #define NDPSMB_INSTALL  _WPIVERSION_
+#define VERSION         "_VERSION_"
+#define BUILD           "_BUILD_"
 
 #endif // __Version__H