WiimoteSync: null_pin.patch

src/textfile.c

@@ -343 +343 @@
         return str;
 }
 
+static char *read_key_null(const char *pathname, const char *key, int icase, int *val_len)
+{
+        struct stat st;
+        char *map, *off, *end, *tmp, *str = NULL;
+        off_t size; size_t len;
+        int fd, err = 0;
+
+        fd = open(pathname, O_RDONLY);
+        if (fd < 0)
+                return NULL;
+
+        if (flock(fd, LOCK_SH) < 0) {
+                err = errno;
+                goto close;
+        }
+
+        if (fstat(fd, &st) < 0) {
+                err = errno;
+                goto unlock;
+        }
+
+        size = st.st_size;
+
+        map = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+        if (!map || map == MAP_FAILED) {
+                err = errno;
+                goto unlock;
+        }
+
+        len = strlen(key);
+        off = find_key(map, size, key, len, icase);
+        if (!off) {
+                err = EILSEQ;
+                goto unmap;
+        }
+
+        end = memchr(off, '\r', size - (off - map));
+        tmp = memchr(off, '\n', size - (off - map));
+        if (tmp && (!end || (tmp < end))) {
+                end = tmp;
+        }
+        if (!end) {
+                err = EILSEQ;
+                goto unmap;
+        }
+
+        str = malloc(end - off - len);
+        if (!str) {
+                err = EILSEQ;
+                goto unmap;
+        }
+
+        memset(str, 0, end - off - len);
+        strncpy(str, off + len + 1, end - off - len - 1);
+        if (val_len) {
+                *val_len = end - off - len - 1;
+        }
+
+unmap:
+        munmap(map, size);
+
+unlock:
+        flock(fd, LOCK_UN);
+
+close:
+        close(fd);
+        errno = err;
+
+        return str;
+}
+
 int textfile_put(const char *pathname, const char *key, const char *value)
 {
         return write_key(pathname, key, value, 0);
@@ -368 +439 @@
         return read_key(pathname, key, 0);
 }
 
+char *textfile_get_null(const char *pathname, const char *key, int *len)
+{
+        return read_key_null(pathname, key, 0, len);
+}
+
 char *textfile_caseget(const char *pathname, const char *key)
 {
         return read_key(pathname, key, 1);

src/textfile.h

@@ -34 +34 @@
 int textfile_del(const char *pathname, const char *key);
 int textfile_casedel(const char *pathname, const char *key);
 char *textfile_get(const char *pathname, const char *key);
+char *textfile_get_null(const char *pathname, const char *key, int *len);
 char *textfile_caseget(const char *pathname, const char *key);
 
 int textfile_foreach(const char *pathname,

src/storage.c

@@ -618 +618 @@
         create_filename(filename, PATH_MAX, local, "pincodes");
 
         ba2str(peer, addr);
-        str = textfile_get(filename, addr);
+        str = textfile_get_null(filename, addr, &len);
         if (!str)
                 return -ENOENT;
 
         strncpy(pin, str, 16);
-        len = strlen(pin);
 
         free(str);