xlsxwriter 0.0.5 → 0.0.6

data/ext/xlsxwriter/libxlsxwriter/src/xmlwriter.c

@@ -140,6 +140,15 @@ lxw_xml_data_element(FILE * xmlfile,
     fprintf(xmlfile, "</%s>", tag);
 }
 
+/*
+ * Write an XML <si> element for rich strings, without encoding.
+ */
+void
+lxw_xml_rich_si_element(FILE * xmlfile, const char *string)
+{
+    fprintf(xmlfile, "<si>%s</si>", string);
+}
+
 /*
  * Escape XML characters in attributes.
  */
@@ -153,19 +162,19 @@ _escape_attributes(struct xml_attribute *attribute)
     while (*p_attr) {
         switch (*p_attr) {
             case '&':
-                strncat(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
+                memcpy(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
                 p_encoded += sizeof(LXW_AMP) - 1;
                 break;
             case '<':
-                strncat(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
+                memcpy(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
                 p_encoded += sizeof(LXW_LT) - 1;
                 break;
             case '>':
-                strncat(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
+                memcpy(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
                 p_encoded += sizeof(LXW_GT) - 1;
                 break;
             case '"':
-                strncat(p_encoded, LXW_QUOT, sizeof(LXW_QUOT) - 1);
+                memcpy(p_encoded, LXW_QUOT, sizeof(LXW_QUOT) - 1);
                 p_encoded += sizeof(LXW_QUOT) - 1;
                 break;
             default:
@@ -195,15 +204,15 @@ lxw_escape_data(const char *data)
     while (*data) {
         switch (*data) {
             case '&':
-                strncat(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
+                memcpy(p_encoded, LXW_AMP, sizeof(LXW_AMP) - 1);
                 p_encoded += sizeof(LXW_AMP) - 1;
                 break;
             case '<':
-                strncat(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
+                memcpy(p_encoded, LXW_LT, sizeof(LXW_LT) - 1);
                 p_encoded += sizeof(LXW_LT) - 1;
                 break;
             case '>':
-                strncat(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
+                memcpy(p_encoded, LXW_GT, sizeof(LXW_GT) - 1);
                 p_encoded += sizeof(LXW_GT) - 1;
                 break;
             default:

data/ext/xlsxwriter/libxlsxwriter/third_party/minizip/ioapi.c

@@ -96,6 +96,7 @@ static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, in
 {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
+    (void) opaque;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = "rb";
     else
@@ -114,6 +115,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,
 {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
+    (void) opaque;
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
         mode_fopen = "rb";
     else
@@ -132,6 +134,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,
 static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
 {
     uLong ret;
+    (void) opaque;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
@@ -139,6 +142,7 @@ static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf,
 static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
 {
     uLong ret;
+    (void) opaque;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
@@ -146,6 +150,7 @@ static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const voi
 static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 {
     long ret;
+    (void) opaque;
     ret = ftell((FILE *)stream);
     return ret;
 }
@@ -154,6 +159,7 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
 {
     ZPOS64_T ret;
+    (void) opaque;
     ret = FTELLO_FUNC((FILE *)stream);
     return ret;
 }
@@ -162,6 +168,7 @@ static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offs
 {
     int fseek_origin=0;
     long ret;
+    (void) opaque;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
@@ -185,6 +192,7 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
 {
     int fseek_origin=0;
     long ret;
+    (void) opaque;
     switch (origin)
     {
     case ZLIB_FILEFUNC_SEEK_CUR :
@@ -210,6 +218,7 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T
 static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 {
     int ret;
+    (void) opaque;
     ret = fclose((FILE *)stream);
     return ret;
 }
@@ -217,6 +226,7 @@ static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
 {
     int ret;
+    (void) opaque;
     ret = ferror((FILE *)stream);
     return ret;
 }

data/ext/xlsxwriter/libxlsxwriter/third_party/minizip/zip.c

@@ -519,12 +519,14 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
       break;
 
     for (i=(int)uReadSize-3; (i--)>0;)
+    {
       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
         ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
       {
         uPosFound = uReadPos+i;
         break;
       }
+    }
 
       if (uPosFound!=0)
         break;

data/ext/xlsxwriter/libxlsxwriter/third_party/tmpfileplus/tmpfileplus.c

@@ -169,7 +169,7 @@ static char *getenv_save(const char *varname, char *buf, size_t bufsize)
 	buf[0] = '\0';
 	if (ptr)
 	{
-		strncpy(buf, ptr, bufsize);
+		strncpy(buf, ptr, bufsize-1);
 		buf[bufsize-1] = '\0';
 		return buf;
 	}
@@ -189,7 +189,7 @@ static FILE *mktempfile_internal(const char *tmpdir, const char *pfx, char **tmp
  */
 {
 	FILE *fp;
-	int fd;
+	int fd = 0;
 	char randpart[] = "1234567890";
 	size_t lentempname;
 	int i;

data/ext/xlsxwriter/workbook.c

@@ -13,8 +13,7 @@ VALUE workbook_release(VALUE self);
 
 
 VALUE
-workbook_alloc(VALUE klass)
-{
+workbook_alloc(VALUE klass) {
   VALUE obj;
   struct workbook *ptr;
 
@@ -308,17 +307,20 @@ workbook_define_name_(VALUE self, VALUE name, VALUE formula) {
   return self;
 }
 
-/*  call-seq: wb.validate_worksheet_name(name) -> true
+/*  call-seq:
+ *    wb.validate_sheet_name(name) -> true
+ *    wb.validate_worksheet_name(name) -> true
  *
  *  Validates a worksheet +name+. Returns +true+ or raises an exception (not
  *  implemented yet).
+ *
  */
 VALUE
-workbook_validate_worksheet_name_(VALUE self, VALUE name) {
+workbook_validate_sheet_name_(VALUE self, VALUE name) {
   struct workbook *ptr;
   lxw_error err;
   Data_Get_Struct(self, struct workbook, ptr);
-  err = workbook_validate_worksheet_name(ptr->workbook, StringValueCStr(name));
+  err = workbook_validate_sheet_name(ptr->workbook, StringValueCStr(name));
   handle_lxw_error(err);
   return Qtrue;
 }
@@ -386,7 +388,8 @@ init_xlsxwriter_workbook() {
   rb_define_method(cWorkbook, "set_default_xf_indices", workbook_set_default_xf_indices_, 0);
   rb_define_method(cWorkbook, "properties", workbook_properties_, 0);
   rb_define_method(cWorkbook, "define_name", workbook_define_name_, 2);
-  rb_define_method(cWorkbook, "validate_worksheet_name", workbook_validate_worksheet_name_, 1);
+  rb_define_method(cWorkbook, "validate_sheet_name", workbook_validate_sheet_name_, 1);
+  rb_define_method(cWorkbook, "validate_worksheet_name", workbook_validate_sheet_name_, 1);
 
   /*
    * This attribute contains effective font widths used for automatic column

data/lib/xlsxwriter/version.rb

@@ -1,4 +1,4 @@
 module XlsxWriter
   # :nodoc:
-  VERSION='0.0.5'.freeze
+  VERSION='0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxwriter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nick H
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-02 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -70,6 +70,7 @@ files:
 - ext/xlsxwriter/libxlsxwriter/include/xlsxwriter.h
 - ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/app.h
 - ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/chart.h
+- ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/chartsheet.h
 - ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/common.h
 - ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/content_types.h
 - ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/core.h
@@ -95,6 +96,7 @@ files:
 - ext/xlsxwriter/libxlsxwriter/src/Makefile
 - ext/xlsxwriter/libxlsxwriter/src/app.c
 - ext/xlsxwriter/libxlsxwriter/src/chart.c
+- ext/xlsxwriter/libxlsxwriter/src/chartsheet.c
 - ext/xlsxwriter/libxlsxwriter/src/content_types.c
 - ext/xlsxwriter/libxlsxwriter/src/core.c
 - ext/xlsxwriter/libxlsxwriter/src/custom.c
@@ -197,8 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Ruby interface to libxlsxwriter