change choice of diagnostics for ftepp to use lex_ctx instance. Cleaned up C++ style...

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 8b54251c76ed447e52c4b15f38b70b7888745c98..6d947427cec991f6f659df420c826a03c5430fc0 100644 (file)
--- a/util.c
+++ b/util.c
@@ -450,16 +450,10 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
         int c = getc(stream);
 
         if (chr < 2) {
-            char *tmp = (char*)mem_a((*n+=(*n>16)?*n:64));
-            if  (!tmp)
-                return -1;
-
-            memcpy(tmp, *lineptr, pos - *lineptr);
+            *n += (*n > 16) ? *n : 64;
             chr = *n + *lineptr - pos;
-            if (!(*lineptr = tmp)) {
-                mem_d (tmp);
+            if (!(*lineptr = (char*)mem_r(*lineptr,*n)))
                 return -1;
-            }
             pos = *n - chr + *lineptr;
         }
 
@@ -504,11 +498,23 @@ size_t util_strtononcmd(const char *in, char *out, size_t outsz) {
             *out = *in + 'a' - 'A';
         else
             *out = *in;
+            
+        *out = (isalpha(*in) && isupper(*in)) ? *in + 'a' - 'A' : *in;
     }
     *out = 0;
     return sz-1;
 }
 
+
+bool util_filexists(const char *file) {
+    FILE *fp = fopen(file, "rb");
+    if  (!fp) return false;
+    
+    /* it exists */
+    fclose(fp);
+    return true;
+}
+
 FILE *util_fopen(const char *filename, const char *mode)
 {
 #ifdef WIN32
@@ -521,15 +527,6 @@ FILE *util_fopen(const char *filename, const char *mode)
 #endif
 }
 
-bool util_filexists(const char *file) {
-    FILE *fp = fopen(file, "rb");
-    if  (!fp) return false;
-    
-    /* it exists */
-    fclose(fp);
-    return true;
-}
-
 void _util_vec_grow(void **a, size_t i, size_t s) {
     size_t m = *a ? 2*_vec_beg(*a)+i : i+1;
     void  *p = mem_r((*a ? _vec_raw(*a) : NULL), s * m + sizeof(size_t)*2);