The R Project SVN – R – Diff – /trunk/src/main/dcf.c

 SEXP attribute_hidden do_readDCF(SEXP call, SEXP op, SEXP args, SEXP env)
+{
     int nwhat, nret, nc, nr, m, k, lastm, need;
     Rboolean blank_skip, field_skip = FALSE;
-    int whatlen, dynwhat, buflen = 100;
+    int whatlen, dynwhat, buflen = 8096; // was 100, but that re-alloced often
     char line[MAXELTSIZE], *buf;
     regex_t blankline, contline, trailblank, regline, eblankline;
     regmatch_t regmatch[1];
     SEXP file, what, what2, retval, retval2, dims, dimnames;
     Rconnection con = NULL;
+			}
 			UNPROTECT_PTR(retval);
 			UNPROTECT_PTR(what);
 			retval = retval2;
 			what = what2;
-			/* FIXME:
-			   Why are we doing this?
-			   We need to copy the matched beginning of the
-			   line to buf, so shouldn't we need
+			/* Make sure enough space was used */
-			     regmatch[0].rm_eo
-			   bytes?
-			*/
-			need = (int) strlen(line+regmatch[0].rm_eo);
+			need = (int) (Rf_strchr(line, ':') - line + 1);
 			if(buflen < need){
 			    char *tmp = (char *) realloc(buf, need);
 			    if(!tmp) {
 				free(buf);
 				error(_("could not allocate memory for 'read.dcf'"));

The R Project SVN R