ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/fgetword.c

Comparing ray/src/common/fgetword.c (file contents):
Revision 1.2 by greg, Mon Jul 22 14:33:06 1991 UTC vs.
Revision 2.6 by greg, Wed Oct 12 03:37:54 2005 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1991 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		* Read white space separated words from stream
6	+	*
7	+	*  External symbols declared in rtio.h
8		*/
9
10	<	#include  <stdio.h>
10	>	#include "copyright.h"
11
12	+	#include  "rtio.h"
13	+
14		#include  <ctype.h>
15
16
17		char *
18	<	fgetword(s, n, fp)              /* get a word, maximum n-1 characters */
19	<	char  *s;
20	<	int  n;
21	<	register FILE  *fp;
18	>	fgetword(                       /* get (quoted) word up to n-1 characters */
19	>	char  *s,
20	>	int  n,
21	>	register FILE  *fp
22	>	)
23		{
24	+	int  quote = '\0';
25		register char  *cp;
26		register int  c;
27	+	/* sanity checks */
28	+	if ((s == NULL) | (n <= 0))
29	+	return(NULL);
30		/* skip initial white space */
31		do
32		c = getc(fp);
33		while (isspace(c));
34	+	/* check for quote */
35	+	if ((c == '"') | (c == '\'')) {
36	+	quote = c;
37	+	c = getc(fp);
38	+	}
39		/* check for end of file */
40		if (c == EOF)
41		return(NULL);
42		/* get actual word */
43		cp = s;
44		do {
45	<	if (--n <= 0)                   /* check length limit */
45	>	if (--n <= 0)           /* check length limit */
46		break;
47		*cp++ = c;
48		c = getc(fp);
49	<	} while (c != EOF && !isspace(c));
49	>	} while (c != EOF && !(quote ? c==quote : isspace(c)));
50		*cp = '\0';
51	<	if (c != EOF)                   /* replace delimiter */
51	>	if ((c != EOF) & (!quote))      /* replace space */
52		ungetc(c, fp);
53		return(s);
54		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)