/*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file attribute.c Attribute handling functions. */
+
+#include <regex.h>
+#include <osl.h>
+
#include "para.h"
#include "error.h"
+#include "crypt.h"
#include "string.h"
#include "afh.h"
#include "afs.h"
-#include "net.h"
#include "ipc.h"
+#include "sideband.h"
+#include "command.h"
static struct osl_table *attribute_table;
static int greatest_att_bitnum;
struct osl_object obj = {.data = (char *)att_name,
.size = strlen(att_name) + 1};
struct osl_row *row;
- int ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+ int ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
if (ret < 0)
return ret;
- ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM, &obj);
+ ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM, &obj));
if (ret < 0)
return ret;
*bitnum = *(unsigned char *)obj.data;
if (!(laad->flags & LSATT_FLAG_LONG))
return para_printf(&laad->pb, "%s\n", name);
- ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
+ ret = osl(osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj));
if (ret < 0) {
para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
return ret;
struct lsatt_action_data laad = {
.flags = *(unsigned *) query->data,
.pb = {
- .max_size = SHMMAX,
- .private_data = &fd,
- .max_size_handler = pass_buffer_as_shm
+ .max_size = shm_get_shmmax(),
+ .private_data = &(struct afs_max_size_handler_data) {
+ .fd = fd,
+ .band = SBD_OUTPUT
+ },
+ .max_size_handler = afs_max_size_handler
}
};
pmd.pm_flags |= PM_REVERSE_LOOP;
for_each_matching_row(&pmd);
if (laad.pb.offset)
- pass_buffer_as_shm(laad.pb.buf, laad.pb.offset, &fd);
+ pass_buffer_as_shm(fd, SBD_OUTPUT, laad.pb.buf, laad.pb.offset);
free(laad.pb.buf);
}
-int com_lsatt(int fd, int argc, char * const * const argv)
+int com_lsatt(struct command_context *cc)
{
unsigned flags = 0;
struct osl_object options = {.data = &flags, .size = sizeof(flags)};
int ret, i;
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
+ for (i = 1; i < cc->argc; i++) {
+ const char *arg = cc->argv[i];
if (arg[0] != '-')
break;
if (!strcmp(arg, "--")) {
continue;
}
}
- ret = send_option_arg_callback_request(&options, argc - i, argv + i,
- com_lsatt_callback, send_result, &fd);
- if (!ret) {
- if (argc > 1)
- ret = send_va_buffer(fd, "no matches\n");
- } else if (ret < 0)
- send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i,
+ com_lsatt_callback, afs_cb_result_handler, cc);
+ if (ret < 0)
+ send_strerror(cc, -ret);
+ else if (ret == 0 && cc->argc > 1)
+ ret = cc->use_sideband?
+ send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n")
+ :
+ sc_send_va_buffer(&cc->scc, "no matches\n");
return ret;
}
p[len - 1] = '\0';
obj.data = p;
obj.size = len + 1;
- ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+ ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
if (ret < 0)
goto out;
- ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM,
- &obj);
+ ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM,
+ &obj));
if (ret < 0)
goto out;
if (c == '+')
PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
}
-int com_setatt(__a_unused int fd, int argc, char * const * const argv)
+int com_setatt(struct command_context *cc)
{
- if (argc < 3)
+ if (cc->argc < 3)
return -E_ATTR_SYNTAX;
- return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
- NULL, NULL);
+ return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+ com_setatt_callback, NULL, NULL);
}
struct addatt_event_data {
char *p;
int ret = 1, ret2 = 0;
struct para_buffer pb = {
- .max_size = SHMMAX,
- .private_data = &fd,
- .max_size_handler = pass_buffer_as_shm
+ .max_size = shm_get_shmmax(),
+ .private_data = &(struct afs_max_size_handler_data) {
+ .fd = fd,
+ .band = SBD_OUTPUT
+ },
+ .max_size_handler = afs_max_size_handler
};
size_t len;
goto out;
continue;
}
- if (ret != -E_RB_KEY_NOT_FOUND) /* error */
+ if (ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND)) /* error */
goto out;
objs[ATTCOL_BITNUM].size = 1;
/* find smallest unused attribute */
for (bitnum = 0; bitnum < 64; bitnum++) {
objs[ATTCOL_BITNUM].data = &bitnum;
- ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
- &objs[ATTCOL_BITNUM], &row);
- if (ret == -E_RB_KEY_NOT_FOUND)
+ ret = osl(osl_get_row(attribute_table, ATTCOL_BITNUM,
+ &objs[ATTCOL_BITNUM], &row));
+ if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
break; /* this bitnum is unused, use it */
if (ret < 0) /* error */
goto out;
}
objs[ATTCOL_NAME].data = p;
objs[ATTCOL_NAME].size = len + 1;
- ret = osl_add_row(attribute_table, objs);
+ ret = osl(osl_add_row(attribute_table, objs));
if (ret < 0)
goto out;
aed.name = p;
if (ret < 0 && ret2 >= 0)
para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
if (pb.offset)
- pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
free(pb.buf);
}
-int com_addatt(int fd, int argc, char * const * const argv)
+int com_addatt(struct command_context *cc)
{
int ret;
- if (argc < 2)
+ if (cc->argc < 2)
return -E_ATTR_SYNTAX;
- ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
- send_result, &fd);
+ ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+ com_addatt_callback, afs_cb_result_handler, cc);
if (ret < 0)
- send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ send_strerror(cc, -ret);
return ret;
}
struct osl_object obj = {.data = old, .size = size};
struct osl_row *row;
struct para_buffer pb = {
- .max_size = SHMMAX,
- .private_data = &fd,
- .max_size_handler = pass_buffer_as_shm
+ .max_size = shm_get_shmmax(),
+ .private_data = &(struct afs_max_size_handler_data) {
+ .fd = fd,
+ .band = SBD_OUTPUT
+ },
+ .max_size_handler = afs_max_size_handler,
};
int ret;
- ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+ ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row));
if (ret < 0)
goto out;
obj.data = new;
obj.size = strlen(new) + 1;
- ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
+ ret = osl(osl_update_object(attribute_table, row, ATTCOL_NAME, &obj));
out:
if (ret < 0)
para_printf(&pb, "%s\n", para_strerror(-ret));
else
afs_event(ATTRIBUTE_RENAME, &pb, NULL);
if (pb.offset)
- pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
free(pb.buf);
}
-int com_mvatt(int fd, int argc, char * const * const argv)
+int com_mvatt(struct command_context *cc)
{
int ret;
- if (argc != 3)
+ if (cc->argc != 3)
return -E_ATTR_SYNTAX;
- ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
- send_result, &fd);
+ ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+ com_mvatt_callback, afs_cb_result_handler, cc);
if (ret < 0)
- send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ send_strerror(cc, -ret);
return ret;
}
ret = get_attribute_bitnum_by_name(name, &red.bitnum);
if (ret < 0)
return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
- ret = osl_del_row(table, row);
+ ret = osl(osl_del_row(table, row));
if (ret < 0)
return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
ret = para_printf(&raad->pb, "removed attribute %s\n", name);
struct remove_attribute_action_data raad = {
.num_removed = 0,
.pb = {
- .max_size = SHMMAX,
- .private_data = &fd,
- .max_size_handler = pass_buffer_as_shm
+ .max_size = shm_get_shmmax(),
+ .private_data = &(struct afs_max_size_handler_data) {
+ .fd = fd,
+ .band = SBD_OUTPUT
+ },
+ .max_size_handler = afs_max_size_handler,
}
};
int ret, ret2 = 0;
else if (!raad.num_removed)
ret2 = para_printf(&raad.pb, "no match -- nothing removed\n");
if (ret2 >= 0 && raad.pb.offset)
- pass_buffer_as_shm(raad.pb.buf, raad.pb.offset, &fd);
+ pass_buffer_as_shm(fd, SBD_OUTPUT, raad.pb.buf, raad.pb.offset);
free(raad.pb.buf);
}
-int com_rmatt(int fd, int argc, char * const * const argv)
+int com_rmatt(struct command_context *cc)
{
int ret;
- if (argc < 2)
+ if (cc->argc < 2)
return -E_ATTR_SYNTAX;
- ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
- send_result, &fd);
+ ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+ com_rmatt_callback, afs_cb_result_handler, cc);
if (ret < 0)
- send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ send_strerror(cc, -ret);
return ret;
}
if (!(*atts & (one << i)))
continue;
- ret = osl_get_row(attribute_table, ATTCOL_BITNUM, &obj, &row);
+ ret = osl(osl_get_row(attribute_table, ATTCOL_BITNUM, &obj, &row));
if (ret < 0)
goto err;
- ret = osl_get_object(attribute_table, row, ATTCOL_NAME, &obj);
+ ret = osl(osl_get_object(attribute_table, row, ATTCOL_NAME, &obj));
if (ret < 0)
goto err;
if (*text) {
*
* \sa osl_close_table().
*/
-void attribute_close(void)
+static void attribute_close(void)
{
osl_close_table(attribute_table, OSL_MARK_CLEAN);
attribute_table = NULL;
int ret;
attribute_table_desc.dir = dir;
- ret = osl_open_table(&attribute_table_desc, &attribute_table);
+ ret = osl(osl_open_table(&attribute_table_desc, &attribute_table));
greatest_att_bitnum = -1; /* no atts available */
if (ret >= 0) {
find_greatest_att_bitnum();
return ret;
}
attribute_table = NULL;
- if (ret >= 0 || is_errno(-ret, ENOENT))
+ if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
return 1;
return ret;
}
static int attribute_create(const char *dir)
{
attribute_table_desc.dir = dir;
- return osl_create_table(&attribute_table_desc);
+ return osl(osl_create_table(&attribute_table_desc));
}
/**
projects / paraslash.git / blobdiff