Wed, 27 Feb 2013 16:59:02 +0100
happy 100th commit + removed deprecated sstrcat + fixed sstrncat
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * File: sstring.c |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * Author: olaf |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * Created on 17. Juni 2010, 13:27 |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | */ |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | #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
|
9 | #include <string.h> |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | #include <stdarg.h> |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | #include "string.h" |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
14 | sstr_t sstr(char *s) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | sstr_t string; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | string.ptr = s; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | string.length = strlen(s); |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | return string; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
21 | sstr_t sstrn(char *s, size_t n) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | sstr_t string; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | string.ptr = s; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | string.length = n; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | return string; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
28 | size_t sstrnlen(size_t n, sstr_t s, ...) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | va_list ap; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | size_t size = s.length; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | va_start(ap, s); |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | |
95 | 33 | for (size_t i = 0 ; i < n-1 ; i++) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | sstr_t str = va_arg(ap, sstr_t); |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | size += str.length; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | } |
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
|
37 | va_end(ap); |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | return size; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
42 | sstr_t sstrncat(size_t n, sstr_t s, sstr_t c1, ...) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | va_list ap; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | va_start(ap, c1); |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | s.ptr[0] = 0; |
47
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
46 | |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
47 | size_t len = s.length; |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
48 | size_t cplen = c1.length > len ? len : c1.length; |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
49 | char *ptr = s.ptr; |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
50 | |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
51 | memcpy(ptr, c1.ptr, cplen); |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
52 | len -= cplen; |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
53 | ptr += cplen; |
95 | 54 | for (size_t i = 0 ; i < n-1 ; i++) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | sstr_t str = va_arg (ap, sstr_t); |
47
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
56 | cplen = str.length > len ? len : str.length; |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
57 | if(cplen <= 0) { |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
58 | va_end(ap); |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
59 | return s; |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
60 | } |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
61 | memcpy(ptr, str.ptr, cplen); |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
62 | len -= cplen; |
22fb97e9f58a
sstrncat uses memcpy
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
39
diff
changeset
|
63 | ptr += cplen; |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | } |
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
|
65 | va_end(ap); |
100
e0ec80179a5d
happy 100th commit + removed deprecated sstrcat + fixed sstrncat
Mike Becker <universe@uap-core.de>
parents:
98
diff
changeset
|
66 | s.length = ptr - s.ptr; |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | return s; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
71 | sstr_t sstrsubs(sstr_t s, size_t start) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | return sstrsubsl (s, start, s.length-start); |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
75 | sstr_t sstrsubsl(sstr_t s, size_t start, size_t length) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | sstr_t new_sstr; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | if (start < 0 || start >= s.length || length < 0) { |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | return s; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | if (length > s.length-start) { |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | length = s.length-start; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | new_sstr.ptr = &s.ptr[start]; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | new_sstr.length = length; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | return new_sstr; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
88 | sstr_t* sstrsplit(sstr_t s, sstr_t d, size_t *n) { |
39 | 89 | if (d.length == 0) { |
90 | return NULL; | |
91 | } | |
92 | ||
93 | sstr_t* result; | |
94 | size_t nmax = *n; | |
95 | *n = 1; | |
96 | ||
97 | /* special case: exact match - no processing needed */ | |
98 | if (s.length == d.length && strncmp(s.ptr, d.ptr, s.length) == 0) { | |
71
303dabadff1c
made the code work with g++ without errors (but warnings)
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
99 | *n = 0; |
303dabadff1c
made the code work with g++ without errors (but warnings)
Mike Becker <universe@uap-core.de>
parents:
69
diff
changeset
|
100 | return NULL; |
39 | 101 | } |
102 | sstr_t sv = sstrdup(s); | |
103 | ||
95 | 104 | for (size_t i = 0 ; i < s.length ; i++) { |
39 | 105 | if (sv.ptr[i] == d.ptr[0]) { |
106 | _Bool match = 1; | |
95 | 107 | for (size_t j = 1 ; j < d.length ; j++) { |
39 | 108 | if (j+i < s.length) { |
109 | match &= (sv.ptr[i+j] == d.ptr[j]); | |
110 | } else { | |
111 | match = 0; | |
112 | break; | |
113 | } | |
114 | } | |
115 | if (match) { | |
116 | (*n)++; | |
95 | 117 | for (size_t j = 0 ; j < d.length ; j++) { |
39 | 118 | sv.ptr[i+j] = 0; |
119 | } | |
120 | i += d.length; | |
121 | } | |
122 | } | |
123 | if ((*n) == nmax) break; | |
124 | } | |
69
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
125 | result = (sstr_t*) malloc(sizeof(sstr_t) * (*n)); |
39 | 126 | |
127 | char *pptr = sv.ptr; | |
95 | 128 | for (size_t i = 0 ; i < *n ; i++) { |
39 | 129 | size_t l = strlen(pptr); |
69
fb59270b1de3
made the code work with VC++ compiler (use make CONF=windows)
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
130 | char* ptr = (char*) malloc(l + 1); |
39 | 131 | memcpy(ptr, pptr, l); |
132 | ptr[l] = 0; | |
133 | ||
134 | result[i] = sstrn(ptr, l); | |
135 | pptr += l + d.length; | |
136 | } | |
137 | ||
138 | free(sv.ptr); | |
139 | ||
140 | return result; | |
141 | } | |
142 | ||
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
143 | int sstrcmp(sstr_t s1, sstr_t s2) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
144 | return strncmp(s1.ptr, s2.ptr, s1.length>s2.length ? s2.length: s1.length); |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
145 | } |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
146 | |
68
88dbea299440
removed const from string.*
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
67
diff
changeset
|
147 | sstr_t sstrdup(sstr_t s) { |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
148 | sstr_t newstring; |
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
|
149 | newstring.ptr = (char*) malloc(s.length + 1); |
96 | 150 | newstring.length = 0; |
87
bd444539cced
some fixes + ucx_(d)list_contains
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
151 | if (newstring.ptr) { |
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
|
152 | newstring.length = s.length; |
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
|
153 | newstring.ptr[newstring.length] = 0; |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
154 | |
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
|
155 | memcpy(newstring.ptr, s.ptr, s.length); |
87
bd444539cced
some fixes + ucx_(d)list_contains
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
156 | } else { |
bd444539cced
some fixes + ucx_(d)list_contains
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
157 | newstring.length = 0; |
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
|
158 | } |
20
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | return newstring; |
db7d9860dbbd
added some map functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | } |
96 | 162 | |
163 | sstr_t sstrtrim(sstr_t string) { | |
164 | sstr_t newstr = string; | |
98
0a752853f792
fixed sstrtrim for empty strings
Mike Becker <universe@uap-core.de>
parents:
97
diff
changeset
|
165 | if (string.length == 0) { |
0a752853f792
fixed sstrtrim for empty strings
Mike Becker <universe@uap-core.de>
parents:
97
diff
changeset
|
166 | return newstr; |
0a752853f792
fixed sstrtrim for empty strings
Mike Becker <universe@uap-core.de>
parents:
97
diff
changeset
|
167 | } |
0a752853f792
fixed sstrtrim for empty strings
Mike Becker <universe@uap-core.de>
parents:
97
diff
changeset
|
168 | |
97
499e1b465d77
fixed execution order of tests + added test for sstrtrim
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
169 | size_t i; |
96 | 170 | for(i=0;i<string.length;i++) { |
171 | char c = string.ptr[i]; | |
172 | if(c > 32) { | |
173 | break; | |
174 | } | |
175 | } | |
176 | newstr.ptr = &string.ptr[i]; | |
177 | newstr.length = string.length - i; | |
178 | ||
179 | for(i=newstr.length-1;i>=0;i--) { | |
180 | char c = newstr.ptr[i]; | |
181 | if(c > 32) { | |
182 | break; | |
183 | } | |
184 | } | |
185 | newstr.length = i + 1; | |
186 | ||
187 | return newstr; | |
188 | } |