annotate lib/readtokens.c @ 12421:e8d2c6fc33ad

Use spaces for indentation, not tabs.
author Bruno Haible <bruno@clisp.org>
date Thu, 10 Dec 2009 20:28:30 +0100
parents 5442b2430859
children b5e42ef33b49
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
1 /* readtokens.c -- Functions for reading tokens from an input stream.
7302
8a1a9361108c * _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents: 5848
diff changeset
2
11395
5442b2430859 avoid gcc warnings about unused macro definitions
Jim Meyering <meyering@redhat.com>
parents: 9309
diff changeset
3 Copyright (C) 1990-1991, 1999-2004, 2006, 2009 Free Software Foundation, Inc.
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
4
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
5 This program is free software: you can redistribute it and/or modify
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
6 it under the terms of the GNU General Public License as published by
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
7 the Free Software Foundation; either version 3 of the License, or
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
8 (at your option) any later version.
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
9
Jim Meyering <jim@meyering.net>
parents:
diff changeset
10 This program is distributed in the hope that it will be useful,
Jim Meyering <jim@meyering.net>
parents:
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
Jim Meyering <jim@meyering.net>
parents:
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Jim Meyering <jim@meyering.net>
parents:
diff changeset
13 GNU General Public License for more details.
Jim Meyering <jim@meyering.net>
parents:
diff changeset
14
Jim Meyering <jim@meyering.net>
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
9309
bbbbbf4cd1c5 Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents: 7302
diff changeset
16 along with this program. If not, see <http://www.gnu.org/licenses/>.
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
17
Jim Meyering <jim@meyering.net>
parents:
diff changeset
18 Written by Jim Meyering. */
Jim Meyering <jim@meyering.net>
parents:
diff changeset
19
Jim Meyering <jim@meyering.net>
parents:
diff changeset
20 /* This almost supercedes xreadline stuff -- using delim="\n"
Jim Meyering <jim@meyering.net>
parents:
diff changeset
21 gives the same functionality, except that these functions
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
22 would never return empty lines. */
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
23
7302
8a1a9361108c * _fpending.c: Include <config.h> unconditionally, since we no
Paul Eggert <eggert@cs.ucla.edu>
parents: 5848
diff changeset
24 #include <config.h>
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
25
4672
55a4d3c67ca7 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4376
diff changeset
26 #include "readtokens.h"
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
27
4672
55a4d3c67ca7 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4376
diff changeset
28 #include <stdio.h>
55a4d3c67ca7 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4376
diff changeset
29 #include <stdlib.h>
55a4d3c67ca7 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4376
diff changeset
30 #include <string.h>
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
31 #include <stdbool.h>
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
32
3622
7f1ff9bec452 Remove explicit declarations of xmalloc and xrealloc,
Jim Meyering <jim@meyering.net>
parents: 3618
diff changeset
33 #include "xalloc.h"
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
34
5318
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
35 #if USE_UNLOCKED_IO
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
36 # include "unlocked-io.h"
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
37 #endif
7c24a825b51d Remove dependencies on unlocked-io.
Paul Eggert <eggert@cs.ucla.edu>
parents: 5159
diff changeset
38
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
39 /* Initialize a tokenbuffer. */
Jim Meyering <jim@meyering.net>
parents:
diff changeset
40
Jim Meyering <jim@meyering.net>
parents:
diff changeset
41 void
4672
55a4d3c67ca7 Remove K&R cruft.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4376
diff changeset
42 init_tokenbuffer (token_buffer *tokenbuffer)
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
43 {
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
44 tokenbuffer->size = 0;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
45 tokenbuffer->buffer = NULL;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
46 }
Jim Meyering <jim@meyering.net>
parents:
diff changeset
47
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
48 /* Read a token from STREAM into TOKENBUFFER.
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
49 A token is delimited by any of the N_DELIM bytes in DELIM.
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
50 Upon return, the token is in tokenbuffer->buffer and
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
51 has a trailing '\0' instead of any original delimiter.
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
52 The function value is the length of the token not including
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
53 the final '\0'. Upon EOF (i.e. on the call after the last
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
54 token is read) or error, return -1 without modifying tokenbuffer.
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
55 The EOF and error conditions may be distinguished in the caller
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
56 by testing ferror (STREAM).
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
57
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
58 This function works properly on lines containing NUL bytes
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
59 and on files do not end with a delimiter. */
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
60
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
61 size_t
1778
c30d7ad98237 (readtoken, readtokens): Protoize.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
62 readtoken (FILE *stream,
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
63 const char *delim,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
64 size_t n_delim,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
65 token_buffer *tokenbuffer)
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
66 {
Jim Meyering <jim@meyering.net>
parents:
diff changeset
67 char *p;
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
68 int c;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
69 size_t i, n;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
70 static const char *saved_delim = NULL;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
71 static char isdelim[256];
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
72 bool same_delimiters;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
73
Jim Meyering <jim@meyering.net>
parents:
diff changeset
74 if (delim == NULL && saved_delim == NULL)
Jim Meyering <jim@meyering.net>
parents:
diff changeset
75 abort ();
Jim Meyering <jim@meyering.net>
parents:
diff changeset
76
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
77 same_delimiters = false;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
78 if (delim != saved_delim && saved_delim != NULL)
Jim Meyering <jim@meyering.net>
parents:
diff changeset
79 {
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
80 same_delimiters = true;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
81 for (i = 0; i < n_delim; i++)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
82 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
83 if (delim[i] != saved_delim[i])
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
84 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
85 same_delimiters = false;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
86 break;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
87 }
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
88 }
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
89 }
Jim Meyering <jim@meyering.net>
parents:
diff changeset
90
Jim Meyering <jim@meyering.net>
parents:
diff changeset
91 if (!same_delimiters)
Jim Meyering <jim@meyering.net>
parents:
diff changeset
92 {
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
93 size_t j;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
94 saved_delim = delim;
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
95 memset (isdelim, 0, sizeof isdelim);
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
96 for (j = 0; j < n_delim; j++)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
97 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
98 unsigned char ch = delim[j];
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
99 isdelim[ch] = 1;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
100 }
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
101 }
Jim Meyering <jim@meyering.net>
parents:
diff changeset
102
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
103 /* FIXME: don't fool with this caching. Use strchr instead. */
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
104 /* skip over any leading delimiters */
Jim Meyering <jim@meyering.net>
parents:
diff changeset
105 for (c = getc (stream); c >= 0 && isdelim[c]; c = getc (stream))
Jim Meyering <jim@meyering.net>
parents:
diff changeset
106 {
Jim Meyering <jim@meyering.net>
parents:
diff changeset
107 /* empty */
Jim Meyering <jim@meyering.net>
parents:
diff changeset
108 }
Jim Meyering <jim@meyering.net>
parents:
diff changeset
109
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
110 p = tokenbuffer->buffer;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
111 n = tokenbuffer->size;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
112 i = 0;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
113 for (;;)
Jim Meyering <jim@meyering.net>
parents:
diff changeset
114 {
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
115 if (c < 0 && i == 0)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
116 return -1;
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
117
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
118 if (i == n)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
119 p = x2nrealloc (p, &n, sizeof *p);
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
120
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
121 if (c < 0)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
122 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
123 p[i] = 0;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
124 break;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
125 }
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
126 if (isdelim[c])
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
127 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
128 p[i] = 0;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
129 break;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
130 }
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
131 p[i++] = c;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
132 c = getc (stream);
Jim Meyering <jim@meyering.net>
parents:
diff changeset
133 }
Jim Meyering <jim@meyering.net>
parents:
diff changeset
134
Jim Meyering <jim@meyering.net>
parents:
diff changeset
135 tokenbuffer->buffer = p;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
136 tokenbuffer->size = n;
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
137 return i;
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
138 }
Jim Meyering <jim@meyering.net>
parents:
diff changeset
139
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
140 /* Build a NULL-terminated array of pointers to tokens
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
141 read from STREAM. Return the number of tokens read.
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
142 All storage is obtained through calls to xmalloc-like functions.
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
143
Jim Meyering <jim@meyering.net>
parents:
diff changeset
144 %%% Question: is it worth it to do a single
Jim Meyering <jim@meyering.net>
parents:
diff changeset
145 %%% realloc() of `tokens' just before returning? */
Jim Meyering <jim@meyering.net>
parents:
diff changeset
146
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
147 size_t
1778
c30d7ad98237 (readtoken, readtokens): Protoize.
Jim Meyering <jim@meyering.net>
parents: 653
diff changeset
148 readtokens (FILE *stream,
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
149 size_t projected_n_tokens,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
150 const char *delim,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
151 size_t n_delim,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
152 char ***tokens_out,
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
153 size_t **token_lengths)
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
154 {
Jim Meyering <jim@meyering.net>
parents:
diff changeset
155 token_buffer tb, *token = &tb;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
156 char **tokens;
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
157 size_t *lengths;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
158 size_t sz;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
159 size_t n_tokens;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
160
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
161 if (projected_n_tokens == 0)
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
162 projected_n_tokens = 64;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
163 else
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
164 projected_n_tokens++; /* add one for trailing NULL pointer */
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
165
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
166 sz = projected_n_tokens;
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
167 tokens = xnmalloc (sz, sizeof *tokens);
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
168 lengths = xnmalloc (sz, sizeof *lengths);
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
169
Jim Meyering <jim@meyering.net>
parents:
diff changeset
170 n_tokens = 0;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
171 init_tokenbuffer (token);
Jim Meyering <jim@meyering.net>
parents:
diff changeset
172 for (;;)
Jim Meyering <jim@meyering.net>
parents:
diff changeset
173 {
Jim Meyering <jim@meyering.net>
parents:
diff changeset
174 char *tmp;
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
175 size_t token_length = readtoken (stream, delim, n_delim, token);
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
176 if (n_tokens >= sz)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
177 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
178 tokens = x2nrealloc (tokens, &sz, sizeof *tokens);
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
179 lengths = xnrealloc (lengths, sz, sizeof *lengths);
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
180 }
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
181
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
182 if (token_length == (size_t) -1)
12421
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
183 {
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
184 /* don't increment n_tokens for NULL entry */
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
185 tokens[n_tokens] = NULL;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
186 lengths[n_tokens] = 0;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
187 break;
e8d2c6fc33ad Use spaces for indentation, not tabs.
Bruno Haible <bruno@clisp.org>
parents: 11395
diff changeset
188 }
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
189 tmp = xnmalloc (token_length + 1, sizeof *tmp);
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
190 lengths[n_tokens] = token_length;
4995
2e6bc7ec4f44 Merge from coreutils.
Paul Eggert <eggert@cs.ucla.edu>
parents: 4672
diff changeset
191 tokens[n_tokens] = memcpy (tmp, token->buffer, token_length + 1);
375
Jim Meyering <jim@meyering.net>
parents:
diff changeset
192 n_tokens++;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
193 }
Jim Meyering <jim@meyering.net>
parents:
diff changeset
194
Jim Meyering <jim@meyering.net>
parents:
diff changeset
195 free (token->buffer);
Jim Meyering <jim@meyering.net>
parents:
diff changeset
196 *tokens_out = tokens;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
197 if (token_lengths != NULL)
Jim Meyering <jim@meyering.net>
parents:
diff changeset
198 *token_lengths = lengths;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
199 return n_tokens;
Jim Meyering <jim@meyering.net>
parents:
diff changeset
200 }