| 17 |
|
#include <sys/stat.h> |
| 18 |
|
#include <fcntl.h> |
| 19 |
|
|
| 20 |
– |
#include "standard.h" |
| 20 |
|
#include "platform.h" |
| 21 |
+ |
#include "standard.h" |
| 22 |
|
|
| 23 |
|
|
| 24 |
< |
#define MAXFLEN 8192 /* file must be smaller than this */ |
| 24 |
> |
#define MAXWLEN 4096 /* words must be shorter than this */ |
| 25 |
|
|
| 26 |
– |
extern char *bmalloc(); |
| 26 |
|
|
| 28 |
– |
|
| 27 |
|
int |
| 28 |
< |
wordfile(words, fname) /* get words from fname, put in words */ |
| 29 |
< |
char **words; |
| 30 |
< |
char *fname; |
| 28 |
> |
wordfile( /* get words from fname, put in words */ |
| 29 |
> |
char **words, |
| 30 |
> |
int nargs, |
| 31 |
> |
char *fname |
| 32 |
> |
) |
| 33 |
|
{ |
| 34 |
+ |
int wrdcnt = 0; |
| 35 |
+ |
int n = 0; |
| 36 |
|
int fd; |
| 37 |
< |
char buf[MAXFLEN]; |
| 36 |
< |
register int n; |
| 37 |
> |
char buf[MAXWLEN]; |
| 38 |
|
/* load file into buffer */ |
| 39 |
< |
if (fname == NULL) |
| 39 |
> |
if (fname == NULL || !*fname) |
| 40 |
|
return(-1); /* no filename */ |
| 41 |
+ |
if (nargs <= 1) |
| 42 |
+ |
return(-1); |
| 43 |
|
if ((fd = open(fname, 0)) < 0) |
| 44 |
|
return(-1); /* open error */ |
| 45 |
< |
n = read(fd, buf, MAXFLEN); |
| 45 |
> |
words[0] = NULL; |
| 46 |
> |
while (nargs > 1 && (n += read(fd, buf+n, MAXWLEN-n)) > 0) { |
| 47 |
> |
int crem = 0; |
| 48 |
> |
if (n >= MAXWLEN) /* still something left? */ |
| 49 |
> |
while (!isspace(buf[--n])) { |
| 50 |
> |
if (n <= 0) /* one long word! */ |
| 51 |
> |
goto done; |
| 52 |
> |
++crem; |
| 53 |
> |
} |
| 54 |
> |
buf[n] = '\0'; /* terminate & parse */ |
| 55 |
> |
n = wordstring(words, nargs, buf); |
| 56 |
> |
if (n < 0) { |
| 57 |
> |
wrdcnt = -1; /* memory error */ |
| 58 |
> |
break; |
| 59 |
> |
} |
| 60 |
> |
words += n; nargs -= n; |
| 61 |
> |
wrdcnt += n; |
| 62 |
> |
if ((n = crem) > 0) /* move remainder */ |
| 63 |
> |
memmove(buf, buf+MAXWLEN-crem, crem); |
| 64 |
> |
} |
| 65 |
> |
done: |
| 66 |
|
close(fd); |
| 67 |
< |
if (n < 0) /* read error */ |
| 45 |
< |
return(-1); |
| 46 |
< |
if (n == MAXFLEN) /* file too big, take what we can */ |
| 47 |
< |
while (!isspace(buf[--n])) |
| 48 |
< |
if (n <= 0) /* one long word! */ |
| 49 |
< |
return(-1); |
| 50 |
< |
buf[n] = '\0'; /* terminate */ |
| 51 |
< |
return(wordstring(words, buf)); /* wordstring does the rest */ |
| 67 |
> |
return(wrdcnt); |
| 68 |
|
} |
| 69 |
|
|
| 70 |
|
|
| 71 |
|
int |
| 72 |
< |
wordstring(avl, str) /* allocate and load argument list */ |
| 73 |
< |
char **avl; |
| 74 |
< |
char *str; |
| 72 |
> |
wordstring( /* allocate and load argument list */ |
| 73 |
> |
char **avl, |
| 74 |
> |
int nargs, |
| 75 |
> |
char *str |
| 76 |
> |
) |
| 77 |
|
{ |
| 78 |
< |
register char *cp, **ap; |
| 78 |
> |
char *cp, **ap; |
| 79 |
|
|
| 80 |
|
if (str == NULL) |
| 81 |
|
return(-1); |
| 83 |
|
if (cp == NULL) /* ENOMEM */ |
| 84 |
|
return(-1); |
| 85 |
|
strcpy(cp, str); |
| 86 |
< |
ap = avl; /* parse into words */ |
| 87 |
< |
for ( ; ; ) { |
| 86 |
> |
/* parse into words */ |
| 87 |
> |
for (ap = avl; ap-avl < nargs-1; ap++) { |
| 88 |
|
while (isspace(*cp)) /* nullify spaces */ |
| 89 |
|
*cp++ = '\0'; |
| 90 |
|
if (!*cp) /* all done? */ |
| 91 |
|
break; |
| 92 |
< |
*ap++ = cp; /* add argument to list */ |
| 92 |
> |
*ap = cp; /* add argument to list */ |
| 93 |
|
while (*++cp && !isspace(*cp)) |
| 94 |
|
; |
| 95 |
|
} |
| 96 |
+ |
*cp = '\0'; /* terminates overflow */ |
| 97 |
|
*ap = NULL; |
| 98 |
|
return(ap - avl); |
| 99 |
|
} |
