X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=share%2Fcommon.h;h=e292b09daab8471f55eba4be1791ebd3cc492fe3;hb=d9f6f8642b9a4f326c0854efe969195a8d0d2e2a;hp=06dfc58585149ea54cbadb2be399bc0122cf2273;hpb=c5cbf8f4f869f02263dabce855924d687f4af417;p=neverball

diff --git a/share/common.h b/share/common.h
index 06dfc58..e292b09 100644
--- a/share/common.h
+++ b/share/common.h
@@ -22,10 +22,31 @@
 
 #include <time.h>
 #include <stdio.h>
+#include "fs.h"
 
-int   read_line(char **, FILE *);
+#ifdef __GNUC__
+#define NULL_TERMINATED __attribute__ ((__sentinel__))
+#else
+#define NULL_TERMINATED
+#endif
+
+#define ARRAYSIZE(a) (sizeof (a) / sizeof ((a)[0]))
+
+#define MIN(x, y) ((x) < (y) ? (x) : (y))
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+
+int   read_line(char **, fs_file);
 char *strip_newline(char *);
 
+char *dupe_string(const char *);
+char *concat_string(const char *first, ...) NULL_TERMINATED;
+char *trunc_string(const char *src, char *dst, int len);
+
+#ifdef strdup
+#undef strdup
+#endif
+#define strdup dupe_string
+
 time_t make_time_from_utc(struct tm *);
 const char *date_to_str(time_t);
 
@@ -33,6 +54,14 @@ int  file_exists(const char *);
 int  file_rename(const char *, const char *);
 void file_copy(FILE *fin, FILE *fout);
 
-char *base_name(const char *name, const char *suffix);
+int path_is_sep(int);
+int path_is_abs(const char *);
+
+char       *base_name(const char *name, const char *suffix);
+const char *dir_name(const char *name);
+
+char *path_resolve(const char *ref, const char *rel);
+
+int rand_between(int low, int high);
 
 #endif