1 --- src/apppstatus.cc 2017-07-30 10:59:06.000000000 +0200
2 +++ src/apppstatus.cc 2017-08-09 09:12:54.332052762 +0200
4 sscanf(p, "%s %s %s %s %s", val[0], val[1], val[2], val[3], val[4]);
5 for (i = 0; i < 4; i++) {
6 if (strncmp(val[i+1], "?", 1) != 0)
7 - strlcpy(phoneNumber, val[i+1], sizeof phoneNumber);
8 + my_strlcpy(phoneNumber, val[i+1], sizeof phoneNumber);
12 --- src/base.h 2017-07-30 10:59:06.000000000 +0200
13 +++ src/base.h 2017-08-09 09:11:13.082025484 +0200
15 /*** String Functions *********************************************************/
17 /* Prefer this as a safer alternative over strcpy. Return strlen(from). */
18 -size_t strlcpy(char *dest, const char *from, size_t dest_size);
19 +size_t my_strlcpy(char *dest, const char *from, size_t dest_size);
20 /* Prefer this over strcat. Return strlen(dest) + strlen(from). */
21 -size_t strlcat(char *dest, const char *from, size_t dest_size);
22 +size_t my_strlcat(char *dest, const char *from, size_t dest_size);
24 char *newstr(char const *str);
25 char *newstr(char const *str, int len);
26 --- src/gnome2.cc 2017-07-30 10:59:06.000000000 +0200
27 +++ src/gnome2.cc 2017-08-09 09:11:21.819027846 +0200
29 const int plen = strlen(fPath);
32 - strlcpy(tmp, fPath, sizeof tmp);
33 - strlcat(tmp, "/.directory", sizeof tmp);
34 + my_strlcpy(tmp, fPath, sizeof tmp);
35 + my_strlcat(tmp, "/.directory", sizeof tmp);
37 if (isDir && !stat(tmp, &sb)) { // looks like kde/gnome1 style
41 while ((file = readdir(dir)) != NULL) {
43 - strlcpy(fullpath, dirname, sizeof fullpath);
44 - strlcat(fullpath, file->d_name, sizeof fullpath);
45 + my_strlcpy(fullpath, dirname, sizeof fullpath);
46 + my_strlcat(fullpath, file->d_name, sizeof fullpath);
47 GnomeDesktopItem *ditem =
48 gnome_desktop_item_new_from_file(fullpath,
49 (GnomeDesktopItemLoadFlags)0,
50 --- src/icehelp.cc 2017-07-30 10:59:06.000000000 +0200
51 +++ src/icehelp.cc 2017-08-09 09:11:31.490030459 +0200
53 const size_t size = 9 + strlen(cfmt) + strlen(cstr) + strlen(crea);
54 char *cbuf = (char *)malloc(size);
55 snprintf(cbuf, size, cfmt, cstr);
56 - strlcat(cbuf, ":\n ", size);
57 - strlcat(cbuf, crea, size);
58 + my_strlcat(cbuf, ":\n ", size);
59 + my_strlcat(cbuf, crea, size);
61 node *root = new node(node::div);
62 flist<node> nodes(root);
63 --- src/icesm.cc 2017-07-30 10:59:06.000000000 +0200
64 +++ src/icesm.cc 2017-08-09 09:13:12.946057758 +0200
67 if (wordexp(trim(buf), &w, 0) != 0 || w.we_wordc == 0)
69 - size_t len = strlcpy(buf, trim(w.we_wordv[0]), bufsiz);
70 + size_t len = my_strlcpy(buf, trim(w.we_wordv[0]), bufsiz);
71 for (size_t k = 1; k < w.we_wordc && len < bufsiz; ++k) {
72 - strlcat(buf, " ", bufsiz);
73 - len = strlcat(buf, trim(w.we_wordv[k]), bufsiz);
74 + my_strlcat(buf, " ", bufsiz);
75 + len = my_strlcat(buf, trim(w.we_wordv[k]), bufsiz);
81 char *str = trim(buf);
83 - strlcpy(buf, str, bufsiz);
84 + my_strlcpy(buf, str, bufsiz);
86 if (buf[0] == '#' || buf[0] == '=')
88 --- src/icesound.cc 2017-07-30 10:59:06.000000000 +0200
89 +++ src/icesound.cc 2017-08-09 09:11:26.686029161 +0200
91 char * findSample(int sid) {
94 - strlcpy(basefname, gui_events[sid].name, sizeof basefname);
95 - strlcat(basefname, ".wav", sizeof basefname);
96 + my_strlcpy(basefname, gui_events[sid].name, sizeof basefname);
97 + my_strlcat(basefname, ".wav", sizeof basefname);
99 return findSample(basefname);
101 --- src/misc.cc 2017-07-30 10:59:06.000000000 +0200
102 +++ src/misc.cc 2017-08-09 09:13:39.372064834 +0200
106 /* Prefer this as a safer alternative over strcpy. Return strlen(from). */
107 -size_t strlcpy(char *dest, const char *from, size_t dest_size)
108 +size_t my_strlcpy(char *dest, const char *from, size_t dest_size)
110 const char *in = from;
112 @@ -463,12 +463,12 @@
115 /* Prefer this over strcat. Return strlen(dest) + strlen(from). */
116 -size_t strlcat(char *dest, const char *from, size_t dest_size)
117 +size_t my_strlcat(char *dest, const char *from, size_t dest_size)
120 char *const stop = to + dest_size - 1;
121 while (to < stop && *to) ++to;
122 - return to - dest + strlcpy(to, from, dest_size - (to - dest));
123 + return to - dest + my_strlcpy(to, from, dest_size - (to - dest));
126 char *newstr(char const *str) {
127 --- src/strtest.cc 2017-07-30 10:59:06.000000000 +0200
128 +++ src/strtest.cc 2017-08-09 09:13:24.395060823 +0200
129 @@ -286,63 +286,63 @@
130 strtest tester("strlc");
133 - n = strlcpy(d, "", 0);
134 + n = my_strlcpy(d, "", 0);
138 - n = strlcpy(d, "a", 0);
139 + n = my_strlcpy(d, "a", 0);
143 - n = strlcpy(d, "", 1);
144 + n = my_strlcpy(d, "", 1);
148 - n = strlcpy(d, "a", 1);
149 + n = my_strlcpy(d, "a", 1);
153 - n = strlcpy(d, "a", 2);
154 + n = my_strlcpy(d, "a", 2);
158 - n = strlcpy(d, "ab", 2);
159 + n = my_strlcpy(d, "ab", 2);
163 - n = strlcpy(d, "ab", 3);
164 + n = my_strlcpy(d, "ab", 3);
168 - n = strlcpy(d, "abc", sizeof d);
169 + n = my_strlcpy(d, "abc", sizeof d);
173 - n = strlcat(d, "def", 4);
174 + n = my_strlcat(d, "def", 4);
178 - n = strlcat(d, "def", sizeof d);
179 + n = my_strlcat(d, "def", sizeof d);
183 - n = strlcat(d, "ghijkl", sizeof d);
184 + n = my_strlcat(d, "ghijkl", sizeof d);
185 sequal(d, "abcdefghi");
188 - n = strlcpy(d, "123", sizeof d);
189 + n = my_strlcpy(d, "123", sizeof d);
193 - n = strlcpy(d, d + 1, sizeof d);
194 + n = my_strlcpy(d, d + 1, sizeof d);
198 - n = strlcpy(d, d + 1, sizeof d);
199 + n = my_strlcpy(d, d + 1, sizeof d);
203 - n = strlcpy(d, d + 1, sizeof d);
204 + n = my_strlcpy(d, d + 1, sizeof d);
210 const char *e = a.entry();
211 assert(e, strcoll(buf, e) < 0);
212 - strlcpy(buf, e, sizeof buf);
213 + my_strlcpy(buf, e, sizeof buf);
215 assert(buf, strcoll(buf, "~~~~~~~~~") < 0);
218 cstring c(s.entry());
219 const char *e = c.c_str();
220 assert(e, strcoll(buf, e) < 0);
221 - strlcpy(buf, e, sizeof buf);
222 + my_strlcpy(buf, e, sizeof buf);
224 assert(buf, strcoll(buf, "~~~~~~~~~") < 0);
226 --- src/udir.cc 2017-07-30 10:59:06.000000000 +0200
227 +++ src/udir.cc 2017-08-09 09:13:28.346061883 +0200
232 - strlcpy(fEntry, dirp.name(), sizeof fEntry);
233 + my_strlcpy(fEntry, dirp.name(), sizeof fEntry);