improved vg_str functions

[vg.git] / vg_platform.h

diff --git a/vg_platform.h b/vg_platform.h
index 210192d60e7164fbf6e15ed72940bb74da6b62c6..b22f989ee608af389956056ca3c433357e389d96 100644 (file)
--- a/vg_platform.h
+++ b/vg_platform.h
@@ -1,12 +1,6 @@
 #ifndef VG_PLATFORM_H
 #define VG_PLATFORM_H
 
-#ifdef VG_RELEASE
- #define VG_STATIC static
-#else
- #define VG_STATIC
-#endif
-
 //#include "vg.h"
 #include "vg_stdint.h"
 
@@ -39,24 +33,134 @@ struct vg_achievement
 #define vg_list_size( A ) (sizeof(A)/sizeof(A[0]))
 #define VG_MUST_USE_RESULT __attribute__((warn_unused_result))
 
-VG_STATIC void vg_strncpy( const char *src, char *dst, u32 len )
-{
-   for( u32 i=0; i<len; i++ )
-   {
-      dst[i] = src[i];
-
-      if( !src[i] )
-         break;
-   }
-}
-
 #include <stdio.h>
-#include <dirent.h>
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <math.h>
 #include <assert.h>
+#include <setjmp.h>
+#include <sys/time.h>
+#include <math.h>
+#include <stdio.h>
+#include <errno.h>
+
+enum strncpy_behaviour{
+   k_strncpy_always_add_null = 0,
+   k_strncpy_allow_cutoff = 1,
+   k_strncpy_overflow_fatal = 2
+};
+
+static void vg_fatal_error( const char *fmt, ... );
+static u32 vg_strncpy( const char *src, char *dst, u32 len,
+                          enum strncpy_behaviour behaviour )
+{
+   for( u32 i=0; i<len; i++ ){
+      dst[i] = src[i];
+
+      if( !src[i] ) return i;
+
+      if( i == len-1 ){
+         if( behaviour == k_strncpy_always_add_null ){
+            dst[i] = '\0';
+            return i;
+         }
+         else if( behaviour == k_strncpy_overflow_fatal ){
+            vg_fatal_error( "Strncpy dest exceeded buffer length\n" );
+         }
+      }
+   }
+
+   return 0;
+}
+
+typedef struct vg_str vg_str;
+struct vg_str{
+   char *buffer;
+   i32 i, len;
+};
+
+static void vg_strnull( vg_str *str, char *buffer, i32 len ){
+   str->buffer = buffer;
+   str->buffer[0] = '\0';
+   str->i = 0;
+   str->len = len;
+
+   assert(len);
+}
+
+static void vg_strcat( vg_str *str, const char *append ){
+   if( !append ) return;
+   if( str->i == -1 ) return;
+
+   for( u32 i=0; str->i < str->len; str->i ++, i ++ ){
+      str->buffer[ str->i ] = append[ i ];
+
+      if( append[ i ] == '\0' )
+         return;
+   }
+
+   /* overflow */
+   str->buffer[ str->i ] = '\0';
+   str->i = -1;
+}
+
+static void vg_strcati32( vg_str *str, i32 value ){
+   if( value ){
+      char temp[32];
+      int i=0;
+      while( value && (i<31) ){
+         temp[ i ++ ] = '0' + (value % 10);
+         value /= 10;
+      }
+
+      char reverse[32];
+      for( int j=0; j<i; j ++ )
+         reverse[j] = temp[ i-1-j ];
+      reverse[i] = '\0';
+
+      vg_strcat( str, reverse );
+   }
+   else
+      vg_strcat( str, "0" );
+}
+
+static int vg_strgood( vg_str *str ){
+   if( str->i == -1 ) return 0;
+   else return 1;
+}
+
+static char *vg_strch( vg_str *str, char c ){
+   char *ptr = NULL;
+   for( i32 i=0; i<str->i; i++ ){
+      if( str->buffer[i] == c )
+         ptr = str->buffer+i;
+   }
+
+   return ptr;
+}
+
+static u32 vg_strdjb2( const char *str ){
+   u32 hash = 5381, c;
+
+   while( (c = *str++) )
+      hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+
+   return hash;
+}
+
+static int vg_strdjb2_eq( const char *s1, u32 h1, 
+                             const char *s2, u32 h2 )
+{
+   if( h1 == h2 ){
+      if(!strcmp(s1, s2)) return 1;
+      else return 0;
+   } else return 0;
+}
+
+#define VG_STRDJB2_EQ( CS1, S2, H2 ) \
+   vg_strdjb2_eq( CS1, vg_strdjb2(CS1), S2, H2 )
+
 
 #define VG_MIN( A, B ) ((A)<(B)?(A):(B))
 #define VG_MAX( A, B ) ((A)>(B)?(A):(B))