Author: Chad Trabant

ChangeLog

@@ -1,3 +1,6 @@
+2013.056: 3.5
+	- Update libmseed to 2.10.
+
 2011.332: 3.4.3
 	- Fix parsing of match/rejection list files, the error only occurred
 	with multiple lines on systems with specific snprintf() behavior.

libmseed/ChangeLog

@@ -1,4 +1,82 @@
-2010.304: 2.6.2
+2013.056: 2.10
+	- Add more sanity checks to msr_unpack_data() to catch bad/corrupted
+	data records and avoid crashes due to impossible pointer construction.
+
+2013.053: 2.9
+	- Extend parsing of day-of-year style time strings to allow parsing
+	of time fields separated by dashes in addition to allowing the day
+	and time fields to be separated by a 'T' or space.  Modifications 
+	were made to ms_seedtimestr2hptime().
+	- Extend parsing of year-month-day style time strings to allow parsing
+	of time fields separated by commas.  Modifications were made to
+	ms_timestr2hptime().
+
+2013.050:
+	- Add MS_ISVALIDYEARDAY() macro to test range for year and day values,
+	years between 1900 and 2100 and days between 1 and 366.
+	- Use new macro to determine when byte swapping is needed.  This test
+	leaves a non-determination of byte order for days 1, 256 and 257 in
+	the year 2056, beware future data users.
+
+2013.007: 2.8 (again)
+	- Add msr_parse_selection() to libmseed.def for Windows builds.
+	- Fix errors in pseudo code in doc/msr_parse.3.
+
+2012.363: 2.8
+	- Implement msr_parse_selection() which is a wrapper of msr_parse()
+	that searches for the first parsable miniSEED record in a memory
+	buffer and returns it.  Optionally a Selections list may be specified
+	to limit the returned data to records matching specific criteria.
+
+2012.357:
+	- Fix corruption of float sample types when opposite byte order than
+	host in certain architecture combinations.  By not addressing
+	individual float samples directly as floats prior to byte swapping
+	we avoid the values being placed into the FPU where they may be
+	corrupted.  Thanks to Moritz Beyreuther and Lion Krischer for discovery
+	and testing.
+	- Expose the msr_unpack_data() function for use by removing the static
+	declaration.  Change verbose flag type to match others and document.
+	- Fix some logging messages, typos, etc.
+
+2012.138: 2.7
+	Add define for MINGW32 to use _fstat and _stat.
+
+2012.114: 2.7rc2
+	- Change record parsing code to trim trailing spaces from network,
+	station, location and channel parameters.  Spaces in between non-space
+	characters remain.
+
+2012.111:
+	- Update example/test.mseed to new data with an earthquake to make it
+	more recognizable compared to ambient noise in the previous example.
+
+2012.105: 2.7rc1
+	- Add many type casts to quiet newer GCC and MSVC compilers.
+	For 32-bit programs there are some places, mostly in packing routines,
+	where 64-bit integers are converted to 32-bit values for sample buffer
+	sizes and counts leaving the potential for overflow.  This will become
+	a problem when byte counts for sample buffers are beyond 2^31, for
+	32-bit integer sample values that is more than 536 million samples.
+	So programmer beware if using such buffer sizes for packing miniSEED.
+
+2012.088:
+	- When parsing records copy the ASCII string fields (sequence number,
+	network, station, location, channel) directly without removing spaces.
+	This makes the parser more lenient to unallowed characters and
+	synchronizes read and write capabilities.
+
+	- For sampling rates above 32,767 Hz only print a warning for high
+	verbosity settings and set the sample rate factor and multipler to zero.
+	Previously an error was printed during rational approximation.
+	The expectation is that a record with such a high sample rate will
+	include a blockette 100 to specify the actual sample rate.
+	This is not an official convention for SEED, but is a kludge to
+	support extremly high sample rates without printing errors.
+
+	- Fix conversion to doubles in examples/msrepack.c.
+
+2011.304: 2.6.2
 	- Increase precision of sample rate in SYNC printing routines to
 	avoid trucation of rate values.
 

libmseed/Makefile

@@ -13,7 +13,7 @@ LIB_OBJS = fileutils.o genutils.o gswap.o lmplatform.o lookup.o \
            parseutils.o unpack.o unpackdata.o selection.o logging.o
 
 MAJOR_VER = 2
-MINOR_VER = 6.2
+MINOR_VER = 10
 CURRENT_VER = $(MAJOR_VER).$(MINOR_VER)
 COMPAT_VER = $(MAJOR_VER).$(MINOR_VER)
 
@@ -39,6 +39,7 @@ $(LIB_A): $(LIB_OBJS)
 $(LIB_SO): $(LIB_OBJS)
 	rm -f $(LIB_SO) $(LIB_SO_FILENAME)
 	$(GCC) $(GCCFLAGS) -shared -Wl,-soname -Wl,$(LIB_SO_ALIAS) -o $(LIB_SO) $(LIB_OBJS)
+	ln -s $(LIB_SO) $(LIB_SO_ALIAS)
 	ln -s $(LIB_SO) $(LIB_SO_FILENAME)
 
 $(LIB_DYN): $(LIB_OBJS)

libmseed/README.byteorder

@@ -14,12 +14,13 @@ create big endian Mini-SEED records (header and data).
 Reading MiniSEED - how libmseed determines the byte order of a record:
 
 The byte order of a record header including blockettes is determined
-by checking if the record start year is a sane value (e.g. between 1920
-and 2020).  The byte order of encoded data samples is determined by the
-byte order flag in the Blockette 1000, if a Blockette 1000 is not
-present the byte order is assumed to be the same as the header.  To
-force the byte order determination of either the header or data section
-of a record the following environment variables can be set:
+by checking if the record start year and day is a sane value (e.g. year
+between 1900 and 2100 and day between 1 and 366).  The byte order of
+encoded data samples is determined by the byte order flag in the
+Blockette 1000, if a Blockette 1000 is not present the byte order is
+assumed to be the same as the header.  To force the byte order
+determination of either the header or data section of a record the
+following environment variables can be set:
 
 UNPACK_HEADER_BYTEORDER
 UNPACK_DATA_BYTEORDER
@@ -47,10 +48,8 @@ These variables should be set to either 0 (little endian) or 1 (big
 endian).  A programmatic equivalent of setting these environment
 variables is provided via the following macros:
 
-.nf
 MS_PACKHEADERBYTEORDER(X)
 MS_PACKDATABYTEORDER(X)
-.fi
 
 
 Note that some interpretations of the SEED 2.4 format imply that

libmseed/example/msrepack.c

@@ -9,7 +9,7 @@
  *
  * Written by Chad Trabant, IRIS Data Management Center
  *
- * modified 2011.164
+ * modified 2012.105
  ***************************************************************************/
 
 #include <stdio.h>
@@ -28,9 +28,9 @@
 #define VERSION "[libmseed " LIBMSEED_VERSION " example]"
 #define PACKAGE "msrepack"
 
-static short int verbose   = 0;
-static short int ppackets  = 0;
-static short int tracepack = 1;
+static flag  verbose       = 0;
+static flag  ppackets      = 0;
+static flag  tracepack     = 1;
 static int   reclen        = 0;
 static int   packreclen    = -1;
 static char *encodingstr   = 0;
@@ -54,10 +54,8 @@ main (int argc, char **argv)
   MSTrace *mst;
   int retcode;
 
-  int totalrecs  = 0;
-  int totalsamps = 0;
   int64_t packedsamples;
-  int packedrecords;
+  int64_t packedrecords;
   int lastrecord;
   int iseqnum = 1;
 
@@ -103,9 +101,6 @@ main (int argc, char **argv)
   while ( (retcode = ms_readmsr (&msr, inputfile, reclen, NULL, &lastrecord,
 				 1, 1, verbose)) == MS_NOERROR )
     {
-      totalrecs++;
-      totalsamps += msr->samplecnt;
-      
       msr_print (msr, ppackets);
 
       /* Convert sample type as needed for packencoding */
@@ -359,7 +354,7 @@ convertsamples (MSRecord *msr, int packencoding)
 		}
 
 	      /* Reallocate buffer for reduced size needed */
-	      if ( realloc (msr->datasamples, (msr->numsamples * sizeof(int32_t))) )
+	      if ( ! (msr->datasamples = realloc (msr->datasamples,(size_t)(msr->numsamples * sizeof(int32_t)))) )
 		{
 		  ms_log (2, "Error, cannot re-allocate buffer for sample conversion\n");
 		  return -1;
@@ -383,7 +378,7 @@ convertsamples (MSRecord *msr, int packencoding)
 		fdata[idx] = (float) ddata[idx];
 
 	      /* Reallocate buffer for reduced size needed */
-	      if ( realloc (msr->datasamples, (msr->numsamples * sizeof(float))) )
+	      if ( ! (msr->datasamples = realloc (msr->datasamples, (size_t)(msr->numsamples * sizeof(float)))) )
 		{
 		  ms_log (2, "Error, cannot re-allocate buffer for sample conversion\n");
 		  return -1;
@@ -396,7 +391,7 @@ convertsamples (MSRecord *msr, int packencoding)
       /* Convert to doubles */
       else if ( encodingtype == 'd' )
 	{
-	  if ( (ddata = (double *) malloc (msr->sampletype * sizeof(double))) )
+	  if ( ! (ddata = (double *) malloc ((size_t)(msr->numsamples * sizeof(double)))) )
 	    {
 	      ms_log (2, "Error, cannot allocate buffer for sample conversion to doubles\n");
 	      return -1;
@@ -423,7 +418,7 @@ convertsamples (MSRecord *msr, int packencoding)
     }
 
   return 0;
-}  /* End of packencoding() */
+}  /* End of convertsamples() */
 
 
 /***************************************************************************
@@ -542,7 +537,7 @@ parameter_proc (int argcount, char **argvec)
   /* Make sure network code is valid */
   if ( netcode )
     {
-      if ( strlen(netcode) > 2 || strlen(netcode) < 0 )
+      if ( strlen(netcode) > 2 || strlen(netcode) < 1 )
 	{
 	  ms_log (2, "Error, invalid output network code: '%s'\n", netcode);
 	  exit (1);

libmseed/example/msview.c

@@ -27,11 +27,11 @@
 #define VERSION "[libmseed " LIBMSEED_VERSION " example]"
 #define PACKAGE "msview"
 
-static short int verbose   = 0;
-static short int ppackets  = 0;
-static short int basicsum  = 0;
-static int   reclen        = -1;
-static char *inputfile     = 0;
+static flag  verbose    = 0;
+static flag  ppackets   = 0;
+static flag  basicsum   = 0;
+static int   reclen     = -1;
+static char *inputfile  = 0;
 
 static int parameter_proc (int argcount, char **argvec);
 static void usage (void);
@@ -43,8 +43,8 @@ main (int argc, char **argv)
   MSRecord *msr = 0;
 
   int dataflag   = 0;
-  int totalrecs  = 0;
-  int totalsamps = 0;
+  int64_t totalrecs  = 0;
+  int64_t totalsamps = 0;
   int retcode;
 
 #ifndef WIN32
@@ -85,7 +85,8 @@ main (int argc, char **argv)
   ms_readmsr (&msr, NULL, 0, NULL, NULL, 0, 0, 0);
 
   if ( basicsum )
-    ms_log (1, "Records: %d, Samples: %d\n", totalrecs, totalsamps);
+    ms_log (1, "Records: %lld, Samples: %lld\n",
+	    (long long int)totalrecs, (long long int)totalsamps);
 
   return 0;
 }  /* End of main() */