cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tpic: clean up

Browse source
This commit is contained in:
Russ Cox 2024-04-06 11:13:59 -04:00
parent d5b2552b95
commit b1b88c75fd
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/tpic/input.c
View file

@ -586,7 +586,7 @@ char shellbuf[1000], *shellp;
void void
shell_init(void) /* set up to interpret a shell command */ shell_init(void) /* set up to interpret a shell command */
{ {
sprintf(shellbuf, "sh -c '"); snprintf(shellbuf, sizeof shellbuf, "sh -c '");
shellp = shellbuf + strlen(shellbuf); shellp = shellbuf + strlen(shellbuf);
} }

11
src/cmd/tpic/main.c
View file

@ -1,5 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h>
#include "pic.h" #include "pic.h"
#include "y.tab.h" #include "y.tab.h"
@ -62,7 +63,7 @@ main(int argc, char **argv)
text = (Text *) grow((char *)text, "text", ntextlist += 1000, sizeof(Text)); text = (Text *) grow((char *)text, "text", ntextlist += 1000, sizeof(Text));
attr = (Attr *) grow((char *)attr, "attr", nattrlist += 100, sizeof(Attr)); attr = (Attr *) grow((char *)attr, "attr", nattrlist += 100, sizeof(Attr));
sprintf(buf, "/%d/", getpid()); snprintf(buf, sizeof buf, "/%d/", getpid());
pushsrc(String, buf); pushsrc(String, buf);
definition("pid"); definition("pid");
@ -275,3 +276,11 @@ reset(void)
xmin = ymin = 30000; xmin = ymin = 30000;
xmax = ymax = -30000; xmax = ymax = -30000;
} }
void
tpicsnprintf(char *buf, int n, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
vsnprintf(buf, n, fmt, args);
}

2
src/cmd/tpic/misc.c
View file

@ -92,7 +92,7 @@ sprintgen(char *fmt)
{ {
char buf[1000]; char buf[1000];
sprintf(buf, fmt, exprlist[0], exprlist[1], exprlist[2], exprlist[3], exprlist[4]); snprintf(buf, sizeof buf, fmt, exprlist[0], exprlist[1], exprlist[2], exprlist[3], exprlist[4]);
nexpr = 0; nexpr = 0;
free(fmt); free(fmt);
return tostring(buf); return tostring(buf);

5
src/cmd/tpic/pic.h
View file

@ -13,9 +13,7 @@
extern char errbuf[1000]; extern char errbuf[1000];
#undef sprintf /* Snow Leopard */ #define ERROR tpicsnprintf(errbuf, sizeof errbuf,
#define ERROR sprintf(errbuf,
#define FATAL ), yyerror(errbuf), exit(1) #define FATAL ), yyerror(errbuf), exit(1)
#define WARNING ), yyerror(errbuf) #define WARNING ), yyerror(errbuf)
@ -283,5 +281,6 @@ int unput(int c);
int whatpos(obj *p, int corner, double *px, double *py) /* what is the position (no side effect) */; int whatpos(obj *p, int corner, double *px, double *py) /* what is the position (no side effect) */;
void yyerror(char *s); void yyerror(char *s);
int yyparse(void); int yyparse(void);
void tpicsnprintf(char*, int, const char*, ...);
#include "tex.h" #include "tex.h"

2
src/cmd/tpic/picl.l
View file

@ -14,10 +14,8 @@
#include "pic.h" #include "pic.h"
#include "y.tab.h" #include "y.tab.h"
extern double atof();
extern char *filename; extern char *filename;
extern struct symtab symtab[]; extern struct symtab symtab[];
extern struct symtab*copythru();
#define CADD cbuf[clen++]=yytext[0]; if(clen>=CBUFLEN-1) {ERROR "string too long" WARNING; BEGIN A;} #define CADD cbuf[clen++]=yytext[0]; if(clen>=CBUFLEN-1) {ERROR "string too long" WARNING; BEGIN A;}
#define CBUFLEN 500 #define CBUFLEN 500