Merge pull request #56 from wltrimbl/master

Two patches for OSX portability
ExpressionAnalysis · e556e166adad849046df9232d2762940bb248621 · ExpressionAnalysis committed on GitHub May 9, 2017 · May 9, 2017 · e556e16
2 parents ae1bb52 + b6455be
commit e556e166adad849046df9232d2762940bb248621
Unified Split

Showing with 4 additions and 4 deletions.

+1 −1 clipper/ea-bcl2fastq.cpp

+2 −2 clipper/fastq-lib.cpp

+1 −1 clipper/mirna-quant.cpp
diff --git a/clipper/ea-bcl2fastq.cpp b/clipper/ea-bcl2fastq.cpp
@@ -290,7 +290,7 @@ int main (int argc, char **argv) {
             ++output_fnum;                        // output file number is sequential
             masks[i].rnum=output_fnum;            // save file number as "read number"
             if (usegz) {
-                outtmp = string_format("gzip -2 --rsyncable -c > %s.%d.fq.gz",out.c_str(),output_fnum); 
+                outtmp = string_format("gzip -2  -c > %s.%d.fq.gz",out.c_str(),output_fnum); 
                 fo=popenordie(outtmp.c_str(),"w");
             } else {
                 outtmp = string_format("%s.%d.fq",out.c_str(),output_fnum); 
diff --git a/clipper/fastq-lib.cpp b/clipper/fastq-lib.cpp
@@ -160,7 +160,7 @@ FILE *gzopen(const char *f, const char *m, bool*isgz) {
         if (!strcmp(ext,".gz")) {
             char *tmp=(char *)malloc(strlen(f)+100);
             if (strchr(m,'w')) {
-                    strcpy(tmp, "gzip -3 --rsyncable > '");
+                    strcpy(tmp, "gzip -3  > '");
                     strcat(tmp, f);
                     strcat(tmp, "'");
             } else {
@@ -361,7 +361,7 @@ int getstr (char ** lineptr, size_t *n, FILE * stream, char terminator, int offs
 	 NUL-terminate the line buffer.  */
 
       assert(*n - nchars_avail == read_pos - *lineptr);
-      if (nchars_avail < 1)
+      if (nchars_avail < 2)
 	{
 	  if (*n > 64)
 	    *n *= 2;
diff --git a/clipper/mirna-quant.cpp b/clipper/mirna-quant.cpp
@@ -681,7 +681,7 @@ FILE *gzopen(const char *f, const char *m, bool*isgz) {
         if (!strcmp(fext(f),".gz")) {
                 char *tmp=(char *)malloc(strlen(f)+100);
                 if (strchr(m,'w')) {
-                        strcpy(tmp, "gzip --rsyncable > '");
+                        strcpy(tmp, "gzip  > '");
                         strcat(tmp, f);
                         strcat(tmp, "'");
                 } else {