mirror of
https://github.com/9fans/plan9port.git
synced 2025-01-24 11:41:58 +00:00
fix various little bugs
This commit is contained in:
parent
e3e30cff40
commit
18b0811745
3 changed files with 6 additions and 8 deletions
|
@ -18,7 +18,7 @@ void shell_init(void), shell_exec(void), shell_text(char *);
|
|||
|
||||
#define CADD cbuf[clen++] = yytext[0]; \
|
||||
if (clen >= CBUFLEN-1) { \
|
||||
ERROR "string too long", cbuf WARNING; BEGIN A; }
|
||||
ERROR "string too long" WARNING; BEGIN A; }
|
||||
#define CBUFLEN 1500
|
||||
char cbuf[CBUFLEN];
|
||||
int clen, cflag;
|
||||
|
|
|
@ -540,7 +540,7 @@ void copy(void) /* begin input from file, etc. */
|
|||
FILE *fin;
|
||||
|
||||
if (newfile) {
|
||||
if ((fin = fopen(unsharp(newfile), "r")) == NULL)
|
||||
if ((fin = fopen(newfile, "r")) == NULL)
|
||||
ERROR "can't open file %s", newfile FATAL;
|
||||
curfile++;
|
||||
curfile->fin = fin;
|
||||
|
|
|
@ -177,17 +177,15 @@ void do_first(void) /* done at first .G1: definitions, etc. */
|
|||
{
|
||||
extern int lib;
|
||||
extern char *lib_defines;
|
||||
char *file;
|
||||
static char buf[50], buf1[50]; /* static because pbstr uses them */
|
||||
static char buf[100], buf1[100]; /* static because pbstr uses them */
|
||||
FILE *fp;
|
||||
extern int getpid(void);
|
||||
|
||||
sprintf(buf, "define pid /%d/\n", getpid());
|
||||
snprintf(buf, sizeof buf, "define pid /%d/\n", getpid());
|
||||
pbstr(buf);
|
||||
if (lib != 0) {
|
||||
file = unsharp(lib_defines);
|
||||
if ((fp = fopen(file, "r")) != NULL) {
|
||||
sprintf(buf1, "copy \"%s\"\n", file);
|
||||
if ((fp = fopen(lib_defines, "r")) != NULL) {
|
||||
snprintf(buf1, sizeof buf, "copy \"%s\"\n", lib_defines);
|
||||
pbstr(buf1);
|
||||
fclose(fp);
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue