Minor corrections to QJST headings.

Deal with STCK values that don't map to valid times.
Deal with compile warnings on VS2012.

Author: ibmmqmet

.gitignore

@@ -1 +1,6 @@
 /.project
+*.mp4
+/src/*.exe
+/src/*.obj
+mqsmfstruc.h
+csq*

src/Makefile.gcc.win

@@ -0,0 +1,50 @@
+
+CC=i686-w64-mingw32-gcc
+CFLAGS= -I. -m32
+PLATFLAGS=
+SRC = mqsmf.c \
+      smfDate.c \
+      smfConv.c \
+      printDEBUG.c \
+      printQ5ST.c    \
+      printQCST.c    \
+      printQCTADP.c  \
+      printQCTDNS.c  \
+      printQCTDSP.c  \
+      printQCTSSL.c  \
+      printQCCT.c  \
+      printQESD.c  \
+      printQEST.c  \
+      printQIST.c  \
+      printQJST.c  \
+      printQLST.c  \
+      printQMAC.c  \
+      printQMST.c  \
+      printQPST.c  \
+      printQSGM.c  \
+      printQSPH.c  \
+      printQSRS.c  \
+      printQSST.c  \
+      printQTST.c  \
+      printWQ.c    \
+      printWTAS.c  \
+      printWTID.c
+
+HDR = mqsmfstruc.h \
+      mqsmf.h
+
+mqsmfcsv.exe: $(SRC) $(HDR) Makefile.gcc.win dummy
+	$(CC) $(PLATFLAGS) -o $@ $(SRC) $(CFLAGS)
+	-rm -f out/*
+	-rm -f SMF-*
+	-mkdir out >/dev/null 2>&1 || true
+	# dbx ./$@
+
+mqsmfstruc.h: csqdsmfc.h convH.exe
+	./convH.exe < csqdsmfc.h > $@
+
+convH.exe: convH.c
+	$(CC) -o $@ convH.c
+
+
+dummy:

src/mqsmf.c

@@ -60,6 +60,11 @@
 #include <time.h>
 #include <ctype.h>
 
+#ifdef _WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif  
+
 #include "mqsmf.h"
 
 static void Usage();
@@ -209,8 +214,12 @@ int main( int argc, char *argv[] )
   /* Open the input file                                               */
   /* If this fails, then put out an error message and quit. If no      */
   /* filename was given on command line, use stdin.                    */
-  /* Windows requires the "b" option for binary input.                 */
+  /* Windows requires the "b" option for binary input. And force       */
+  /* stdin to binary in case we need to read from that too.            */
   /*********************************************************************/
+  #ifdef _WIN32
+  setmode(fileno(stdin), O_BINARY);
+  #endif
   fp = inputFile?fopen(inputFile, "rb" ):stdin;
   if (!fp)
   {
@@ -718,7 +727,6 @@ FILE * fopenext(const char * basename, const char *ext, BOOL *newFile)
 {
   FILE  * fp = NULL;
   char filename[256] = {0};
-  char *filetype;
   char *mode = (append)?"a":"w";
 
   snprintf(filename,sizeof(filename)-1,
@@ -727,7 +735,11 @@ FILE * fopenext(const char * basename, const char *ext, BOOL *newFile)
   fp = fopen(filename, mode);
   if (fp)
   {
-    long pos = ftell(fp);
+    long pos;
+
+    fseek(fp,0,SEEK_END);    
+    pos = ftell(fp);
+    
     if (pos == 0) /* Have we just created the file, even for "append" mode */
       *newFile = TRUE;
     else

src/mqsmf.h

@@ -297,7 +297,7 @@ extern char *strMQCHLD  (int v);
   ADDDATA("%s,",convDate(v))
 
 #define ADDTIMEIDX(h,idx,v) \
-  sprintf(tmpHead,"%s[%s] (S),%s[%s](US)",h,idx,h,idx); \
+  sprintf(tmpHead,"%s[%s] (DATE),%s[%s](TIME)",h,idx,h,idx); \
   ADDHEAD(tmpHead); \
   ADDDATA("%s,",convDate(v))
 
@@ -362,8 +362,8 @@ extern char *strMQCHLD  (int v);
   {                      \
     fprintf(fp,"%s",headings);\
     fprintf(fp,"\n");    \
-    first=FALSE;         \
   }                      \
+  first=FALSE;         \
   fprintf(fp,"%s",dataline);\
   fprintf(fp,"\n")
 

src/printQJST.c

@@ -49,7 +49,9 @@ void printQJST(qjst *p)
 
   if (conv32(p->qjstll)>=offsetof(qjst,qjstio))
   {
-    for (i=0;i<3;i++)
+    /* Array of 1 entry! Reserved space follows for 2 more, but they   */
+    /* are not currently used.                                         */
+    for (i=0;i<1;i++)   
     {
       if (first)
         sprintf(index,"%d",i+1);

src/printWTAS.c

@@ -6,7 +6,7 @@ SMFPRINTGLOB;
 
 void printWTAS(wtas *p)
 {
-  int i,j;
+  int i;
   char index[64];
 
   SMFPRINTSTART("WTAS",p,conv16(p->wtaslen));

src/smfDate.c

@@ -53,6 +53,8 @@ static unsigned long long int EPOCH1970 = (STCK1972 - (2*STCKYR365));
 /* This formatter for strftime                                      */
 /********************************************************************/
 static char *fmt = "\"%Y/%m/%d\",\"%H:%M:%S";
+static char *epochTime = "\"1970/01/01\",\"00:00:00,000000\"";
+static char *emptyTime = "\"\",\"\"";
 static char stckTime[64] = {0};
 
 /********************************************************************/
@@ -63,16 +65,26 @@ static char stckTime[64] = {0};
 /*    This routine does not cope with dates before 1970, but        */
 /*    that's not likely to be a concern for processing MQ SMF.      */
 /********************************************************************/
-char * convDate(unsigned long long stck)
+char * convDate(unsigned long long stcki)
 {
   time_t sec;
+  unsigned long long stck;
   unsigned int usec;
   unsigned long long int s;
   struct tm *t;
   size_t offset;
 
-  stck = conv64(stck);   /* Always passed in z/OS endian; ensure converted */
+  stck = conv64(stcki);   /* Always passed in z/OS endian; ensure converted */
 
+  if (stck == 0)
+  {
+    /***********************************************************************/
+    /* Put a hardcoded value
+    /***********************************************************************/
+    strcpy(stckTime,emptyTime);
+  }
+  else
+  {
   s = stck - EPOCH1970;  /* Make relative to our epoch instead of z/OS 1900*/
   s = s / 4096;                                /* Convert stck to microsecs*/
   sec  = (time_t)(s / 1000000);                     /* Split into two parts*/
@@ -81,8 +93,19 @@ char * convDate(unsigned long long stck)
   t = localtime(&sec);                 /* Turn seconds into tm structure...*/
 
   offset = strftime(stckTime,sizeof(stckTime)-1,fmt,t); /* ...and format it*/
-  sprintf(&stckTime[offset],",%6.6d\"",usec);          /* Add on usec value*/
-
+  if (offset == 0)
+  {    
+    /***********************************************************************/
+    /* There seem to be occasions where the timestamp is not a proper      */
+    /* value - perhaps when there has been no work done for the activity   */
+    /* being recorded. So we put a hardcoded value into the string to make */
+    /* those times easy to recognise.                                      */
+    /***********************************************************************/ 
+    strcpy(stckTime,epochTime);
+  }
+  else
+    sprintf(&stckTime[offset],",%6.6d\"",usec);          /* Add on usec value*/
+  }
   return stckTime;
 }
 

src/t

@@ -0,0 +1,5 @@
+make -f *gcc*
+rm -f c:/tmp/smf/out/*
+./mqsmfcsv -i ../testing/data/TESTCHL.dat -o c:/temp/smf/out -d2
+./mqsmfcsv -i ../testing/data/TEST115.dat -o c:/temp/smf/out -d2 -a
+./mqsmfcsv -i c:/temp/smf/data/SMF115.test.bin -m 200 -o c:/temp/smf/out -d2 -a