return ret;
}
-void *grab_fd(const void *ctx, int fd)
+void *grab_fd(const void *ctx, int fd, size_t *size)
{
int ret;
- unsigned int max = 16384, size = 0;
+ size_t max = 16384, s;
char *buffer;
+ if (!size)
+ size = &s;
+ *size = 0;
+
buffer = talloc_array(ctx, char, max+1);
- while ((ret = read(fd, buffer + size, max - size)) > 0) {
- size += ret;
- if (size == max)
+ while ((ret = read(fd, buffer + *size, max - *size)) > 0) {
+ *size += ret;
+ if (*size == max)
buffer = talloc_realloc(ctx, buffer, char, max*=2 + 1);
}
if (ret < 0) {
talloc_free(buffer);
buffer = NULL;
} else
- buffer[size] = '\0';
+ buffer[*size] = '\0';
return buffer;
}
-void *grab_file(const void *ctx, const char *filename)
+void *grab_file(const void *ctx, const char *filename, size_t *size)
{
int fd;
char *buffer;
- if (streq(filename, "-"))
+ if (!filename)
fd = dup(STDIN_FILENO);
else
fd = open(filename, O_RDONLY, 0);
if (fd < 0)
return NULL;
- buffer = grab_fd(ctx, fd);
+ buffer = grab_fd(ctx, fd, size);
close_noerr(fd);
return buffer;
}