put string helpers in own file

build/Makefile.am

@@ -23,7 +23,9 @@ toxic_SOURCES = $(top_srcdir)/src/main.c \
                 $(top_srcdir)/src/execute.c \
                 $(top_srcdir)/src/execute.h \
                 $(top_srcdir)/src/misc_tools.c \
-                $(top_srcdir)/src/misc_tools.h
+                $(top_srcdir)/src/misc_tools.h \
+                $(top_srcdir)/src/toxic_strings.c \
+                $(top_srcdir)/src/toxic_strings.h
 
 toxic_CFLAGS =                 -I$(top_srcdir) \
 				$(NCURSES_CFLAGS) \

src/chat.c

@@ -14,6 +14,7 @@
 #include "execute.h"
 #include "misc_tools.h"
 #include "friendlist.h"
+#include "toxic_strings.h"
 
 extern char *DATA_FILE;
 extern int store_data(Tox *m, char *path);

src/misc_tools.c

@@ -8,7 +8,6 @@
 #include <limits.h>
 
 #include "toxic_windows.h"
-#include "misc_tools.h"
 
 extern ToxWindow *prompt;
 
@@ -186,168 +185,3 @@ bool valid_nick(uint8_t *nick)
 
     return true;
 }
-
-/*
- * Buffer helper tools. 
- * Assumes buffers are no larger than MAX_STR_SIZE and are always null terminated at len
- */
-
-/* Adds char to buffer at pos */
-void add_char_to_buf(wchar_t *buf, size_t *pos, size_t *len, wint_t ch)
-{
-    if (*pos < 0 || *len >= MAX_STR_SIZE)
-        return;
-
-    /* move all chars including null in front of pos one space forward and insert char in pos */
-    int i;
-
-    for (i = *len; i >= *pos && i >= 0; --i)
-        buf[i+1] = buf[i];
-
-    buf[(*pos)++] = ch;
-    ++(*len);
-}
-
-/* Deletes the character before pos */
-void del_char_buf_bck(wchar_t *buf, size_t *pos, size_t *len)
-{
-    if (*pos <= 0)
-        return;
-
-    int i;
-
-    /* similar to add_char_to_buf but deletes a char */
-    for (i = *pos-1; i <= *len; ++i)
-        buf[i] = buf[i+1];
-
-    --(*pos);
-    --(*len);
-}
-
-/* Deletes the character at pos */
-void del_char_buf_frnt(wchar_t *buf, size_t *pos, size_t *len)
-{
-    if (*pos < 0 || *pos >= *len)
-        return;
-
-    int i;
-
-    for (i = *pos; i < *len; ++i)
-        buf[i] = buf[i+1];
-
-    --(*len);
-}
-
-/* Deletes the line from beginning to pos */
-void discard_buf(wchar_t *buf, size_t *pos, size_t *len)
-{
-    if (*pos <= 0)
-        return;
-
-    int i;
-    int c = 0;
-
-    for (i = *pos; i <= *len; ++i)
-        buf[c++] = buf[i];
-
-    *pos = 0;
-    *len = c - 1;
-}
-
-/* Deletes the line from pos to len */
-void kill_buf(wchar_t *buf, size_t *pos, size_t *len)
-{
-    if (*len == *pos)
-        return;
-
-    buf[*pos] = L'\0';
-    *len = *pos;
-}
-
-/* nulls buf and sets pos and len to 0 */
-void reset_buf(wchar_t *buf, size_t *pos, size_t *len)
-{
-    buf[0] = L'\0';
-    *pos = 0;
-    *len = 0;
-}
-
-/* looks for the first instance in list that begins with the last entered word in buf according to pos, 
-   then fills buf with the complete word. e.g. "Hello jo" would complete the buffer 
-   with "Hello john".
-
-   list is a pointer to the list of strings being compared, n_items is the number of items
-   in the list, and size is the size of each item in the list. 
-
-   Returns the difference between the old len and new len of buf on success, -1 if error */
-int complete_line(wchar_t *buf, size_t *pos, size_t *len, const void *list, int n_items, int size)
-{
-    if (*pos <= 0 || *len <= 0 || *len >= MAX_STR_SIZE)
-        return -1;
-
-    const uint8_t *L = (uint8_t *) list;
-
-    uint8_t ubuf[MAX_STR_SIZE];
-    /* work with multibyte string copy of buf for simplicity */
-    if (wcs_to_mbs_buf(ubuf, buf, MAX_STR_SIZE) == -1)
-        return -1;
-
-    /* isolate substring from space behind pos to pos */
-    uint8_t tmp[MAX_STR_SIZE];
-    snprintf(tmp, sizeof(tmp), "%s", ubuf);
-    tmp[*pos] = '\0';
-    uint8_t *sub = strrchr(tmp, ' ');
-    int n_endchrs = 1;    /* 1 = append space to end of match, 2 = append ": " */   
-
-    if (!sub++) {
-        sub = tmp;
-        if (sub[0] != '/')    /* make sure it's not a command */
-            n_endchrs = 2;
-    }
-
-    if (string_is_empty(sub))
-        return -1;
-
-    int s_len = strlen(sub);
-    const uint8_t *match;
-    bool is_match = false;
-    int i;
-
-    /* look for a match in list */
-    for (i = 0; i < n_items; ++i) {
-        match = &L[i*size];
-        if (is_match = strncasecmp(match, sub, s_len) == 0)
-            break;
-    }
-
-    if (!is_match)
-        return -1;
-
-    /* put match in correct spot in buf and append endchars (space or ": ") */
-    const uint8_t *endchrs = n_endchrs == 1 ? " " : ": ";
-    int m_len = strlen(match);
-    int strt = (int) *pos - s_len;
-    int diff = m_len - s_len + n_endchrs;
-
-    if (*len + diff > MAX_STR_SIZE)
-        return -1;
-
-    uint8_t tmpend[MAX_STR_SIZE];
-    strcpy(tmpend, &ubuf[*pos]);
-    strcpy(&ubuf[strt], match);
-    strcpy(&ubuf[strt+m_len], endchrs);
-    strcpy(&ubuf[strt+m_len+n_endchrs], tmpend);
-
-    /* convert to widechar and copy back to original buf */
-    wchar_t newbuf[MAX_STR_SIZE];
-
-    if (char_to_wcs_buf(newbuf, ubuf, MAX_STR_SIZE) == -1)
-        return -1;
-
-    wmemcpy(buf, newbuf, MAX_STR_SIZE);
-
-    *len += (size_t) diff;
-    *pos += (size_t) diff;
-
-    return diff;
-}

src/misc_tools.h

@@ -43,35 +43,3 @@ int qsort_strcasecmp_hlpr(const void *nick1, const void *nick2);
       - cannot start with a space
       - must not contain contiguous spaces */
 bool valid_nick(uint8_t *nick);
-
-/*
- * Buffer helper tools.
- */
-
-/* Adds char to buffer at pos */
-void add_char_to_buf(wchar_t *buf, size_t *pos, size_t *len, wint_t ch);
-
-/* Deletes the character before pos */
-void del_char_buf_bck(wchar_t *buf, size_t *pos, size_t *len);
-
-/* Deletes the character at pos */
-void del_char_buf_frnt(wchar_t *buf, size_t *pos, size_t *len);
-
-/* Deletes the line from beginning to pos */
-void discard_buf(wchar_t *buf, size_t *pos, size_t *len);
-
-/* Deletes the line from pos to len */
-void kill_buf(wchar_t *buf, size_t *pos, size_t *len);
-
-/* nulls buf and sets pos and len to 0 */
-void reset_buf(wchar_t *buf, size_t *pos, size_t *len);
-
-/* looks for the first instance in list that begins with the last entered word in buf according to pos, 
-   then fills buf with the complete word. e.g. "Hello jo" would complete the buffer 
-   with "Hello john".
-
-   list is a pointer to the list of strings being compared, n_items is the number of items
-   in the list, and size is the size of each item in the list. 
-
-   Returns the difference between the old len and new len of buf on success, -1 if error */
-int complete_line(wchar_t *buf, size_t *pos, size_t *len, const void *list, int n_items, int size);

src/prompt.c

@@ -13,6 +13,7 @@
 #include "prompt.h"
 #include "execute.h"
 #include "misc_tools.h"
+#include "toxic_strings.h"
 
 uint8_t pending_frnd_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE] = {0};
 uint8_t num_frnd_requests = 0;

src/toxic_strings.c

@@ -0,0 +1,169 @@
+/*
+ * Toxic -- Tox Curses Client
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "toxic_windows.h"
+#include "misc_tools.h"
+
+/* Adds char to buffer at pos */
+void add_char_to_buf(wchar_t *buf, size_t *pos, size_t *len, wint_t ch)
+{
+    if (*pos < 0 || *len >= MAX_STR_SIZE)
+        return;
+
+    /* move all chars including null in front of pos one space forward and insert char in pos */
+    int i;
+
+    for (i = *len; i >= *pos && i >= 0; --i)
+        buf[i+1] = buf[i];
+
+    buf[(*pos)++] = ch;
+    ++(*len);
+}
+
+/* Deletes the character before pos */
+void del_char_buf_bck(wchar_t *buf, size_t *pos, size_t *len)
+{
+    if (*pos <= 0)
+        return;
+
+    int i;
+
+    /* similar to add_char_to_buf but deletes a char */
+    for (i = *pos-1; i <= *len; ++i)
+        buf[i] = buf[i+1];
+
+    --(*pos);
+    --(*len);
+}
+
+/* Deletes the character at pos */
+void del_char_buf_frnt(wchar_t *buf, size_t *pos, size_t *len)
+{
+    if (*pos < 0 || *pos >= *len)
+        return;
+
+    int i;
+
+    for (i = *pos; i < *len; ++i)
+        buf[i] = buf[i+1];
+
+    --(*len);
+}
+
+/* Deletes the line from beginning to pos */
+void discard_buf(wchar_t *buf, size_t *pos, size_t *len)
+{
+    if (*pos <= 0)
+        return;
+
+    int i;
+    int c = 0;
+
+    for (i = *pos; i <= *len; ++i)
+        buf[c++] = buf[i];
+
+    *pos = 0;
+    *len = c - 1;
+}
+
+/* Deletes the line from pos to len */
+void kill_buf(wchar_t *buf, size_t *pos, size_t *len)
+{
+    if (*len == *pos)
+        return;
+
+    buf[*pos] = L'\0';
+    *len = *pos;
+}
+
+/* nulls buf and sets pos and len to 0 */
+void reset_buf(wchar_t *buf, size_t *pos, size_t *len)
+{
+    buf[0] = L'\0';
+    *pos = 0;
+    *len = 0;
+}
+
+/* looks for the first instance in list that begins with the last entered word in buf according to pos, 
+   then fills buf with the complete word. e.g. "Hello jo" would complete the buffer 
+   with "Hello john".
+
+   list is a pointer to the list of strings being compared, n_items is the number of items
+   in the list, and size is the size of each item in the list. 
+
+   Returns the difference between the old len and new len of buf on success, -1 if error */
+int complete_line(wchar_t *buf, size_t *pos, size_t *len, const void *list, int n_items, int size)
+{
+    if (*pos <= 0 || *len <= 0 || *len >= MAX_STR_SIZE)
+        return -1;
+
+    const uint8_t *L = (uint8_t *) list;
+
+    uint8_t ubuf[MAX_STR_SIZE];
+    /* work with multibyte string copy of buf for simplicity */
+    if (wcs_to_mbs_buf(ubuf, buf, MAX_STR_SIZE) == -1)
+        return -1;
+
+    /* isolate substring from space behind pos to pos */
+    uint8_t tmp[MAX_STR_SIZE];
+    snprintf(tmp, sizeof(tmp), "%s", ubuf);
+    tmp[*pos] = '\0';
+    uint8_t *sub = strrchr(tmp, ' ');
+    int n_endchrs = 1;    /* 1 = append space to end of match, 2 = append ": " */   
+
+    if (!sub++) {
+        sub = tmp;
+        if (sub[0] != '/')    /* make sure it's not a command */
+            n_endchrs = 2;
+    }
+
+    if (string_is_empty(sub))
+        return -1;
+
+    int s_len = strlen(sub);
+    const uint8_t *match;
+    bool is_match = false;
+    int i;
+
+    /* look for a match in list */
+    for (i = 0; i < n_items; ++i) {
+        match = &L[i*size];
+        if (is_match = strncasecmp(match, sub, s_len) == 0)
+            break;
+    }
+
+    if (!is_match)
+        return -1;
+
+    /* put match in correct spot in buf and append endchars (space or ": ") */
+    const uint8_t *endchrs = n_endchrs == 1 ? " " : ": ";
+    int m_len = strlen(match);
+    int strt = (int) *pos - s_len;
+    int diff = m_len - s_len + n_endchrs;
+
+    if (*len + diff > MAX_STR_SIZE)
+        return -1;
+
+    uint8_t tmpend[MAX_STR_SIZE];
+    strcpy(tmpend, &ubuf[*pos]);
+    strcpy(&ubuf[strt], match);
+    strcpy(&ubuf[strt+m_len], endchrs);
+    strcpy(&ubuf[strt+m_len+n_endchrs], tmpend);
+
+    /* convert to widechar and copy back to original buf */
+    wchar_t newbuf[MAX_STR_SIZE];
+
+    if (char_to_wcs_buf(newbuf, ubuf, MAX_STR_SIZE) == -1)
+        return -1;
+
+    wmemcpy(buf, newbuf, MAX_STR_SIZE);
+
+    *len += (size_t) diff;
+    *pos += (size_t) diff;
+
+    return diff;
+}

src/toxic_strings.h

@@ -0,0 +1,31 @@
+/*
+ * Toxic -- Tox Curses Client
+ */
+
+/* Adds char to buffer at pos */
+void add_char_to_buf(wchar_t *buf, size_t *pos, size_t *len, wint_t ch);
+
+/* Deletes the character before pos */
+void del_char_buf_bck(wchar_t *buf, size_t *pos, size_t *len);
+
+/* Deletes the character at pos */
+void del_char_buf_frnt(wchar_t *buf, size_t *pos, size_t *len);
+
+/* Deletes the line from beginning to pos */
+void discard_buf(wchar_t *buf, size_t *pos, size_t *len);
+
+/* Deletes the line from pos to len */
+void kill_buf(wchar_t *buf, size_t *pos, size_t *len);
+
+/* nulls buf and sets pos and len to 0 */
+void reset_buf(wchar_t *buf, size_t *pos, size_t *len);
+
+/* looks for the first instance in list that begins with the last entered word in buf according to pos, 
+   then fills buf with the complete word. e.g. "Hello jo" would complete the buffer 
+   with "Hello john".
+
+   list is a pointer to the list of strings being compared, n_items is the number of items
+   in the list, and size is the size of each item in the list. 
+
+   Returns the difference between the old len and new len of buf on success, -1 if error */
+int complete_line(wchar_t *buf, size_t *pos, size_t *len, const void *list, int n_items, int size);