Changeset 808 for trunk/ithildin/lib/util.c

Timestamp:

06/05/07 10:46:00 (5 years ago)

Author:

wd

Message:

Another milestone. Builds, starts without errors.. then doesn't take
connections, buy hey.

Also made the config file finder a bit smarter about looking for config
files.

File:

• trunk/ithildin/lib/util.c (modified) (3 diffs)

trunk/ithildin/lib/util.c

@@ -41 +41 @@
 char *canonize_make_human(int size, char type);
 
-/* mmap a file into a single string */
+/* memory map a file into a single string (using malloc, though, not
+ * mmap...) */
 char *mmap_file(char *file) {
     struct stat sb;
@@ -63 +64 @@
 
     fp = fopen(file, "r");
-    if (fp==NULL) {
+    if (fp == NULL) {
         free(data);
         return NULL;
@@ -127 +128 @@
 }
 
+#define PATH_SEPARATOR '/'
+/* A function to determine whether a filename given is an absolute path or
+ * not.  For unix systems this is a trivial check for a '/', on win32 it
+ * requires that we examine the path for drive letter/etc */
+bool is_absolute_path(const char *fname) {
+    if (*fname == PATH_SEPARATOR)
+        return true;
+    return false;
+}
+
+/* get the base/dirname of a file (portably).  these are also provided by
+ * some operating systems, and we can happily interoperate with those
+ * implementations. */
+char bdname_buf[PATH_MAX];
+char *basename(const char *fname) {
+    char *s;
+
+    if (strlen(fname) >= PATH_MAX) {
+        errno = EINVAL;
+        return NULL;
+    }
+
+    /* chew off any trailing slashes */
+    strlcpy(bdname_buf, fname, PATH_MAX);
+    s = bdname_buf + strlen(fname) - 1;
+    while (*s == PATH_SEPARATOR && s >= bdname_buf)
+        *s-- = '\0';
+
+    if ((s = strrchr(bdname_buf, PATH_SEPARATOR)) == NULL)
+        /* no path separator, easy.. */
+        return bdname_buf;
+    else {
+        /* just move the end of the string to the beginning with memcpy */
+        s++;
+        memcpy(bdname_buf, s, strlen(s) + 1);
+        return bdname_buf;
+    }
+}
+
+char *dirname(const char *fname) {
+    char *s;
+
+    if (strlen(fname) >= PATH_MAX) {
+        errno = EINVAL;
+        return NULL;
+    }
+
+    /* chew off any trailing slashes */
+    strlcpy(bdname_buf, fname, PATH_MAX);
+    s = bdname_buf + strlen(fname) - 1;
+    while (*s == PATH_SEPARATOR && s >= bdname_buf)
+        *s-- = '\0';
+
+    if ((s = strrchr(bdname_buf, PATH_SEPARATOR)) == NULL) {
+        strcpy(bdname_buf, ".");
+        return bdname_buf;
+    } else {
+        while (*s == PATH_SEPARATOR && s >= bdname_buf)
+            *s-- = '\0';
+        if (*bdname_buf == '\0')
+            strcpy(bdname_buf, ".");
+        return bdname_buf;
+    }
+}
+
 struct timeval *subtract_timeval(struct timeval tv1, struct timeval tv2) {
     static struct timeval result;