src/common/wordfile.c

#ifndef lint
static const char       RCSid[] = "$Id: wordfile.c,v 2.19 2016/03/23 18:17:46 greg Exp $";
#endif
/*
 * Load whitespace separated words from a file into an array.
 *
 * External symbols declared in rtio.h
 */

#include "copyright.h"

#include <ctype.h>
#include <string.h>

#include "platform.h"
#include "rtio.h"
#include "rtmisc.h"


#define MAXWLEN         4096    /* words must be shorter than this */


int
wordfile(                       /* get words from fname, put in words */
        char    **words,
        int     nargs,
        char    *fname
)
{
        int     wrdcnt = 0;
        int     n = 0;
        int     fd;
        char    buf[MAXWLEN];
                                        /* load file into buffer */
        if (fname == NULL || !*fname)
                return(-1);                     /* no filename */
        if (nargs <= 1)
                return(-1);
        if ((fd = open(fname, 0)) < 0)
                return(-1);                     /* open error */
        words[0] = NULL;
        while (nargs > 1 && (n += read(fd, buf+n, MAXWLEN-n)) > 0) {
                int     crem = 0;
                if (n > MAXWLEN/2)              /* check for mid-word end */
                        while (!isspace(buf[--n])) {
                                if (n <= 0)     /* one long word! */
                                        goto done;
                                ++crem;
                        }
                buf[n] = '\0';                  /* terminate & parse */
                n = wordstring(words, nargs, buf);
                if (n < 0) {
                        wrdcnt = -1;            /* memory error */
                        break;
                }
                words += n; nargs -= n;
                wrdcnt += n;
                if ((n = crem) > 0)             /* move remainder */
                        memmove(buf, buf+MAXWLEN-crem, crem);
        }
done:
        close(fd);
        return(wrdcnt);
}


int
wordstring(                             /* allocate and load argument list */
        char    **avl,
        int     nargs,
        char    *str
)
{
        char    *cp, **ap;
        
        if (str == NULL)
                return(-1);
        cp = bmalloc(strlen(str)+1);
        if (cp == NULL)                 /* ENOMEM */
                return(-1);
        strcpy(cp, str);
                                        /* parse into words */
        for (ap = avl; ap-avl < nargs-1; ap++) {
                while (isspace(*cp))    /* nullify spaces */
                        *cp++ = '\0';
                if (!*cp)               /* all done? */
                        break;
                *ap = cp;               /* add argument to list */
                while (*++cp && !isspace(*cp))
                        ;
        }
        *cp = '\0';                     /* terminates overflow */
        *ap = NULL;
        return(ap - avl);
}
Revision:	2.20
Committed:	Wed Apr 27 17:26:45 2016 UTC (9 years, 6 months ago) by greg
Content type:	text/plain
Branch:	MAIN
Changes since 2.19:	+2 -2 lines
Log Message:	Fixing bug introduced due to Windows read() misbehavior
#	User	Rev	Content
1	greg	2.1	#ifndef lint
2	greg	2.20	static const char RCSid[] = "$Id: wordfile.c,v 2.19 2016/03/23 18:17:46 greg Exp $";
3	greg	2.1	#endif
4			/*
5			* Load whitespace separated words from a file into an array.
6	greg	2.8	*
7	greg	2.19	* External symbols declared in rtio.h
8	greg	2.8	*/
9
10	greg	2.9	#include "copyright.h"
11	greg	2.1
12	greg	2.2	#include <ctype.h>
13	schorsch	2.10	#include <string.h>
14
15	greg	2.12	#include "platform.h"
16	greg	2.19	#include "rtio.h"
17			#include "rtmisc.h"
18	greg	2.2
19	greg	2.1
20	greg	2.17	#define MAXWLEN 4096 /* words must be shorter than this */
21	greg	2.1
22
23			int
24	greg	2.16	wordfile( /* get words from fname, put in words */
25			char **words,
26			int nargs,
27			char *fname
28			)
29	greg	2.1	{
30	greg	2.17	int wrdcnt = 0;
31			int n = 0;
32	greg	2.1	int fd;
33	greg	2.17	char buf[MAXWLEN];
34	greg	2.3	/* load file into buffer */
35	greg	2.17	if (fname == NULL \|\| !*fname)
36	greg	2.7	return(-1); /* no filename */
37	greg	2.17	if (nargs <= 1)
38			return(-1);
39	greg	2.1	if ((fd = open(fname, 0)) < 0)
40	greg	2.3	return(-1); /* open error */
41	greg	2.17	words[0] = NULL;
42			while (nargs > 1 && (n += read(fd, buf+n, MAXWLEN-n)) > 0) {
43			int crem = 0;
44	greg	2.20	if (n > MAXWLEN/2) /* check for mid-word end */
45	greg	2.17	while (!isspace(buf[--n])) {
46			if (n <= 0) /* one long word! */
47			goto done;
48			++crem;
49			}
50			buf[n] = '\0'; /* terminate & parse */
51			n = wordstring(words, nargs, buf);
52			if (n < 0) {
53			wrdcnt = -1; /* memory error */
54			break;
55			}
56	greg	2.18	words += n; nargs -= n;
57	greg	2.17	wrdcnt += n;
58			if ((n = crem) > 0) /* move remainder */
59	greg	2.18	memmove(buf, buf+MAXWLEN-crem, crem);
60	greg	2.17	}
61			done:
62	greg	2.1	close(fd);
63	greg	2.17	return(wrdcnt);
64	greg	2.3	}
65
66
67			int
68	greg	2.16	wordstring( /* allocate and load argument list */
69			char **avl,
70			int nargs,
71			char *str
72			)
73	greg	2.3	{
74	greg	2.16	char cp, *ap;
75	greg	2.3
76			if (str == NULL)
77			return(-1);
78			cp = bmalloc(strlen(str)+1);
79			if (cp == NULL) /* ENOMEM */
80			return(-1);
81			strcpy(cp, str);
82	greg	2.16	/* parse into words */
83			for (ap = avl; ap-avl < nargs-1; ap++) {
84	greg	2.4	while (isspace(cp)) / nullify spaces */
85			*cp++ = '\0';
86			if (!cp) / all done? */
87			break;
88	greg	2.16	ap = cp; / add argument to list */
89	greg	2.6	while (++cp && !isspace(cp))
90			;
91	greg	2.1	}
92	greg	2.17	cp = '\0'; / terminates overflow */
93	greg	2.3	*ap = NULL;
94			return(ap - avl);
95	greg	2.1	}