windows makefile update

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 63d4e6f56e67fd32cf3daa9c89f253198861f13c..942f6617dd35a0964352504d2d2429dbb49ae3ca 100644 (file)
--- a/util.c
+++ b/util.c
@@ -33,7 +33,7 @@ struct memblock_t {
     const char  *file;
     unsigned int line;
     unsigned int byte;
-};
+}; 
 
 void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
     struct memblock_t *info = malloc(sizeof(struct memblock_t) + byte);
@@ -46,6 +46,7 @@ void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
     util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line);
     mem_at++;
     mem_ab += info->byte;
+
     return data;
 }
 
@@ -57,6 +58,7 @@ void util_memory_d(void *ptrn, unsigned int line, const char *file) {
     util_debug("MEM", "released:   % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, data, file, line);
     mem_db += info->byte;
     mem_dt++;
+
     free(data);
 }
 
@@ -117,6 +119,23 @@ char *util_strrq(char *s) {
     return dst;
 }
 
+/*
+ * Chops a substring from an existing string by creating a
+ * copy of it and null terminating it at the required position.
+ */
+char *util_strchp(const char *s, const char *e) {
+    if (!s || !e)
+        return NULL;
+        
+    size_t m  = 0;
+    char  *c  = util_strdup(s);
+    while (s != e)
+        s++,c++,m++;
+         
+    *c = '\0';
+    return c-m;
+}
+
 /*
  * Remove newline from a string (if it exists).  This is
  * done pointer wise instead of strlen(), and an array
@@ -132,6 +151,47 @@ char *util_strrnl(char *src) {
     return src;
 }
 
+/*
+ * Removes any whitespace prefixed on a string by moving
+ * skipping past it, and stroing the skip distance, so
+ * the string can later be freed (if it was allocated)
+ */
+char *util_strsws(const char *skip) {
+    size_t size = 0;
+    if (!skip)
+        return NULL;
+    
+    while (*skip == ' ' || *skip == '\t')
+        skip++,size++;
+    return util_strdup(skip-size);
+}
+
+/*
+ * Returns true if string is all uppercase, otherwise
+ * it returns false.
+ */
+bool util_strupper(const char *str) {
+    while (*str) {
+        if(!isupper(*str))
+            return false;
+        str++;
+    }
+    return true;
+}
+
+/*
+ * Returns true if string is all digits, otherwise
+ * it returns false.
+ */
+bool util_strdigit(const char *str) {
+    while (*str) {
+        if(!isdigit(*str))
+            return false;
+        str++;
+    }
+    return true;
+}
+
 void util_debug(const char *area, const char *ms, ...) {
     if (!opts_debug)
         return;
@@ -335,21 +395,3 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
     *pos = '\0';
     return (ret = pos - *lineptr);
 }
-
-/*
- * Strechy string buffer (for easy string creation) -- this is fast, just
- * say no to strict aliasing.
- */
-//#define util_stringbuf_add(a,v) ((((a)==0 ||((int*)(a)-2)[1]+(1)>=((int*)(a)-2)[0])?util_stringbuf_grow((void**)&(a),(1),sizeof(*(a))):0),(a)[((int*)(a)-2)[1]++]=(v))
-//#define util_stringbuf_len(a)   ((a)?       ((int*)(a)-2)[1]:0)
-//#define util_stringbuf_del(a)   ((a)?free  (((int*)(a)-2)),0:0)
-void *util_stringbuf_grow(void **a, int in, int it) {
-    int m = *a ? 2 * ((int*)(*a)-2)[0]+in : in+1;
-    void *p = realloc(*a ? ((int*)(*a)-2) : 0, it * m + sizeof(int)*2);
-    if (p) {
-        if (!*a) ((int*)p)[1] = 0;
-        *a = (void*)((int*)p+2);
-        ((int*)(*a)-2)[0] = m;
-    }
-    return *a;
-}