X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fstr.c;h=f054c9ef28833046760957f2de9aabc7da6ec8dc;hb=97e2b765b9b3cb25c85c5a6b0727d66e481411b1;hp=ca23b08b7290c93ddc8138ff5810dbc0f9317f0f;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/libpspp/str.c b/src/libpspp/str.c
index ca23b08b72..f054c9ef28 100644
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -1,35 +1,33 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include "str.h"
#include
-#include
+#include
+#include
#include
-#include
#include
#include
#include "minmax.h"
-#include "size_max.h"
+#include "xalloc.h"
#include "xsize.h"
/* Reverses the order of NBYTES bytes at address P, thus converting
@@ -70,12 +68,12 @@ buf_compare_case (const char *a_, const char *b_, size_t size)
const unsigned char *a = (unsigned char *) a_;
const unsigned char *b = (unsigned char *) b_;
- while (size-- > 0)
+ while (size-- > 0)
{
unsigned char ac = toupper (*a++);
unsigned char bc = toupper (*b++);
- if (ac != bc)
+ if (ac != bc)
return ac > bc ? 1 : -1;
}
@@ -95,17 +93,17 @@ buf_compare_rpad (const char *a, size_t a_len, const char *b, size_t b_len)
result = memcmp (a, b, min_len);
if (result != 0)
return result;
- else
+ else
{
size_t idx;
-
- if (a_len < b_len)
+
+ if (a_len < b_len)
{
for (idx = min_len; idx < b_len; idx++)
if (' ' != b[idx])
return ' ' > b[idx] ? 1 : -1;
}
- else
+ else
{
for (idx = min_len; idx < a_len; idx++)
if (a[idx] != ' ')
@@ -196,27 +194,30 @@ buf_copy_rpad (char *dst, size_t dst_size,
void
str_copy_rpad (char *dst, size_t dst_size, const char *src)
{
- size_t src_len = strlen (src);
- if (src_len < dst_size - 1)
+ if (dst_size > 0)
{
- memcpy (dst, src, src_len);
- memset (&dst[src_len], ' ', dst_size - 1 - src_len);
+ size_t src_len = strlen (src);
+ if (src_len < dst_size - 1)
+ {
+ memcpy (dst, src, src_len);
+ memset (&dst[src_len], ' ', dst_size - 1 - src_len);
+ }
+ else
+ memcpy (dst, src, dst_size - 1);
+ dst[dst_size - 1] = 0;
}
- else
- memcpy (dst, src, dst_size - 1);
- dst[dst_size - 1] = 0;
}
/* Copies SRC to DST, which is in a buffer DST_SIZE bytes long.
Truncates DST to DST_SIZE - 1 characters, if necessary. */
void
-str_copy_trunc (char *dst, size_t dst_size, const char *src)
+str_copy_trunc (char *dst, size_t dst_size, const char *src)
{
size_t src_len = strlen (src);
assert (dst_size > 0);
if (src_len + 1 < dst_size)
memcpy (dst, src, src_len + 1);
- else
+ else
{
memcpy (dst, src, dst_size - 1);
dst[dst_size - 1] = '\0';
@@ -228,7 +229,7 @@ str_copy_trunc (char *dst, size_t dst_size, const char *src)
Truncates DST to DST_SIZE - 1 characters, if necessary. */
void
str_copy_buf_trunc (char *dst, size_t dst_size,
- const char *src, size_t src_size)
+ const char *src, size_t src_size)
{
size_t dst_len;
assert (dst_size > 0);
@@ -240,7 +241,7 @@ str_copy_buf_trunc (char *dst, size_t dst_size,
/* Converts each character in S to uppercase. */
void
-str_uppercase (char *s)
+str_uppercase (char *s)
{
for (; *s != '\0'; s++)
*s = toupper ((unsigned char) *s);
@@ -248,16 +249,51 @@ str_uppercase (char *s)
/* Converts each character in S to lowercase. */
void
-str_lowercase (char *s)
+str_lowercase (char *s)
{
for (; *s != '\0'; s++)
*s = tolower ((unsigned char) *s);
}
+/* Converts NUMBER into a string in 26-adic notation in BUFFER,
+ which has room for SIZE bytes. Returns true if successful,
+ false if NUMBER, plus a trailing null, is too large to fit in
+ the available space.
+
+ 26-adic notation is "spreadsheet column numbering": 1 = A, 2 =
+ B, 3 = C, ... 26 = Z, 27 = AA, 28 = AB, 29 = AC, ...
+
+ 26-adic notation is the special case of a k-adic numeration
+ system (aka bijective base-k numeration) with k=26. In k-adic
+ numeration, the digits are {1, 2, 3, ..., k} (there is no
+ digit 0), and integer 0 is represented by the empty string.
+ For more information, see
+ http://en.wikipedia.org/wiki/Bijective_numeration. */
+bool
+str_format_26adic (unsigned long int number, char buffer[], size_t size)
+{
+ size_t length = 0;
+
+ while (number-- > 0)
+ {
+ if (length >= size)
+ return false;
+ buffer[length++] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[number % 26];
+ number /= 26;
+ }
+
+ if (length >= size)
+ return false;
+ buffer[length] = '\0';
+
+ buf_reverse (buffer, length);
+ return true;
+}
+
/* Formats FORMAT into DST, as with sprintf(), and returns the
address of the terminating null written to DST. */
char *
-spprintf (char *dst, const char *format, ...)
+spprintf (char *dst, const char *format, ...)
{
va_list args;
int count;
@@ -272,7 +308,7 @@ spprintf (char *dst, const char *format, ...)
/* Sets the SIZE bytes starting at BLOCK to C,
and returns the byte following BLOCK. */
void *
-mempset (void *block, int c, size_t size)
+mempset (void *block, int c, size_t size)
{
memset (block, c, size);
return (char *) block + size;
@@ -282,7 +318,7 @@ mempset (void *block, int c, size_t size)
/* Returns an empty substring. */
struct substring
-ss_empty (void)
+ss_empty (void)
{
struct substring ss;
ss.string = NULL;
@@ -293,15 +329,15 @@ ss_empty (void)
/* Returns a substring whose contents are the given C-style
string CSTR. */
struct substring
-ss_cstr (const char *cstr)
+ss_cstr (const char *cstr)
{
return ss_buffer (cstr, strlen (cstr));
}
/* Returns a substring whose contents are the CNT characters in
- BUFFER. */
+ BUFFER. */
struct substring
-ss_buffer (const char *buffer, size_t cnt)
+ss_buffer (const char *buffer, size_t cnt)
{
struct substring ss;
ss.string = (char *) buffer;
@@ -316,14 +352,14 @@ ss_substr (struct substring ss, size_t start, size_t cnt)
{
if (start < ss.length)
return ss_buffer (ss.string + start, MIN (cnt, ss.length - start));
- else
+ else
return ss_buffer (ss.string + ss.length, 0);
}
/* Returns a substring whose contents are the first CNT
characters in SS. */
struct substring
-ss_head (struct substring ss, size_t cnt)
+ss_head (struct substring ss, size_t cnt)
{
return ss_buffer (ss.string, MIN (cnt, ss.length));
}
@@ -331,7 +367,7 @@ ss_head (struct substring ss, size_t cnt)
/* Returns a substring whose contents are the last CNT characters
in SS. */
struct substring
-ss_tail (struct substring ss, size_t cnt)
+ss_tail (struct substring ss, size_t cnt)
{
if (cnt < ss.length)
return ss_buffer (ss.string + (ss.length - cnt), cnt);
@@ -342,7 +378,7 @@ ss_tail (struct substring ss, size_t cnt)
/* Makes a malloc()'d copy of the contents of OLD
and stores it in NEW. */
void
-ss_alloc_substring (struct substring *new, struct substring old)
+ss_alloc_substring (struct substring *new, struct substring old)
{
new->string = xmalloc (old.length);
new->length = old.length;
@@ -351,7 +387,7 @@ ss_alloc_substring (struct substring *new, struct substring old)
/* Allocates room for a CNT-character string in NEW. */
void
-ss_alloc_uninit (struct substring *new, size_t cnt)
+ss_alloc_uninit (struct substring *new, size_t cnt)
{
new->string = xmalloc (cnt);
new->length = cnt;
@@ -361,7 +397,7 @@ ss_alloc_uninit (struct substring *new, size_t cnt)
in POOL, and stores it in NEW. */
void
ss_alloc_substring_pool (struct substring *new, struct substring old,
- struct pool *pool)
+ struct pool *pool)
{
new->string = pool_alloc_unaligned (pool, old.length);
new->length = old.length;
@@ -370,7 +406,7 @@ ss_alloc_substring_pool (struct substring *new, struct substring old,
/* Allocates room for a CNT-character string in NEW in POOL. */
void
-ss_alloc_uninit_pool (struct substring *new, size_t cnt, struct pool *pool)
+ss_alloc_uninit_pool (struct substring *new, size_t cnt, struct pool *pool)
{
new->string = pool_alloc_unaligned (pool, cnt);
new->length = cnt;
@@ -378,14 +414,14 @@ ss_alloc_uninit_pool (struct substring *new, size_t cnt, struct pool *pool)
/* Frees the string that SS points to. */
void
-ss_dealloc (struct substring *ss)
+ss_dealloc (struct substring *ss)
{
free (ss->string);
}
/* Truncates SS to at most CNT characters in length. */
void
-ss_truncate (struct substring *ss, size_t cnt)
+ss_truncate (struct substring *ss, size_t cnt)
{
if (ss->length > cnt)
ss->length = cnt;
@@ -394,16 +430,16 @@ ss_truncate (struct substring *ss, size_t cnt)
/* Removes trailing characters in TRIM_SET from SS.
Returns number of characters removed. */
size_t
-ss_rtrim (struct substring *ss, struct substring trim_set)
+ss_rtrim (struct substring *ss, struct substring trim_set)
{
size_t cnt = 0;
while (cnt < ss->length
&& ss_find_char (trim_set,
- ss->string[ss->length - cnt - 1]) != SIZE_MAX)
+ ss->string[ss->length - cnt - 1]) != SIZE_MAX)
cnt++;
ss->length -= cnt;
return cnt;
-}
+}
/* Removes leading characters in TRIM_SET from SS.
Returns number of characters removed. */
@@ -417,7 +453,7 @@ ss_ltrim (struct substring *ss, struct substring trim_set)
/* Trims leading and trailing characters in TRIM_SET from SS. */
void
-ss_trim (struct substring *ss, struct substring trim_set)
+ss_trim (struct substring *ss, struct substring trim_set)
{
ss_ltrim (ss, trim_set);
ss_rtrim (ss, trim_set);
@@ -426,7 +462,7 @@ ss_trim (struct substring *ss, struct substring trim_set)
/* If the last character in SS is C, removes it and returns true.
Otherwise, returns false without changing the string. */
bool
-ss_chomp (struct substring *ss, char c)
+ss_chomp (struct substring *ss, char c)
{
if (ss_last (*ss) == c)
{
@@ -451,7 +487,7 @@ ss_chomp (struct substring *ss, char c)
empty string contains a single token. */
bool
ss_separate (struct substring ss, struct substring delimiters,
- size_t *save_idx, struct substring *token)
+ size_t *save_idx, struct substring *token)
{
if (*save_idx <= ss_length (ss))
{
@@ -461,10 +497,10 @@ ss_separate (struct substring ss, struct substring delimiters,
*save_idx += length + 1;
return true;
}
- else
+ else
{
*token = ss_empty ();
- return false;
+ return false;
}
}
@@ -490,7 +526,7 @@ ss_tokenize (struct substring ss, struct substring delimiters,
/* Removes the first CNT characters from SS. */
void
-ss_advance (struct substring *ss, size_t cnt)
+ss_advance (struct substring *ss, size_t cnt)
{
if (cnt > ss->length)
cnt = ss->length;
@@ -501,7 +537,7 @@ ss_advance (struct substring *ss, size_t cnt)
/* If the first character in SS is C, removes it and returns true.
Otherwise, returns false without changing the string. */
bool
-ss_match_char (struct substring *ss, char c)
+ss_match_char (struct substring *ss, char c)
{
if (ss_first (*ss) == c)
{
@@ -513,6 +549,23 @@ ss_match_char (struct substring *ss, char c)
return false;
}
+/* If the first character in SS is in MATCH, removes it and
+ returns the character that was removed.
+ Otherwise, returns EOF without changing the string. */
+int
+ss_match_char_in (struct substring *ss, struct substring match)
+{
+ int c = EOF;
+ if (ss->length > 0
+ && memchr (match.string, ss->string[0], match.length) != NULL)
+ {
+ c = ss->string[0];
+ ss->string++;
+ ss->length--;
+ }
+ return c;
+}
+
/* If SS begins with TARGET, removes it and returns true.
Otherwise, returns false without changing SS. */
bool
@@ -531,10 +584,10 @@ ss_match_string (struct substring *ss, const struct substring target)
/* Removes the first character from SS and returns it.
If SS is empty, returns EOF without modifying SS. */
int
-ss_get_char (struct substring *ss)
+ss_get_char (struct substring *ss)
{
int c = ss_first (*ss);
- if (c != EOF)
+ if (c != EOF)
{
ss->string++;
ss->length--;
@@ -557,7 +610,7 @@ ss_get_until (struct substring *ss, char delimiter, struct substring *out)
is shorter than CNT characters). Trims the same characters
from the beginning of SS. Returns CNT. */
size_t
-ss_get_chars (struct substring *ss, size_t cnt, struct substring *out)
+ss_get_chars (struct substring *ss, size_t cnt, struct substring *out)
{
*out = ss_head (*ss, cnt);
ss_advance (ss, cnt);
@@ -569,14 +622,14 @@ ss_get_chars (struct substring *ss, size_t cnt, struct substring *out)
otherwise the number of characters removed from SS. Stores
the integer's value into *VALUE. */
size_t
-ss_get_long (struct substring *ss, long *value)
+ss_get_long (struct substring *ss, long *value)
{
char tmp[64];
size_t length;
length = ss_span (*ss, ss_cstr ("+-"));
length += ss_span (ss_substr (*ss, length, SIZE_MAX), ss_cstr (CC_DIGITS));
- if (length > 0 && length < sizeof tmp)
+ if (length > 0 && length < sizeof tmp)
{
char *tail;
@@ -584,7 +637,7 @@ ss_get_long (struct substring *ss, long *value)
tmp[length] = '\0';
*value = strtol (tmp, &tail, 10);
- if (tail - tmp == length)
+ if (tail - tmp == length)
{
ss_advance (ss, length);
return length;
@@ -597,28 +650,28 @@ ss_get_long (struct substring *ss, long *value)
/* Returns true if SS is empty (contains no characters),
false otherwise. */
bool
-ss_is_empty (struct substring ss)
+ss_is_empty (struct substring ss)
{
return ss.length == 0;
}
/* Returns the number of characters in SS. */
size_t
-ss_length (struct substring ss)
+ss_length (struct substring ss)
{
return ss.length;
}
/* Returns a pointer to the characters in SS. */
char *
-ss_data (struct substring ss)
+ss_data (struct substring ss)
{
return ss.string;
}
/* Returns a pointer just past the last character in SS. */
char *
-ss_end (struct substring ss)
+ss_end (struct substring ss)
{
return ss.string + ss.length;
}
@@ -627,7 +680,7 @@ ss_end (struct substring ss)
range of unsigned char. Returns EOF if IDX is out of the
range of indexes for SS. */
int
-ss_at (struct substring ss, size_t idx)
+ss_at (struct substring ss, size_t idx)
{
return idx < ss.length ? (unsigned char) ss.string[idx] : EOF;
}
@@ -635,7 +688,7 @@ ss_at (struct substring ss, size_t idx)
/* Returns the first character in SS as a value in the range of
unsigned char. Returns EOF if SS is the empty string. */
int
-ss_first (struct substring ss)
+ss_first (struct substring ss)
{
return ss_at (ss, 0);
}
@@ -643,7 +696,7 @@ ss_first (struct substring ss)
/* Returns the last character in SS as a value in the range of
unsigned char. Returns EOF if SS is the empty string. */
int
-ss_last (struct substring ss)
+ss_last (struct substring ss)
{
return ss.length > 0 ? (unsigned char) ss.string[ss.length - 1] : EOF;
}
@@ -651,31 +704,31 @@ ss_last (struct substring ss)
/* Returns the number of contiguous characters at the beginning
of SS that are in SKIP_SET. */
size_t
-ss_span (struct substring ss, struct substring skip_set)
+ss_span (struct substring ss, struct substring skip_set)
{
size_t i;
- for (i = 0; i < ss.length; i++)
+ for (i = 0; i < ss.length; i++)
if (ss_find_char (skip_set, ss.string[i]) == SIZE_MAX)
- break;
+ break;
return i;
}
/* Returns the number of contiguous characters at the beginning
of SS that are not in SKIP_SET. */
size_t
-ss_cspan (struct substring ss, struct substring stop_set)
+ss_cspan (struct substring ss, struct substring stop_set)
{
size_t i;
- for (i = 0; i < ss.length; i++)
+ for (i = 0; i < ss.length; i++)
if (ss_find_char (stop_set, ss.string[i]) != SIZE_MAX)
- break;
+ break;
return i;
}
/* Returns the offset in SS of the first instance of C,
or SIZE_MAX if C does not occur in SS. */
size_t
-ss_find_char (struct substring ss, char c)
+ss_find_char (struct substring ss, char c)
{
const char *p = memchr (ss.string, c, ss.length);
return p != NULL ? p - ss.string : SIZE_MAX;
@@ -733,7 +786,7 @@ ss_pointer_to_position (struct substring ss, const char *p)
/* Allocates and returns a null-terminated string that contains
SS. */
char *
-ss_xstrdup (struct substring ss)
+ss_xstrdup (struct substring ss)
{
char *s = xmalloc (ss.length + 1);
memcpy (s, ss.string, ss.length);
@@ -751,7 +804,7 @@ ds_init_empty (struct string *st)
/* Initializes ST with initial contents S. */
void
-ds_init_string (struct string *st, const struct string *s)
+ds_init_string (struct string *st, const struct string *s)
{
ds_init_substring (st, ds_ss (s));
}
@@ -768,7 +821,7 @@ ds_init_substring (struct string *st, struct substring ss)
/* Initializes ST with initial contents S. */
void
-ds_init_cstr (struct string *st, const char *s)
+ds_init_cstr (struct string *st, const char *s)
{
ds_init_substring (st, ss_cstr (s));
}
@@ -777,18 +830,18 @@ ds_init_cstr (struct string *st, const char *s)
void
ds_destroy (struct string *st)
{
- if (st != NULL)
+ if (st != NULL)
{
ss_dealloc (&st->ss);
st->ss.string = NULL;
st->ss.length = 0;
- st->capacity = 0;
+ st->capacity = 0;
}
}
/* Swaps the contents of strings A and B. */
void
-ds_swap (struct string *a, struct string *b)
+ds_swap (struct string *a, struct string *b)
{
struct string tmp = *a;
*a = *b;
@@ -797,7 +850,7 @@ ds_swap (struct string *a, struct string *b)
/* Helper function for ds_register_pool. */
static void
-free_string (void *st_)
+free_string (void *st_)
{
struct string *st = st_;
ds_destroy (st);
@@ -806,7 +859,7 @@ free_string (void *st_)
/* Arranges for ST to be destroyed automatically as part of
POOL. */
void
-ds_register_pool (struct string *st, struct pool *pool)
+ds_register_pool (struct string *st, struct pool *pool)
{
pool_register (pool, free_string, st);
}
@@ -822,7 +875,7 @@ ds_unregister_pool (struct string *st, struct pool *pool)
/* Copies SRC into DST.
DST and SRC may be the same string. */
void
-ds_assign_string (struct string *dst, const struct string *src)
+ds_assign_string (struct string *dst, const struct string *src)
{
ds_assign_substring (dst, ds_ss (src));
}
@@ -854,7 +907,7 @@ ds_clear (struct string *st)
/* Returns a substring that contains ST. */
struct substring
-ds_ss (const struct string *st)
+ds_ss (const struct string *st)
{
return st->ss;
}
@@ -867,7 +920,7 @@ ds_ss (const struct string *st)
exceeds the length of ST, then the substring will only be
ds_length(ST) - START characters long. */
struct substring
-ds_substr (const struct string *st, size_t start, size_t cnt)
+ds_substr (const struct string *st, size_t start, size_t cnt)
{
return ss_substr (ds_ss (st), start, cnt);
}
@@ -876,7 +929,7 @@ ds_substr (const struct string *st, size_t start, size_t cnt)
ST. If CNT exceeds the length of ST, then the substring will
contain all of ST. */
struct substring
-ds_head (const struct string *st, size_t cnt)
+ds_head (const struct string *st, size_t cnt)
{
return ss_head (ds_ss (st), cnt);
}
@@ -926,7 +979,7 @@ ds_truncate (struct string *st, size_t length)
/* Removes trailing characters in TRIM_SET from ST.
Returns number of characters removed. */
size_t
-ds_rtrim (struct string *st, struct substring trim_set)
+ds_rtrim (struct string *st, struct substring trim_set)
{
return ss_rtrim (&st->ss, trim_set);
}
@@ -934,7 +987,7 @@ ds_rtrim (struct string *st, struct substring trim_set)
/* Removes leading characters in TRIM_SET from ST.
Returns number of characters removed. */
size_t
-ds_ltrim (struct string *st, struct substring trim_set)
+ds_ltrim (struct string *st, struct substring trim_set)
{
size_t cnt = ds_span (st, trim_set);
if (cnt > 0)
@@ -945,7 +998,7 @@ ds_ltrim (struct string *st, struct substring trim_set)
/* Trims leading and trailing characters in TRIM_SET from ST.
Returns number of charactesr removed. */
size_t
-ds_trim (struct string *st, struct substring trim_set)
+ds_trim (struct string *st, struct substring trim_set)
{
size_t cnt = ds_rtrim (st, trim_set);
return cnt + ds_ltrim (st, trim_set);
@@ -954,7 +1007,7 @@ ds_trim (struct string *st, struct substring trim_set)
/* If the last character in ST is C, removes it and returns true.
Otherwise, returns false without modifying ST. */
bool
-ds_chomp (struct string *st, char c)
+ds_chomp (struct string *st, char c)
{
return ss_chomp (&st->ss, c);
}
@@ -997,7 +1050,7 @@ ds_tokenize (const struct string *st, struct substring delimiters,
LENGTH characters in size. If ST is initially LENGTH
characters or longer, this is a no-op. */
void
-ds_rpad (struct string *st, size_t length, char pad)
+ds_rpad (struct string *st, size_t length, char pad)
{
if (length > st->ss.length)
ds_put_char_multiple (st, pad, length - st->ss.length);
@@ -1017,7 +1070,7 @@ ds_set_length (struct string *st, size_t new_length, char pad)
/* Returns true if ST is empty, false otherwise. */
bool
-ds_is_empty (const struct string *st)
+ds_is_empty (const struct string *st)
{
return ss_is_empty (st->ss);
}
@@ -1049,7 +1102,7 @@ ds_end (const struct string *st)
range of unsigned char. Returns EOF if IDX is out of the
range of indexes for ST. */
int
-ds_at (const struct string *st, size_t idx)
+ds_at (const struct string *st, size_t idx)
{
return ss_at (ds_ss (st), idx);
}
@@ -1057,7 +1110,7 @@ ds_at (const struct string *st, size_t idx)
/* Returns the first character in ST as a value in the range of
unsigned char. Returns EOF if ST is the empty string. */
int
-ds_first (const struct string *st)
+ds_first (const struct string *st)
{
return ss_first (ds_ss (st));
}
@@ -1065,7 +1118,7 @@ ds_first (const struct string *st)
/* Returns the last character in ST as a value in the range of
unsigned char. Returns EOF if ST is the empty string. */
int
-ds_last (const struct string *st)
+ds_last (const struct string *st)
{
return ss_last (ds_ss (st));
}
@@ -1114,7 +1167,7 @@ ds_pointer_to_position (const struct string *st, const char *p)
/* Allocates and returns a null-terminated string that contains
ST. */
char *
-ds_xstrdup (const struct string *st)
+ds_xstrdup (const struct string *st)
{
return ss_xstrdup (ds_ss (st));
}
@@ -1131,37 +1184,48 @@ char *
ds_cstr (const struct string *st_)
{
struct string *st = (struct string *) st_;
- if (st->ss.string == NULL)
+ if (st->ss.string == NULL)
ds_extend (st, 1);
st->ss.string[st->ss.length] = '\0';
return st->ss.string;
}
-/* Appends to ST a newline-terminated line read from STREAM.
- Newline is the last character of ST on return, unless an I/O error
- or end of file is encountered after reading some characters.
- Returns true if a line is successfully read, false if no characters at
- all were read before an I/O error or end of file was
- encountered. */
+/* Reads characters from STREAM and appends them to ST, stopping
+ after MAX_LENGTH characters, after appending a newline, or
+ after an I/O error or end of file was encountered, whichever
+ comes first. Returns true if at least one character was added
+ to ST, false if no characters were read before an I/O error or
+ end of file (or if MAX_LENGTH was 0).
+
+ This function accepts LF, CR LF, and CR sequences as new-line,
+ and translates each of them to a single '\n' new-line
+ character in ST. */
bool
-ds_read_line (struct string *st, FILE *stream)
+ds_read_line (struct string *st, FILE *stream, size_t max_length)
{
- int c;
-
- c = getc (stream);
- if (c == EOF)
- return false;
+ size_t length;
- for (;;)
+ for (length = 0; length < max_length; length++)
{
+ int c = getc (stream);
+ if (c == EOF)
+ break;
+
+ if (c == '\r')
+ {
+ c = getc (stream);
+ if (c != '\n')
+ {
+ ungetc (c, stream);
+ c = '\n';
+ }
+ }
ds_put_char (st, c);
if (c == '\n')
- return true;
-
- c = getc (stream);
- if (c == EOF)
- return true;
+ return true;
}
+
+ return length > 0;
}
/* Removes a comment introduced by `#' from ST,
@@ -1171,7 +1235,7 @@ remove_comment (struct string *st)
{
char *cp;
int quote = 0;
-
+
for (cp = ds_data (st); cp < ds_end (st); cp++)
if (quote)
{
@@ -1196,7 +1260,7 @@ remove_comment (struct string *st)
- Deletes comments introduced by `#' outside of single or double
quotes.
- - Deletes trailing white space.
+ - Deletes trailing white space.
Returns true if a line was successfully read, false on
failure. If LINE_NUMBER is non-null, then *LINE_NUMBER is
@@ -1207,22 +1271,22 @@ ds_read_config_line (struct string *st, int *line_number, FILE *stream)
ds_clear (st);
do
{
- if (!ds_read_line (st, stream))
+ if (!ds_read_line (st, stream, SIZE_MAX))
return false;
(*line_number)++;
ds_rtrim (st, ss_cstr (CC_SPACES));
}
while (ds_chomp (st, '\\'));
-
+
remove_comment (st);
return true;
}
/* Attempts to read SIZE * CNT bytes from STREAM and append them
to ST.
- Returns number of bytes actually read. */
-size_t
-ds_read_stream (struct string *st, size_t size, size_t cnt, FILE *stream)
+ Returns true if all the requested data was read, false otherwise. */
+bool
+ds_read_stream (struct string *st, size_t size, size_t cnt, FILE *stream)
{
if (size != 0)
{
@@ -1230,12 +1294,18 @@ ds_read_stream (struct string *st, size_t size, size_t cnt, FILE *stream)
if (size_in_bounds_p (xsum (ds_length (st), try_bytes)))
{
char *buffer = ds_put_uninit (st, try_bytes);
- size_t got_bytes = fread (buffer, size, cnt, stream);
+ size_t got_bytes = fread (buffer, 1, try_bytes, stream);
ds_truncate (st, ds_length (st) - (try_bytes - got_bytes));
- return got_bytes;
+ return got_bytes == try_bytes;
+ }
+ else
+ {
+ errno = ENOMEM;
+ return false;
}
}
- return 0;
+ else
+ return true;
}
/* Concatenates S onto ST. */
@@ -1293,7 +1363,7 @@ ds_put_vformat (struct string *st, const char *format, va_list args_)
vsprintf (ds_put_uninit (st, needed), format, args);
va_end (args);
}
- else
+ else
{
/* Some old libc's returned -1 when the destination string
was too short. */
@@ -1305,7 +1375,7 @@ ds_put_vformat (struct string *st, const char *format, va_list args_)
va_copy (args, args_);
needed = vsnprintf (ds_end (st), avail, format, args);
va_end (args);
- }
+ }
st->ss.length += needed;
}
}
@@ -1319,7 +1389,7 @@ ds_put_char (struct string *st, int ch)
/* Appends CNT copies of character CH to ST. */
void
-ds_put_char_multiple (struct string *st, int ch, size_t cnt)
+ds_put_char_multiple (struct string *st, int ch, size_t cnt)
{
memset (ds_put_uninit (st, cnt), ch, cnt);
}