src/string.c

Mon, 30 Dec 2019 09:52:44 +0100

author
Mike Becker <universe@uap-core.de>
date
Mon, 30 Dec 2019 09:52:44 +0100
changeset 388
871a8ffe6c9d
parent 383
db4c6b94939b
permissions
-rw-r--r--

merges closed feature/array branch

20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
103
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
3 *
259
2f5dea574a75 modules documentation
Mike Becker <universe@uap-core.de>
parents: 251
diff changeset
4 * Copyright 2017 Mike Becker, Olaf Wintermann All rights reserved.
103
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
5 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
6 * Redistribution and use in source and binary forms, with or without
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
7 * modification, are permitted provided that the following conditions are met:
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
8 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
10 * notice, this list of conditions and the following disclaimer.
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
103
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
14 * documentation and/or other materials provided with the distribution.
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
15 *
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
08018864fb91 added license and copyright notice to all files
Mike Becker <universe@uap-core.de>
parents: 100
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
251
fae240d633fc changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents: 250
diff changeset
29 #include "ucx/string.h"
fae240d633fc changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents: 250
diff changeset
30
fae240d633fc changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents: 250
diff changeset
31 #include "ucx/allocator.h"
fae240d633fc changes source directory structure in preperation for autotools rollout
Mike Becker <universe@uap-core.de>
parents: 250
diff changeset
32
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
33 #include <stdlib.h>
69
fb59270b1de3 made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents: 68
diff changeset
34 #include <string.h>
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 #include <stdarg.h>
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
36 #include <stdint.h>
189
f43bbd33fec0 sstrtrim now uses isspace()
Mike Becker <universe@uap-core.de>
parents: 185
diff changeset
37 #include <ctype.h>
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
38
361
8ee9e23adbd2 adds missing include for strncasecmp() to avoid an implicit declaration
Mike Becker <universe@uap-core.de>
parents: 319
diff changeset
39 #ifndef _WIN32
8ee9e23adbd2 adds missing include for strncasecmp() to avoid an implicit declaration
Mike Becker <universe@uap-core.de>
parents: 319
diff changeset
40 #include <strings.h> /* for strncasecmp() */
8ee9e23adbd2 adds missing include for strncasecmp() to avoid an implicit declaration
Mike Becker <universe@uap-core.de>
parents: 319
diff changeset
41 #endif /* _WIN32 */
8ee9e23adbd2 adds missing include for strncasecmp() to avoid an implicit declaration
Mike Becker <universe@uap-core.de>
parents: 319
diff changeset
42
116
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
43 sstr_t sstr(char *cstring) {
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
44 sstr_t string;
116
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
45 string.ptr = cstring;
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
46 string.length = strlen(cstring);
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
47 return string;
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
48 }
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
49
116
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
50 sstr_t sstrn(char *cstring, size_t length) {
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
51 sstr_t string;
116
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
52 string.ptr = cstring;
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
53 string.length = length;
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54 return string;
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
55 }
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56
275
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
57 scstr_t scstr(const char *cstring) {
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
58 scstr_t string;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
59 string.ptr = cstring;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
60 string.length = strlen(cstring);
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
61 return string;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
62 }
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
63
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
64 scstr_t scstrn(const char *cstring, size_t length) {
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
65 scstr_t string;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
66 string.ptr = cstring;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
67 string.length = length;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
68 return string;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
69 }
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
70
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
71
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
72 size_t scstrnlen(size_t n, ...) {
363
8175ba2b3bcb fixes hard to use documentation in string.h
Mike Becker <universe@uap-core.de>
parents: 361
diff changeset
73 if (n == 0) return 0;
8175ba2b3bcb fixes hard to use documentation in string.h
Mike Becker <universe@uap-core.de>
parents: 361
diff changeset
74
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
75 va_list ap;
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
76 va_start(ap, n);
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
77
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
78 size_t size = 0;
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
79
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
80 for (size_t i = 0 ; i < n ; i++) {
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
81 scstr_t str = va_arg(ap, scstr_t);
317
ebae0e434898 overflow of sstrnlen should return SIZE_MAX instead of zero
Mike Becker <universe@uap-core.de>
parents: 316
diff changeset
82 if(SIZE_MAX - str.length < size) {
ebae0e434898 overflow of sstrnlen should return SIZE_MAX instead of zero
Mike Becker <universe@uap-core.de>
parents: 316
diff changeset
83 size = SIZE_MAX;
272
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
84 break;
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
85 }
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
86 size += str.length;
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
87 }
24
e04822101291 changed make clean + added dlist_clone with copy test + added va_end statements to string.c
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
88 va_end(ap);
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
89
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
90 return size;
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
91 }
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
92
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
93 static sstr_t sstrvcat_a(
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
94 UcxAllocator *a,
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
95 size_t count,
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
96 scstr_t s1,
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
97 va_list ap) {
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
98 sstr_t str;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
99 str.ptr = NULL;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
100 str.length = 0;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
101 if(count < 2) {
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
102 return str;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
103 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
104
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
105 scstr_t s2 = va_arg (ap, scstr_t);
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
106
272
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
107 if(((size_t)-1) - s1.length < s2.length) {
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
108 return str;
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
109 }
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
110
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
111 scstr_t *strings = (scstr_t*) calloc(count, sizeof(scstr_t));
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
112 if(!strings) {
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
113 return str;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
114 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
115
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
116 // get all args and overall length
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
117 strings[0] = s1;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
118 strings[1] = s2;
272
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
119 size_t slen = s1.length + s2.length;
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
120 int error = 0;
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
121 for (size_t i=2;i<count;i++) {
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
122 scstr_t s = va_arg (ap, scstr_t);
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
123 strings[i] = s;
272
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
124 if(((size_t)-1) - s.length < slen) {
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
125 error = 1;
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
126 break;
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
127 }
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
128 slen += s.length;
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
129 }
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
130 if(error) {
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
131 free(strings);
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
132 return str;
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
133 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
134
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
135 // create new string
272
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
136 str.ptr = (char*) almalloc(a, slen + 1);
2def28b65328 adds integer overflow checks to sstrlen and sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 270
diff changeset
137 str.length = slen;
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
138 if(!str.ptr) {
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
139 free(strings);
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
140 str.length = 0;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
141 return str;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
142 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
143
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
144 // concatenate strings
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
145 size_t pos = 0;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
146 for (size_t i=0;i<count;i++) {
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
147 scstr_t s = strings[i];
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
148 memcpy(str.ptr + pos, s.ptr, s.length);
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
149 pos += s.length;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
150 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
151
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
152 str.ptr[str.length] = '\0';
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
153
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
154 free(strings);
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
155
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
156 return str;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
157 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
158
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
159 sstr_t scstrcat(size_t count, scstr_t s1, ...) {
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
160 va_list ap;
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
161 va_start(ap, s1);
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
162 sstr_t s = sstrvcat_a(ucx_default_allocator(), count, s1, ap);
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
163 va_end(ap);
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
164 return s;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
165 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
166
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
167 sstr_t scstrcat_a(UcxAllocator *a, size_t count, scstr_t s1, ...) {
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
168 va_list ap;
288
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
169 va_start(ap, s1);
6af5798342e8 makes sstrcat and sstrnlen scstr_t compatible
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 276
diff changeset
170 sstr_t s = sstrvcat_a(a, count, s1, ap);
180
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
171 va_end(ap);
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
172 return s;
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
173 }
2185f19dcc45 added new sstrcat
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 179
diff changeset
174
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
175 static int ucx_substring(
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
176 size_t str_length,
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
177 size_t start,
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
178 size_t length,
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
179 size_t *newlen,
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
180 size_t *newpos)
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
181 {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
182 *newlen = 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
183 *newpos = 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
184
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
185 if(start > str_length) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
186 return 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
187 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
188
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
189 if(length > str_length - start) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
190 length = str_length - start;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
191 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
192 *newlen = length;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
193 *newpos = start;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
194 return 1;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
195 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
196
68
88dbea299440 removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
197 sstr_t sstrsubs(sstr_t s, size_t start) {
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
198 return sstrsubsl (s, start, s.length-start);
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
199 }
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
200
68
88dbea299440 removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
201 sstr_t sstrsubsl(sstr_t s, size_t start, size_t length) {
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
202 size_t pos;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
203 sstr_t ret = { NULL, 0 };
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
204 if(ucx_substring(s.length, start, length, &ret.length, &pos)) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
205 ret.ptr = s.ptr + pos;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
206 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
207 return ret;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
208 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
209
318
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
210 scstr_t scstrsubs(scstr_t string, size_t start) {
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
211 return scstrsubsl(string, start, string.length-start);
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
212 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
213
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
214 scstr_t scstrsubsl(scstr_t s, size_t start, size_t length) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
215 size_t pos;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
216 scstr_t ret = { NULL, 0 };
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
217 if(ucx_substring(s.length, start, length, &ret.length, &pos)) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
218 ret.ptr = s.ptr + pos;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
219 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
220 return ret;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
221 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
222
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
223
318
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
224 static int ucx_strchr(const char *str, size_t length, int chr, size_t *pos) {
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
225 for(size_t i=0;i<length;i++) {
318
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
226 if(str[i] == chr) {
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
227 *pos = i;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
228 return 1;
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 152
diff changeset
229 }
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
230 }
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
231 return 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
232 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
233
318
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
234 static int ucx_strrchr(const char *str, size_t length, int chr, size_t *pos) {
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
235 if(length > 0) {
306
90b6d69bb499 merges constsstr branch
Mike Becker <universe@uap-core.de>
parents: 300
diff changeset
236 for(size_t i=length ; i>0 ; i--) {
318
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
237 if(str[i-1] == chr) {
306
90b6d69bb499 merges constsstr branch
Mike Becker <universe@uap-core.de>
parents: 300
diff changeset
238 *pos = i-1;
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
239 return 1;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
240 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
241 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
242 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
243 return 0;
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
244 }
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
245
108
d2b1e67b2b48 new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
246 sstr_t sstrchr(sstr_t s, int c) {
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
247 size_t pos = 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
248 if(ucx_strchr(s.ptr, s.length, c, &pos)) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
249 return sstrsubs(s, pos);
108
d2b1e67b2b48 new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
250 }
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
251 return sstrn(NULL, 0);
108
d2b1e67b2b48 new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
252 }
d2b1e67b2b48 new properties parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 104
diff changeset
253
148
c27c2425c0b1 added sstrrchr
Mike Becker <universe@uap-core.de>
parents: 146
diff changeset
254 sstr_t sstrrchr(sstr_t s, int c) {
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
255 size_t pos = 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
256 if(ucx_strrchr(s.ptr, s.length, c, &pos)) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
257 return sstrsubs(s, pos);
148
c27c2425c0b1 added sstrrchr
Mike Becker <universe@uap-core.de>
parents: 146
diff changeset
258 }
300
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
259 return sstrn(NULL, 0);
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
260 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
261
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
262 scstr_t scstrchr(scstr_t s, int c) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
263 size_t pos = 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
264 if(ucx_strchr(s.ptr, s.length, c, &pos)) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
265 return scstrsubs(s, pos);
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
266 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
267 return scstrn(NULL, 0);
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
268 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
269
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
270 scstr_t scstrrchr(scstr_t s, int c) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
271 size_t pos = 0;
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
272 if(ucx_strrchr(s.ptr, s.length, c, &pos)) {
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
273 return scstrsubs(s, pos);
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
274 }
d1f814633049 completes conversion to scstr
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 288
diff changeset
275 return scstrn(NULL, 0);
148
c27c2425c0b1 added sstrrchr
Mike Becker <universe@uap-core.de>
parents: 146
diff changeset
276 }
c27c2425c0b1 added sstrrchr
Mike Becker <universe@uap-core.de>
parents: 146
diff changeset
277
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
278 #define ptable_r(dest, useheap, ptable, index) (dest = useheap ? \
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
279 ((size_t*)ptable)[index] : (size_t) ((uint8_t*)ptable)[index])
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
280
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
281 #define ptable_w(useheap, ptable, index, src) do {\
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
282 if (!useheap) ((uint8_t*)ptable)[index] = (uint8_t) src;\
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
283 else ((size_t*)ptable)[index] = src;\
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
284 } while (0);
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
285
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
286
318
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
287 static const char* ucx_strstr(
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
288 const char *str,
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
289 size_t length,
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
290 const char *match,
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
291 size_t matchlen,
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
292 size_t *newlen)
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
293 {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
294 *newlen = length;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
295 if (matchlen == 0) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
296 return str;
214
2bc19726c340 added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents: 213
diff changeset
297 }
2bc19726c340 added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents: 213
diff changeset
298
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
299 const char *result = NULL;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
300 size_t resultlen = 0;
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
301
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
302 /*
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
303 * IMPORTANT:
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
304 * our prefix table contains the prefix length PLUS ONE
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
305 * this is our decision, because we want to use the full range of size_t
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
306 * the original algorithm needs a (-1) at one single place
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
307 * and we want to avoid that
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
308 */
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
309
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
310 /* static prefix table */
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
311 static uint8_t s_prefix_table[256];
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
312
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
313 /* check pattern length and use appropriate prefix table */
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
314 /* if the pattern exceeds static prefix table, allocate on the heap */
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
315 register int useheap = matchlen > 255;
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
316 register void* ptable = useheap ?
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
317 calloc(matchlen+1, sizeof(size_t)): s_prefix_table;
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
318
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
319 /* keep counter in registers */
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
320 register size_t i, j;
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
321
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
322 /* fill prefix table */
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
323 i = 0; j = 0;
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
324 ptable_w(useheap, ptable, i, j);
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
325 while (i < matchlen) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
326 while (j >= 1 && match[j-1] != match[i]) {
238
27b31c2c959c fixes major bug in construction of KMP prefix table for strstr()
Mike Becker <universe@uap-core.de>
parents: 237
diff changeset
327 ptable_r(j, useheap, ptable, j-1);
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
328 }
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
329 i++; j++;
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
330 ptable_w(useheap, ptable, i, j);
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
331 }
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
332
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
333 /* search */
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
334 i = 0; j = 1;
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
335 while (i < length) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
336 while (j >= 1 && str[i] != match[j-1]) {
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
337 ptable_r(j, useheap, ptable, j-1);
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
338 }
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
339 i++; j++;
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
340 if (j-1 == matchlen) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
341 size_t start = i - matchlen;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
342 result = str + start;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
343 resultlen = length - start;
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
344 break;
214
2bc19726c340 added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents: 213
diff changeset
345 }
2bc19726c340 added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents: 213
diff changeset
346 }
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
347
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
348 /* if prefix table was allocated on the heap, free it */
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
349 if (ptable != s_prefix_table) {
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
350 free(ptable);
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
351 }
214
2bc19726c340 added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents: 213
diff changeset
352
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
353 *newlen = resultlen;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
354 return result;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
355 }
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
356
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
357 sstr_t scstrsstr(sstr_t string, scstr_t match) {
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
358 sstr_t result;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
359
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
360 size_t reslen;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
361 const char *resstr = ucx_strstr(string.ptr, string.length, match.ptr, match.length, &reslen);
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
362 if(!resstr) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
363 result.ptr = NULL;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
364 result.length = 0;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
365 return result;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
366 }
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
367
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
368 size_t pos = resstr - string.ptr;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
369 result.ptr = string.ptr + pos;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
370 result.length = reslen;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
371
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
372 return result;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
373 }
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
374
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
375 scstr_t scstrscstr(scstr_t string, scstr_t match) {
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
376 scstr_t result;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
377
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
378 size_t reslen;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
379 const char *resstr = ucx_strstr(string.ptr, string.length, match.ptr, match.length, &reslen);
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
380 if(!resstr) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
381 result.ptr = NULL;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
382 result.length = 0;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
383 return result;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
384 }
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
385
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
386 size_t pos = resstr - string.ptr;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
387 result.ptr = string.ptr + pos;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
388 result.length = reslen;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
389
236
ffc6d0910342 improves sstrstr function by using KMP string search algorithm
Mike Becker <universe@uap-core.de>
parents: 235
diff changeset
390 return result;
214
2bc19726c340 added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents: 213
diff changeset
391 }
2bc19726c340 added sstrstr() function + improved sstrsplit variants by using sstrprefix()
Mike Becker <universe@uap-core.de>
parents: 213
diff changeset
392
237
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
393 #undef ptable_r
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
394 #undef ptable_w
5ba9de6361ff further performance tweaks to sstrstr() function
Mike Becker <universe@uap-core.de>
parents: 236
diff changeset
395
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
396 sstr_t* scstrsplit(scstr_t s, scstr_t d, ssize_t *n) {
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
397 return scstrsplit_a(ucx_default_allocator(), s, d, n);
119
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
398 }
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
399
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
400 sstr_t* scstrsplit_a(UcxAllocator *allocator, scstr_t s, scstr_t d, ssize_t *n) {
119
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
401 if (s.length == 0 || d.length == 0) {
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
402 *n = -1;
39
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
403 return NULL;
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
404 }
231
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
405
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
406 /* special cases: delimiter is at least as large as the string */
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
407 if (d.length >= s.length) {
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
408 /* exact match */
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
409 if (sstrcmp(s, d) == 0) {
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
410 *n = 0;
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
411 return NULL;
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
412 } else /* no match possible */ {
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
413 *n = 1;
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
414 sstr_t *result = (sstr_t*) almalloc(allocator, sizeof(sstr_t));
270
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
415 if(result) {
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
416 *result = sstrdup_a(allocator, s);
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
417 } else {
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
418 *n = -2;
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
419 }
231
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
420 return result;
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
421 }
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
422 }
35490eb48214 improves handling of special cases delimiter size >= string size in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 225
diff changeset
423
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 152
diff changeset
424 ssize_t nmax = *n;
235
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
425 size_t arrlen = 16;
270
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
426 sstr_t* result = (sstr_t*) alcalloc(allocator, arrlen, sizeof(sstr_t));
39
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
427
119
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
428 if (result) {
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
429 scstr_t curpos = s;
233
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
430 ssize_t j = 1;
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
431 while (1) {
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
432 scstr_t match;
234
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
433 /* optimize for one byte delimiters */
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
434 if (d.length == 1) {
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
435 match = curpos;
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
436 for (size_t i = 0 ; i < curpos.length ; i++) {
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
437 if (curpos.ptr[i] == *(d.ptr)) {
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
438 match.ptr = curpos.ptr + i;
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
439 break;
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
440 }
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
441 match.length--;
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
442 }
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
443 } else {
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
444 match = scstrscstr(curpos, d);
234
7a63b4986b5b adds an optimization for one-byte delimiters to sstrsplit (will take effect after planned reimplementation of sstrstr)
Mike Becker <universe@uap-core.de>
parents: 233
diff changeset
445 }
233
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
446 if (match.length > 0) {
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
447 /* is this our last try? */
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
448 if (nmax == 0 || j < nmax) {
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
449 /* copy the current string to the array */
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
450 scstr_t item = scstrn(curpos.ptr, match.ptr - curpos.ptr);
233
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
451 result[j-1] = sstrdup_a(allocator, item);
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
452 size_t processed = item.length + d.length;
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
453 curpos.ptr += processed;
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
454 curpos.length -= processed;
39
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
455
233
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
456 /* allocate memory for the next string */
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
457 j++;
235
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
458 if (j > arrlen) {
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
459 arrlen *= 2;
270
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
460 size_t reallocsz;
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
461 sstr_t* reallocated = NULL;
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
462 if(!ucx_szmul(arrlen, sizeof(sstr_t), &reallocsz)) {
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
463 reallocated = (sstr_t*) alrealloc(
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
464 allocator, result, reallocsz);
3d80d425543b adds integer overflow checks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 259
diff changeset
465 }
235
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
466 if (reallocated) {
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
467 result = reallocated;
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
468 } else {
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
469 for (ssize_t i = 0 ; i < j-1 ; i++) {
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
470 alfree(allocator, result[i].ptr);
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
471 }
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
472 alfree(allocator, result);
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
473 *n = -2;
7cf1e41833a2 reduces amount of realloc calls in sstrsplit
Mike Becker <universe@uap-core.de>
parents: 234
diff changeset
474 return NULL;
233
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
475 }
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
476 }
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
477 } else {
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
478 /* nmax reached, copy the _full_ remaining string */
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
479 result[j-1] = sstrdup_a(allocator, curpos);
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
480 break;
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
481 }
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 152
diff changeset
482 } else {
233
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
483 /* no more matches, copy last string */
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
484 result[j-1] = sstrdup_a(allocator, curpos);
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 152
diff changeset
485 break;
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 152
diff changeset
486 }
119
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
487 }
233
bd58fdde142d reimplementation of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 231
diff changeset
488 *n = j;
119
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
489 } else {
baa839a7633f completed documentation on sstr_t + sstrsplit overhaul + allocator version of sstrsplit
Mike Becker <universe@uap-core.de>
parents: 116
diff changeset
490 *n = -2;
39
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
491 }
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
492
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
493 return result;
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
494 }
bf8ab7bb74ff added sstrsplit function
Mike Becker <universe@uap-core.de>
parents: 31
diff changeset
495
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
496 int scstrcmp(scstr_t s1, scstr_t s2) {
116
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
497 if (s1.length == s2.length) {
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
498 return memcmp(s1.ptr, s2.ptr, s1.length);
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
499 } else if (s1.length > s2.length) {
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
500 return 1;
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
501 } else {
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
502 return -1;
234920008754 some fixes and some documentation
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
503 }
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
504 }
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
505
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
506 int scstrcasecmp(scstr_t s1, scstr_t s2) {
149
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
507 if (s1.length == s2.length) {
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
508 #ifdef _WIN32
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
509 return _strnicmp(s1.ptr, s2.ptr, s1.length);
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
510 #else
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
511 return strncasecmp(s1.ptr, s2.ptr, s1.length);
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
512 #endif
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
513 } else if (s1.length > s2.length) {
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
514 return 1;
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
515 } else {
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
516 return -1;
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
517 }
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
518 }
3bf87676d42d added sstrcasecmp
Mike Becker <universe@uap-core.de>
parents: 148
diff changeset
519
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
520 sstr_t scstrdup(scstr_t s) {
125
fca8efb122de changed suffix for allocator aware functions + added allocator aware functions for UcxList
Mike Becker <universe@uap-core.de>
parents: 123
diff changeset
521 return sstrdup_a(ucx_default_allocator(), s);
109
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
522 }
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
523
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
524 sstr_t scstrdup_a(UcxAllocator *allocator, scstr_t s) {
109
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
525 sstr_t newstring;
173
31a8682fffb7 fixed some sstring issues + added allocator macros
Mike Becker <universe@uap-core.de>
parents: 152
diff changeset
526 newstring.ptr = (char*)almalloc(allocator, s.length + 1);
109
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
527 if (newstring.ptr) {
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
528 newstring.length = s.length;
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
529 newstring.ptr[newstring.length] = 0;
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
530
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
531 memcpy(newstring.ptr, s.ptr, s.length);
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
532 } else {
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
533 newstring.length = 0;
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
534 }
75cb6590358b added properties load/store functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 108
diff changeset
535
20
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
536 return newstring;
db7d9860dbbd added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
537 }
96
fbbff331beba added sstrtrim
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 95
diff changeset
538
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
539
318
348fd9cb7b14 adds remaining documentation for the scstr functions
Mike Becker <universe@uap-core.de>
parents: 317
diff changeset
540 static size_t ucx_strtrim(const char *s, size_t len, size_t *newlen) {
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
541 const char *newptr = s;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
542 size_t length = len;
98
0a752853f792 fixed sstrtrim for empty strings
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
543
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
544 while(length > 0 && isspace(*newptr)) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
545 newptr++;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
546 length--;
96
fbbff331beba added sstrtrim
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 95
diff changeset
547 }
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
548 while(length > 0 && isspace(newptr[length-1])) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
549 length--;
104
9d3dea320d8e fixed sstrtrim and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 103
diff changeset
550 }
9d3dea320d8e fixed sstrtrim and some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 103
diff changeset
551
276
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
552 *newlen = length;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
553 return newptr - s;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
554 }
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
555
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
556 sstr_t sstrtrim(sstr_t string) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
557 sstr_t newstr;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
558 newstr.ptr = string.ptr
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
559 + ucx_strtrim(string.ptr, string.length, &newstr.length);
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
560 return newstr;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
561 }
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
562
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
563 scstr_t scstrtrim(scstr_t string) {
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
564 scstr_t newstr;
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
565 newstr.ptr = string.ptr
f1b2146d4805 adapts sstrtrim, sstrsplit, sstrcmp and sstrstr to new const string API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 275
diff changeset
566 + ucx_strtrim(string.ptr, string.length, &newstr.length);
96
fbbff331beba added sstrtrim
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 95
diff changeset
567 return newstr;
fbbff331beba added sstrtrim
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 95
diff changeset
568 }
146
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
569
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
570 int scstrprefix(scstr_t string, scstr_t prefix) {
146
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
571 if (string.length == 0) {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
572 return prefix.length == 0;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
573 }
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
574 if (prefix.length == 0) {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
575 return 1;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
576 }
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
577
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
578 if (prefix.length > string.length) {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
579 return 0;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
580 } else {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
581 return memcmp(string.ptr, prefix.ptr, prefix.length) == 0;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
582 }
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
583 }
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
584
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
585 int scstrsuffix(scstr_t string, scstr_t suffix) {
146
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
586 if (string.length == 0) {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
587 return suffix.length == 0;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
588 }
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
589 if (suffix.length == 0) {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
590 return 1;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
591 }
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
592
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
593 if (suffix.length > string.length) {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
594 return 0;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
595 } else {
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
596 return memcmp(string.ptr+string.length-suffix.length,
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
597 suffix.ptr, suffix.length) == 0;
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
598 }
aa376dba1ba8 fixed documentation for netbeans parser + added sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 125
diff changeset
599 }
210
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
600
364
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
601 int scstrcaseprefix(scstr_t string, scstr_t prefix) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
602 if (string.length == 0) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
603 return prefix.length == 0;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
604 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
605 if (prefix.length == 0) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
606 return 1;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
607 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
608
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
609 if (prefix.length > string.length) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
610 return 0;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
611 } else {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
612 scstr_t subs = scstrsubsl(string, 0, prefix.length);
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
613 return scstrcasecmp(subs, prefix) == 0;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
614 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
615 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
616
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
617 int scstrcasesuffix(scstr_t string, scstr_t suffix) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
618 if (string.length == 0) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
619 return suffix.length == 0;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
620 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
621 if (suffix.length == 0) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
622 return 1;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
623 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
624
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
625 if (suffix.length > string.length) {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
626 return 0;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
627 } else {
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
628 scstr_t subs = scstrsubs(string, string.length-suffix.length);
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
629 return scstrcasecmp(subs, suffix) == 0;
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
630 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
631 }
5577d6c27a33 adds case independent versions of sstrprefix() and sstrsuffix()
Mike Becker <universe@uap-core.de>
parents: 363
diff changeset
632
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
633 sstr_t scstrlower(scstr_t string) {
210
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
634 sstr_t ret = sstrdup(string);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
635 for (size_t i = 0; i < ret.length ; i++) {
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
636 ret.ptr[i] = tolower(ret.ptr[i]);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
637 }
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
638 return ret;
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
639 }
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
640
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
641 sstr_t scstrlower_a(UcxAllocator *allocator, scstr_t string) {
210
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
642 sstr_t ret = sstrdup_a(allocator, string);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
643 for (size_t i = 0; i < ret.length ; i++) {
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
644 ret.ptr[i] = tolower(ret.ptr[i]);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
645 }
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
646 return ret;
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
647 }
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
648
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
649 sstr_t scstrupper(scstr_t string) {
210
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
650 sstr_t ret = sstrdup(string);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
651 for (size_t i = 0; i < ret.length ; i++) {
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
652 ret.ptr[i] = toupper(ret.ptr[i]);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
653 }
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
654 return ret;
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
655 }
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
656
319
0380e438a7ce unifies naming of sstr_t related and scstr_t related functions
Mike Becker <universe@uap-core.de>
parents: 318
diff changeset
657 sstr_t scstrupper_a(UcxAllocator *allocator, scstr_t string) {
210
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
658 sstr_t ret = sstrdup_a(allocator, string);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
659 for (size_t i = 0; i < ret.length ; i++) {
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
660 ret.ptr[i] = toupper(ret.ptr[i]);
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
661 }
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
662 return ret;
6bdb04d87236 added sstrlower / sstrupper variants
Mike Becker <universe@uap-core.de>
parents: 192
diff changeset
663 }
275
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
664
378
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
665 #define REPLACE_INDEX_BUFFER_MAX 100
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
666
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
667 struct scstrreplace_ibuf {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
668 size_t* buf;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
669 unsigned int len; /* small indices */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
670 struct scstrreplace_ibuf* next;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
671 };
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
672
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
673 static void scstrrepl_free_ibuf(struct scstrreplace_ibuf *buf) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
674 while (buf) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
675 struct scstrreplace_ibuf *next = buf->next;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
676 free(buf->buf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
677 free(buf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
678 buf = next;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
679 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
680 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
681
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
682 sstr_t scstrreplacen_a(UcxAllocator *allocator, scstr_t str,
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
683 scstr_t pattern, scstr_t replacement, size_t replmax) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
684
383
db4c6b94939b fixes string replace function in case replmax is 0
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 380
diff changeset
685 if (pattern.length == 0 || pattern.length > str.length || replmax == 0)
378
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
686 return sstrdup(str);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
687
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
688 /* Compute expected buffer length */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
689 size_t ibufmax = str.length / pattern.length;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
690 size_t ibuflen = replmax < ibufmax ? replmax : ibufmax;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
691 if (ibuflen > REPLACE_INDEX_BUFFER_MAX) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
692 ibuflen = REPLACE_INDEX_BUFFER_MAX;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
693 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
694
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
695 /* Allocate first index buffer */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
696 struct scstrreplace_ibuf *firstbuf, *curbuf;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
697 firstbuf = curbuf = calloc(1, sizeof(struct scstrreplace_ibuf));
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
698 if (!firstbuf) return sstrn(NULL, 0);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
699 firstbuf->buf = calloc(ibuflen, sizeof(size_t));
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
700 if (!firstbuf->buf) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
701 free(firstbuf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
702 return sstrn(NULL, 0);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
703 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
704
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
705 /* Search occurrences */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
706 scstr_t searchstr = str;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
707 size_t found = 0;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
708 do {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
709 scstr_t match = scstrscstr(searchstr, pattern);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
710 if (match.length > 0) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
711 /* Allocate next buffer in chain, if required */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
712 if (curbuf->len == ibuflen) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
713 struct scstrreplace_ibuf *nextbuf =
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
714 calloc(1, sizeof(struct scstrreplace_ibuf));
380
2c9a5aebaee1 fixes another leak in string replace function
Mike Becker <universe@uap-core.de>
parents: 379
diff changeset
715 if (!nextbuf) {
2c9a5aebaee1 fixes another leak in string replace function
Mike Becker <universe@uap-core.de>
parents: 379
diff changeset
716 scstrrepl_free_ibuf(firstbuf);
2c9a5aebaee1 fixes another leak in string replace function
Mike Becker <universe@uap-core.de>
parents: 379
diff changeset
717 return sstrn(NULL, 0);
2c9a5aebaee1 fixes another leak in string replace function
Mike Becker <universe@uap-core.de>
parents: 379
diff changeset
718 }
378
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
719 nextbuf->buf = calloc(ibuflen, sizeof(size_t));
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
720 if (!nextbuf->buf) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
721 free(nextbuf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
722 scstrrepl_free_ibuf(firstbuf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
723 return sstrn(NULL, 0);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
724 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
725 curbuf->next = nextbuf;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
726 curbuf = nextbuf;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
727 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
728
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
729 /* Record match index */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
730 found++;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
731 size_t idx = match.ptr - str.ptr;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
732 curbuf->buf[curbuf->len++] = idx;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
733 searchstr.ptr = match.ptr + pattern.length;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
734 searchstr.length = str.length - idx - pattern.length;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
735 } else {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
736 break;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
737 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
738 } while (searchstr.length > 0 && found < replmax);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
739
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
740 /* Allocate result string */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
741 sstr_t result;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
742 {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
743 ssize_t adjlen = (ssize_t) replacement.length - (ssize_t) pattern.length;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
744 size_t rcount = 0;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
745 curbuf = firstbuf;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
746 do {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
747 rcount += curbuf->len;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
748 curbuf = curbuf->next;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
749 } while (curbuf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
750 result.length = str.length + rcount * adjlen;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
751 result.ptr = almalloc(allocator, result.length);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
752 if (!result.ptr) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
753 scstrrepl_free_ibuf(firstbuf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
754 return sstrn(NULL, 0);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
755 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
756 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
757
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
758 /* Build result string */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
759 curbuf = firstbuf;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
760 size_t srcidx = 0;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
761 char* destptr = result.ptr;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
762 do {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
763 for (size_t i = 0; i < curbuf->len; i++) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
764 /* Copy source part up to next match*/
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
765 size_t idx = curbuf->buf[i];
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
766 size_t srclen = idx - srcidx;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
767 if (srclen > 0) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
768 memcpy(destptr, str.ptr+srcidx, srclen);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
769 destptr += srclen;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
770 srcidx += srclen;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
771 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
772
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
773 /* Copy the replacement and skip the source pattern */
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
774 srcidx += pattern.length;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
775 memcpy(destptr, replacement.ptr, replacement.length);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
776 destptr += replacement.length;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
777 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
778 curbuf = curbuf->next;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
779 } while (curbuf);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
780 memcpy(destptr, str.ptr+srcidx, str.length-srcidx);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
781
379
477404eb380e fix: index buffer in string replace was not freed
Mike Becker <universe@uap-core.de>
parents: 378
diff changeset
782 /* Free index buffer */
477404eb380e fix: index buffer in string replace was not freed
Mike Becker <universe@uap-core.de>
parents: 378
diff changeset
783 scstrrepl_free_ibuf(firstbuf);
477404eb380e fix: index buffer in string replace was not freed
Mike Becker <universe@uap-core.de>
parents: 378
diff changeset
784
378
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
785 return result;
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
786 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
787
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
788 sstr_t scstrreplacen(scstr_t str, scstr_t pattern,
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
789 scstr_t replacement, size_t replmax) {
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
790 return scstrreplacen_a(ucx_default_allocator(),
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
791 str, pattern, replacement, replmax);
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
792 }
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
793
952c2df7e7ac adds string replace functions
Mike Becker <universe@uap-core.de>
parents: 364
diff changeset
794
316
be0f6bd10b52 adjusts documentation of UCX string types, converters, and constructors
Mike Becker <universe@uap-core.de>
parents: 315
diff changeset
795 // type adjustment functions
be0f6bd10b52 adjusts documentation of UCX string types, converters, and constructors
Mike Becker <universe@uap-core.de>
parents: 315
diff changeset
796 scstr_t ucx_sc2sc(scstr_t str) {
be0f6bd10b52 adjusts documentation of UCX string types, converters, and constructors
Mike Becker <universe@uap-core.de>
parents: 315
diff changeset
797 return str;
275
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
798 }
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
799 scstr_t ucx_ss2sc(sstr_t str) {
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
800 scstr_t cs;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
801 cs.ptr = str.ptr;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
802 cs.length = str.length;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
803 return cs;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
804 }
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
805 scstr_t ucx_ss2c_s(scstr_t c) {
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
806 return c;
96f643d30ff1 adds scstr_t struct for const strings and adapts some string functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 272
diff changeset
807 }

mercurial