* resulting string is imposed.
*
* \return This function either returns a pointer to a string that must be
- * freed by the caller or aborts without returning.
+ * freed by the caller or \p NULL if memory allocation failed.
*
* \sa printf(3).
*/
static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...)
{
- char *msg;
-
- VSPRINTF(fmt, msg);
- return msg;
+ int n;
+ size_t size = 100;
+ char *p = malloc(size);
+
+ if (!p)
+ return NULL;
+ while (1) {
+ char *q;
+ va_list ap;
+ /* Try to print in the allocated space. */
+ va_start(ap, fmt);
+ n = vsnprintf(p, size, fmt, ap);
+ va_end(ap);
+ /* If that worked, return the string. */
+ if (n > -1 && n < size)
+ break;
+ /* Else try again with more space. */
+ if (n > -1) /* glibc 2.1 */
+ size = n + 1; /* precisely what is needed */
+ else /* glibc 2.0 */
+ size *= 2; /* twice the old size */
+ q = realloc(p, size);
+ if (!q) {
+ free(p);
+ return NULL;
+ }
+ }
+ return p;
}
/**
* The log function.
*
* \param ll Loglevel.
- * \param fml Usual format string.
+ * \param fmt Usual format string.
*
* All XXX_LOG() macros use this function.
*/
*
* \sa lseek(2).
*/
-int para_lseek(int fd, off_t *offset, int whence)
+static int __lseek(int fd, off_t *offset, int whence)
{
*offset = lseek(fd, *offset, whence);
int ret = -E_LSEEK;
*
* \sa write(2).
*/
-ssize_t para_write(int fd, const void *buf, size_t size)
+static ssize_t __write(int fd, const void *buf, size_t size)
{
ssize_t ret;
*
* \sa para_write().
*/
-ssize_t para_write_all(int fd, const void *buf, size_t size)
+static ssize_t write_all(int fd, const void *buf, size_t size)
{
// DEBUG_LOG("writing %zu bytes\n", size);
const char *b = buf;
while (size) {
- ssize_t ret = para_write(fd, b, size);
+ ssize_t ret = __write(fd, b, size);
// DEBUG_LOG("ret: %zd\n", ret);
if (ret < 0)
return ret;
* \param buf The buffer to write to the file.
* \param size The size of \a buf.
*
- * \return Positive on success, negative on errors. Possible errors include:
- * any errors from para_open() or para_write().
- *
- * \sa para_open(), para_write().
+ * \return Standard.
*/
-int para_write_file(const char *filename, const void *buf, size_t size)
+static int write_file(const char *filename, const void *buf, size_t size)
{
int ret, fd;
- ret = para_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
+ ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644);
if (ret < 0)
return ret;
fd = ret;
- ret = para_write_all(fd, buf, size);
+ ret = write_all(fd, buf, size);
if (ret < 0)
goto out;
ret = 1;
int ret, fd;
// DEBUG_LOG("appending %zu + %zu bytes\n", header_size, data_size);
- ret = para_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
+ ret = osl_open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
if (ret < 0)
return ret;
fd = ret;
if (header && header_size) {
- ret = para_write_all(fd, header, header_size);
+ ret = write_all(fd, header, header_size);
if (ret < 0)
goto out;
}
- ret = para_write_all(fd, data, data_size);
+ ret = write_all(fd, data, data_size);
if (ret < 0)
goto out;
if (new_pos) {
off_t offset = 0;
- ret = para_lseek(fd, &offset, SEEK_END);
+ ret = __lseek(fd, &offset, SEEK_END);
if (ret < 0)
goto out;
// DEBUG_LOG("new file size: " FMT_OFF_T "\n", offset);
return ret;
}
-/**
- * Traverse the given directory recursively.
- *
- * \param dirname The directory to traverse.
- * \param func The function to call for each entry.
- * \param private_data Pointer to an arbitrary data structure.
- *
- * For each regular file under \a dirname, the supplied function \a func is
- * called. The full path of the regular file and the \a private_data pointer
- * are passed to \a func. Directories for which the calling process has no
- * permissions to change to are silently ignored.
- *
- * \return Standard.
- */
-int for_each_file_in_dir(const char *dirname,
- int (*func)(const char *, void *), void *private_data)
-{
- DIR *dir;
- struct dirent *entry;
- int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
-
- if (ret < 0)
- return ret == -ERRNO_TO_ERROR(EACCES)? 1 : ret;
- /* scan cwd recursively */
- while ((entry = readdir(dir))) {
- mode_t m;
- char *tmp;
- struct stat s;
-
- if (!strcmp(entry->d_name, "."))
- continue;
- if (!strcmp(entry->d_name, ".."))
- continue;
- if (lstat(entry->d_name, &s) == -1)
- continue;
- m = s.st_mode;
- if (!S_ISREG(m) && !S_ISDIR(m))
- continue;
- tmp = make_message("%s/%s", dirname, entry->d_name);
- if (!S_ISDIR(m)) {
- ret = func(tmp, private_data);
- free(tmp);
- if (ret < 0)
- goto out;
- continue;
- }
- /* directory */
- ret = for_each_file_in_dir(tmp, func, private_data);
- free(tmp);
- if (ret < 0)
- goto out;
- }
- ret = 1;
-out:
- closedir(dir);
- ret2 = para_fchdir(cwd_fd);
- if (ret2 < 0 && ret >= 0)
- ret = ret2;
- close(cwd_fd);
- return ret;
-}
-
static int verify_name(const char *name)
{
if (!name)
{
char *dirname, *column_name = column_filename(t, col_num);
+ if (!column_name)
+ return NULL;
if (!(t->desc->flags & OSL_LARGE_TABLE))
return column_name;
dirname = make_message("%s/%.2s", column_name, ds_name);
if (ret < 0)
return ret;
*name = disk_storage_name_of_object(t, &obj);
- return 1;
+ if (*name)
+ return 1;
+ return -ERRNO_TO_ERROR(ENOMEM);
}
static void column_name_hash(const char *col_name, HASH_TYPE *hash)
struct osl_table **table_ptr)
{
const struct osl_column_description *cd;
- struct osl_table *t = para_calloc(sizeof(*t));
- int i, ret = -E_BAD_TABLE_DESC, have_disk_storage_name_column = 0;
+ struct osl_table *t = calloc(1, sizeof(*t));
+ int i, ret = -ERRNO_TO_ERROR(ENOMEM), have_disk_storage_name_column = 0;
+ if (!t)
+ return ret;
+ ret = -E_BAD_TABLE_DESC;
if (!desc)
goto err;
DEBUG_LOG("creating table structure for '%s' from table "
ret = -E_NO_COLUMNS;
if (!desc->num_columns)
goto err;
- t->columns = para_calloc(desc->num_columns * sizeof(struct osl_column));
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ t->columns = calloc(desc->num_columns, sizeof(struct osl_column));
+ if (!t->columns)
+ goto err;
t->desc = desc;
FOR_EACH_COLUMN(i, t->desc, cd) {
enum osl_storage_type st = cd->storage_type;
header_size = read_u16(buf + IDX_HEADER_SIZE);
if (map->size < header_size)
return -E_BAD_SIZE;
- desc->column_descriptions = para_calloc(desc->num_columns
- * sizeof(struct osl_column_description));
+ desc->column_descriptions = calloc(desc->num_columns,
+ sizeof(struct osl_column_description));
+ if (!desc->column_descriptions)
+ return -ERRNO_TO_ERROR(ENOMEM);
offset = IDX_COLUMN_DESCRIPTIONS;
FOR_EACH_COLUMN(i, desc, cd) {
char *null_byte;
ret = -E_INDEX_CORRUPTION;
if (!null_byte)
goto err;
- cd->name = para_strdup(buf + offset + IDX_CD_NAME);
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ cd->name = strdup(buf + offset + IDX_CD_NAME);
+ if (!cd->name)
+ goto err;
offset += index_column_description_size(cd->name);
}
if (offset != header_size) {
INFO_LOG("creating %zu byte index for table %s\n", size,
t->desc->name);
- buf = para_calloc(size);
+ buf = calloc(1, size);
+ if (!buf)
+ return -ERRNO_TO_ERROR(ENOMEM);
sprintf(buf + IDX_PARA_MAGIC, "%s", PARA_MAGIC);
write_u8(buf + IDX_TABLE_FLAGS, t->desc->flags);
write_u8(buf + IDX_DIRTY_FLAG, 0);
}
assert(offset = size);
filename = index_filename(t->desc);
- ret = para_write_file(filename, buf, size);
+ if (filename)
+ ret = write_file(filename, buf, size);
+ else
+ ret = -ERRNO_TO_ERROR(ENOMEM);
free(buf);
free(filename);
return ret;
goto out;
table_dir = make_message("%s/%s", desc->dir,
desc->name);
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ if (!table_dir)
+ goto out;
ret = para_mkdir(table_dir, 0777);
if (ret < 0)
goto out;
}
+ ret = -ERRNO_TO_ERROR(ENOMEM);
filename = column_filename(t, i);
+ if (!filename)
+ goto out;
INFO_LOG("filename: %s\n", filename);
if (cd->storage_type == OSL_MAPPED_STORAGE) {
- ret = para_open(filename, O_RDWR | O_CREAT | O_EXCL,
+ ret = osl_open(filename, O_RDWR | O_CREAT | O_EXCL,
0644);
free(filename);
if (ret < 0)
struct stat statbuf;
char *filename = column_filename(t, col_num);
int ret = -E_STAT;
+
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
if (stat(filename, &statbuf) < 0) {
free(filename);
return ret;
if (t->index_map.data)
return -E_ALREADY_MAPPED;
filename = index_filename(t->desc);
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
DEBUG_LOG("mapping table '%s' (index: %s)\n", t->desc->name, filename);
ret = mmap_full_file(filename, flags & MAP_TBL_FL_MAP_RDONLY?
O_RDONLY : O_RDWR, &t->index_map.data, &t->index_map.size, NULL);
struct osl_row *row = allocate_row(t->num_rbtrees);
const struct osl_column_description *cd;
+ if (!row)
+ return -ERRNO_TO_ERROR(ENOMEM);
row->num = row_num;
row->volatile_objects = volatile_objs;
FOR_EACH_RBTREE_COLUMN(i, t, cd) {
if (ret < 0)
return ret;
FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
- /* check if directory exists */
- char *dirname = column_filename(t, i);
struct stat statbuf;
+ char *dirname = column_filename(t, i);
+
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ if (!dirname)
+ goto err;
+ /* check if directory exists */
ret = stat(dirname, &statbuf);
free(dirname);
if (ret < 0) {
if (!(t->desc->flags & OSL_LARGE_TABLE))
return 1;
dirname = disk_storage_dirname(t, col_num, ds_name);
+ if (!dirname)
+ return -ERRNO_TO_ERROR(ENOMEM);
ret = para_mkdir(dirname, 0777);
free(dirname);
if (ret < 0 && !is_errno(-ret, EEXIST))
if (ret < 0)
return ret;
filename = disk_storage_path(t, col_num, ds_name);
- ret = para_write_file(filename, obj->data, obj->size);
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
+ ret = write_file(filename, obj->data, obj->size);
free(filename);
return ret;
}
int ret;
char header = 0; /* zero means valid object */
-// DEBUG_LOG("appending %zu + 1 byte\n", obj->size);
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
ret = append_file(filename, &header, 1, obj->data, obj->size,
new_size);
free(filename);
if (!t->num_mapped_columns)
return 1;
filename = index_filename(t->desc);
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
ret = append_file(filename, NULL, 0, row_index,
t->row_index_size, NULL);
free(filename);
static int truncate_mapped_file(const struct osl_table *t, unsigned col_num,
off_t size)
{
+ int ret;
char *filename = column_filename(t, col_num);
- int ret = para_truncate(filename, size);
+
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
+ ret = para_truncate(filename, size);
free(filename);
return ret;
}
const char *ds_name)
{
char *dirname, *filename = disk_storage_path(t, col_num, ds_name);
- int ret = unlink(filename), err = errno;
+ int ret, err;
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
+ ret = unlink(filename);
+ err = errno;
free(filename);
if (ret < 0)
return -ERRNO_TO_ERROR(err);
if (!(t->desc->flags & OSL_LARGE_TABLE))
return 1;
dirname = disk_storage_dirname(t, col_num, ds_name);
+ if (!dirname)
+ return -ERRNO_TO_ERROR(ENOMEM);
rmdir(dirname);
free(dirname);
return 1;
if (!t)
return -E_BAD_TABLE;
- rb_parents = para_malloc(t->num_rbtrees * sizeof(struct rn_node*));
- rb_links = para_malloc(t->num_rbtrees * sizeof(struct rn_node**));
- if (t->num_mapped_columns)
- new_row_index = para_malloc(t->row_index_size);
+ rb_parents = malloc(t->num_rbtrees * sizeof(struct rn_node*));
+ if (!rb_parents)
+ return -ERRNO_TO_ERROR(ENOMEM);
+ rb_links = malloc(t->num_rbtrees * sizeof(struct rn_node**));
+ if (!rb_links) {
+ free(rb_parents);
+ return -ERRNO_TO_ERROR(ENOMEM);
+ }
+ if (t->num_mapped_columns) {
+ new_row_index = malloc(t->row_index_size);
+ if (!new_row_index) {
+ free(rb_links);
+ free(rb_parents);
+ return -ERRNO_TO_ERROR(ENOMEM);
+ }
+ }
/* pass 1: sanity checks */
// DEBUG_LOG("sanity tests: %p:%p\n", objects[0].data,
// objects[1].data);
goto out;
}
}
- if (t->num_disk_storage_columns)
+ if (t->num_disk_storage_columns) {
ds_name = disk_storage_name_of_object(t,
&objects[t->disk_storage_name_column]);
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ if (!ds_name)
+ goto out;
+ }
ret = unmap_table(t, OSL_MARK_CLEAN);
if (ret < 0)
goto out;
ret = map_table(t, MAP_TBL_FL_VERIFY_INDEX);
if (ret < 0) { /* truncate index and rollback changes */
char *filename = index_filename(t->desc);
- para_truncate(filename, t->row_index_size);
+ if (filename)
+ para_truncate(filename, t->row_index_size);
free(filename);
goto rollback;
}
/* pass 3: add entry to rbtrees */
if (t->num_volatile_columns) {
- volatile_objs = para_calloc(t->num_volatile_columns
- * sizeof(struct osl_object));
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ volatile_objs = calloc(t->num_volatile_columns,
+ sizeof(struct osl_object));
+ if (!volatile_objs)
+ goto out;
FOR_EACH_VOLATILE_COLUMN(i, t, cd)
volatile_objs[t->columns[i].volatile_num] = objects[i];
}
return 1; /* object did not change */
old_ds_name = disk_storage_name_of_object(t, old_obj);
new_ds_name = disk_storage_name_of_object(t, new_obj);
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ if (!old_ds_name || ! new_ds_name)
+ goto out;
+
FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
char *old_filename, *new_filename;
ret = create_disk_storage_object_dir(t, i, new_ds_name);
goto out;
old_filename = disk_storage_path(t, i, old_ds_name);
new_filename = disk_storage_path(t, i, new_ds_name);
- ret = para_rename(old_filename, new_filename);
+ if (!old_filename || !new_filename)
+ ret = -ERRNO_TO_ERROR(ENOMEM);
+ else
+ ret = para_rename(old_filename, new_filename);
free(old_filename);
free(new_filename);
if (ret < 0)
return ret;
filename = disk_storage_path(t, col_num, ds_name);
free(ds_name);
+ if (!filename)
+ return -ERRNO_TO_ERROR(ENOMEM);
DEBUG_LOG("filename: %s\n", filename);
ret = mmap_full_file(filename, O_RDONLY, &obj->data, &obj->size, NULL);
free(filename);
projects / osl.git / blobdiff