--- ray/src/px/pcompos.c 2003/07/03 22:41:44 2.23 +++ ray/src/px/pcompos.c 2004/01/02 12:47:01 2.27 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pcompos.c,v 2.23 2003/07/03 22:41:44 schorsch Exp $"; +static const char RCSid[] = "$Id: pcompos.c,v 2.27 2004/01/02 12:47:01 schorsch Exp $"; #endif /* * pcompos.c - program to composite pictures. @@ -15,6 +15,7 @@ static const char RCSid[] = "$Id: pcompos.c,v 2.23 200 #include "copyright.h" #include "platform.h" +#include "rtprocess.h" #include "color.h" #include "resolu.h" @@ -60,9 +61,14 @@ int wrongformat = 0; FILE *lblopen(); void quit(); +static gethfunc tabputs; -tabputs(s) /* print line preceded by a tab */ -char *s; + +static int +tabputs( /* print line preceded by a tab */ + char *s, + void *p +) { char fmt[32]; @@ -381,7 +387,7 @@ register COLR c1, c2; j = 4; /* check exponents first! */ while (j--) - if (i = c1[j] - c2[j]) + if ( (i = c1[j] - c2[j]) ) return(i); return(0); } @@ -392,7 +398,7 @@ lblopen(s, xp, yp) /* open pipe to label generator */ char *s; int *xp, *yp; { - char com[128]; + char com[PATH_MAX]; FILE *fp; sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);