avoid over-long command strings

git-svn-id: https://svn.r-project.org/R/trunk@10059 00db46b3-68df-0310-9c12-caf00c1e9a41
wch · Jul 31, 2000 · 61a9580 · 61a9580
1 parent 1d35e6f
commit 61a9580
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/gnuwin32/check/PkgCheck b/src/gnuwin32/check/PkgCheck
@@ -22,7 +22,7 @@ $(PKG)-Ex.R: $(RLIB)/$(PKG)/R-ex/*.R
 #	  $(RHOME)/src/gnuwin32/check/makeRex.R > MakeRex.R
 #	@$(R) --quiet < makeRex.R > nul
 #	@$(RM) makeRex.R
-	@$(RHOME)/bin/Rcmd massage-Examples.sh $(PKG) $^ > $@
+	@sh $(RHOME)/bin/massage-Examples.sh $(PKG) $^ > $@
 
 test-src-1=$(shell ls *.R 2> nul)
 test-src-auto=$(shell ls *.Rin 2> nul | sed 's/Rin$$/R/')

diff --git a/src/gnuwin32/front-ends/rcmd.c b/src/gnuwin32/front-ends/rcmd.c
@@ -72,6 +72,10 @@ int main (int argc, char **argv)
 	}
 	for (i = 1; i < argc; i++){
 	    if (i > 1) strcat(cmd, " ");
+	    if(strlen(cmd) + strlen(argv[i]) > 9900) {
+		fprintf(stderr, "command line too long\n");
+		exit(27);
+	    }
 	    strcat(cmd, argv[i]);
 	}
 /*	printf("cmd is %s\n", cmd); */