#include "log.h"
#include "osl.h"
-#include "error.h"
-#include "fd.h"
+#include "util.h"
#include "osl_core.h"
#include "fsck.cmdline.h"
#define FSCK_ERRORS \
FSCK_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \
FSCK_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \
- FSCK_ERROR(SYNTAX, "fsck syntax error"),
+ FSCK_ERROR(SYNTAX, "fsck syntax error"), \
+ FSCK_ERROR(ACCESS, "permission denied"), \
+ FSCK_ERROR(CHDIR, "could not change directory"), \
+ FSCK_ERROR(OPENDIR, "could not open directory"),
+#define FSCK_ERROR_BIT 29
#define FSCK_ERROR(num, txt) E_FSCK_ ## num
enum {
FSCK_DUMMY = (1 << FSCK_ERROR_BIT) - 1,
*
* \sa malloc(3).
*/
-__must_check __malloc static void *para_malloc(size_t size)
+__must_check __malloc static void *fsck_malloc(size_t size)
{
assert(size);
void *p = malloc(size);
*
* \sa calloc(3)
*/
-__must_check __malloc static void *para_calloc(size_t size)
+__must_check __malloc static void *fsck_calloc(size_t size)
{
- void *ret = para_malloc(size);
+ void *ret = fsck_malloc(size);
memset(ret, 0, size);
return ret;
*
* \sa strdup(3)
*/
-__must_check __malloc static char *para_strdup(const char *s)
+__must_check __malloc static char *fsck_strdup(const char *s)
{
char *ret;
return 0;
}
+/**
+ * A wrapper for fchdir().
+ *
+ * \param fd An open file descriptor.
+ *
+ * \return Standard.
+ */
+static inline int __fchdir(int fd)
+{
+ if (fchdir(fd) >= 0)
+ return 1;
+ return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR;
+}
+
+/**
+ * Wrapper for chdir(2).
+ *
+ * \param path The specified directory.
+ *
+ * \return Standard.
+ */
+_static_inline_ int __chdir(const char *path)
+{
+ if (chdir(path) >= 0)
+ return 1;
+ return errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_CHDIR;
+}
+
+/**
+ * Save the cwd and open a given directory.
+ *
+ * \param dirname Path to the directory to open.
+ * \param dir Result pointer.
+ * \param cwd File descriptor of the current working directory.
+ *
+ * \return Standard.
+ *
+ * Opening the current directory (".") and calling fchdir() to return is
+ * usually faster and more reliable than saving cwd in some buffer and calling
+ * chdir() afterwards.
+ *
+ * If \a cwd is not \p NULL "." is opened and the resulting file descriptor is
+ * stored in \a cwd. If the function returns success, and \a cwd is not \p
+ * NULL, the caller must close this file descriptor (probably after calling
+ * fchdir(*cwd)).
+ *
+ * On errors, the function undos everything, so the caller needs neither close
+ * any files, nor change back to the original working directory.
+ *
+ * \sa getcwd(3).
+ *
+ */
+static int fsck_opendir(const char *dirname, DIR **dir, int *cwd)
+{
+ int ret;
+
+ if (cwd) {
+ ret = osl_open(".", O_RDONLY, 0);
+ if (ret < 0)
+ return ret;
+ *cwd = ret;
+ }
+ ret = __chdir(dirname);
+ if (ret < 0)
+ goto close_cwd;
+ *dir = opendir(".");
+ if (*dir)
+ return 1;
+ ret = errno == EACCES? -E_FSCK_ACCESS : -E_FSCK_OPENDIR;
+/* Ignore return value of fchdir() and close(). We're busted anyway. */
+ if (cwd)
+ fchdir(*cwd);
+close_cwd:
+ if (cwd)
+ close(*cwd);
+ return ret;
+}
+
+
+
/**
* Traverse the given directory recursively.
*
{
DIR *dir;
struct dirent *entry;
- int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
+ int cwd_fd, ret2, ret = fsck_opendir(dirname, &dir, &cwd_fd);
if (ret < 0)
- return ret == -ERRNO_TO_ERROR(EACCES)? 1 : ret;
+ return ret == -E_FSCK_ACCESS? 1 : ret;
/* scan cwd recursively */
while ((entry = readdir(dir))) {
mode_t m;
ret = 1;
out:
closedir(dir);
- ret2 = para_fchdir(cwd_fd);
+ ret2 = __fchdir(cwd_fd);
if (ret2 < 0 && ret >= 0)
ret = ret2;
close(cwd_fd);
continue;
ret = check_range(t, i, j);
if (ret < 0) {
- if (ret != -E_OSL_INVALID_OBJECT &&
- ret != -E_FSCK_RANGE_VIOLATION)
+ if (ret != -E_FSCK_RANGE_VIOLATION)
goto err;
- if (ret == -E_OSL_INVALID_OBJECT) {
- CRIT_LOG("row %d, col %d maps to an "
- "invalid object\n", i, j);
- }
ret = mark_row_invalid(t, i);
if (ret < 0)
goto err;
DEBUG_LOG("unmapping index\n");
osl_munmap(t->index_map.data, t->index_map.size);
filename = index_filename(t->desc);
- ret = para_truncate(filename, t->row_index_size
+ ret = truncate_file(filename, t->row_index_size
* t->num_invalid_rows);
free(filename);
if (ret < 0)
{
int i, j, ret;
const struct osl_column_description *cd;
- uint32_t *loss = para_malloc(sizeof(uint32_t) * t->desc->num_columns);
+ uint32_t *loss = fsck_malloc(sizeof(uint32_t) * t->desc->num_columns);
INFO_LOG("looking for mapped objects not contained in index\n");
/* first count used bytes */
for (j = 0; j < t->num_rows; j++) {
struct osl_object obj;
ret = get_mapped_object(t, i, j, &obj);
- if (ret >= 0) {
- loss[i] -= obj.size + 1; /* add one for header byte */
- continue;
- }
- if (ret != -E_OSL_INVALID_OBJECT)
+ if (ret < 0)
goto err;
- CRIT_LOG("row %d, col %d points to an invalid "
- "mapped object, bad\n", j, i);
+ loss[i] -= obj.size;
}
}
ret = 0;
{
int i, ret;
const struct osl_column_description *cd;
- char **col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
- char **new_col_filenames = para_calloc(t->desc->num_columns * sizeof(char *));
+ char **col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
+ char **new_col_filenames = fsck_calloc(t->desc->num_columns * sizeof(char *));
char *idx_filename = index_filename(t->desc);
char *old_idx_filename = make_message("%s.bak", idx_filename);
int fd;
if (!t->num_rows)
return 1;
- hashes = para_malloc(t->num_rows * HASH_SIZE);
+ hashes = fsck_malloc(t->num_rows * HASH_SIZE);
INFO_LOG("looking for missing disk storage objects\n");
for (i = 0; i < t->num_rows; i++) {
if (row_is_invalid(t, i))
int prune_disk_storage_file(const char *path, void *private_data)
{
HASH_TYPE hash[HASH_SIZE];
- unsigned flags = *(unsigned *)private_data;
+ uint8_t flags = *(uint8_t *)private_data;
struct osl_object obj = {.data = hash, .size = HASH_SIZE};
struct osl_row *row;
int ret = -1;
INFO_LOG("looking for unreferenced disk storage files\n");
FOR_EACH_DISK_STORAGE_COLUMN(i, t, cd) {
char *dirname = column_filename(t, i);
+ uint8_t flags = t->desc->flags;
ret = for_each_file_in_dir(dirname, prune_disk_storage_file,
- (unsigned *)&t->desc->flags);
+ &flags);
free(dirname);
}
if (files_pruned)
#define APPEND_ASC_SF(sf, flag, str) do { if (sf & flag) { \
if (str) str = make_message("%s%s", str, " | " # flag); \
- else str = para_strdup(#flag); }} while (0)
+ else str = fsck_strdup(#flag); }} while (0)
char *get_asc_storage_flags(enum osl_storage_type sf)
current_dir = make_message("%s/rows_%u-%u", dump_dir, i, i + 999);
NOTICE_LOG("dumping rows %u - %u\n", i, i + 999);
ret = osl_mkdir(current_dir, 0777);
- if (ret < 0 && !is_errno(-ret, EEXIST))
+ if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
goto out;
}
row_dir = make_message("%s/row_%03u", current_dir, i);
ret = osl_mkdir(row_dir, 0777);
- if (ret < 0 && !is_errno(-ret, EEXIST)) {
+ if (ret < 0 && ret != -E_OSL_DIR_EXISTS) {
free(row_dir);
goto out;
}
if (ret < 0)
goto out;
ret = osl_mkdir(dump_dir, 0777);
- if (ret < 0 && !is_errno(-ret, EEXIST))
+ if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
goto out;
table_dump_dir = make_message("%s/%s", dump_dir, desc->name);
ret = osl_mkdir(table_dump_dir, 0777);
- if (ret < 0 && !is_errno(-ret, EEXIST))
+ if (ret < 0 && ret != -E_OSL_DIR_EXISTS)
goto out;
desc_file = make_message("%s/table_description.c", table_dump_dir);
ret = osl_open(desc_file, O_WRONLY | O_CREAT | O_EXCL, 0644);
{
DIR *dir;
struct dirent *entry;
- int cwd_fd, ret2, ret = para_opendir(db_dir, &dir, &cwd_fd);
+ int cwd_fd, ret2, ret = fsck_opendir(db_dir, &dir, &cwd_fd);
if (ret < 0)
return ret;
break;
}
closedir(dir);
- ret2 = para_fchdir(cwd_fd);
+ ret2 = __fchdir(cwd_fd);
if (ret2 < 0 && ret >= 0)
ret = ret2;
close(cwd_fd);
projects / osl.git / blobdiff