/*
- * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "afh.h"
#include "afs.h"
#include "net.h"
+#include "ipc.h"
static struct osl_table *attribute_table;
static int greatest_att_bitnum;
{
struct lsatt_action_data *laad = data;
struct osl_object bitnum_obj;
- int ret;
+ int ret, ret2;
- if (!(laad->flags & LSATT_FLAG_LONG)) {
- para_printf(&laad->pb, "%s\n", name);
- return 1;
- }
+ if (!(laad->flags & LSATT_FLAG_LONG))
+ return para_printf(&laad->pb, "%s\n", name);
ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
if (ret < 0) {
- para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
+ ret2 = para_printf(&laad->pb, "%s: %s\n", name, para_strerror(-ret));
return ret;
}
- para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
+ return para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
name);
- return 1;
}
-static int com_lsatt_callback(const struct osl_object *query,
- struct osl_object *result)
+static void com_lsatt_callback(int fd, const struct osl_object *query)
{
- struct lsatt_action_data laad = {.flags = *(unsigned *) query->data};
+ struct lsatt_action_data laad = {
+ .flags = *(unsigned *) query->data,
+ .pb = {
+ .max_size = SHMMAX,
+ .private_data = &fd,
+ .max_size_handler = pass_buffer_as_shm
+ }
+
+ };
struct pattern_match_data pmd = {
.table = attribute_table,
.loop_col_num = ATTCOL_BITNUM,
.data = &laad,
.action = print_attribute
};
- int ret;
-
if (laad.flags & LSATT_FLAG_SORT_BY_ID)
pmd.loop_col_num = ATTCOL_NAME;
if (laad.flags & LSATT_FLAG_REVERSE)
pmd.pm_flags |= PM_REVERSE_LOOP;
- ret = for_each_matching_row(&pmd);
- if (ret < 0)
- para_printf(&laad.pb, "%s\n", para_strerror(-ret));
- if (!laad.pb.buf)
- return 0;
- result->data = laad.pb.buf;
- result->size = laad.pb.size;
- return 1;
+ for_each_matching_row(&pmd);
+ if (laad.pb.offset)
+ pass_buffer_as_shm(laad.pb.buf, laad.pb.offset, &fd);
+ free(laad.pb.buf);
}
int com_lsatt(int fd, int argc, char * const * const argv)
{
unsigned flags = 0;
- struct osl_object options = {.data = &flags, .size = sizeof(flags)},
- result;
+ struct osl_object options = {.data = &flags, .size = sizeof(flags)};
int ret, i;
for (i = 1; i < argc; i++) {
}
}
ret = send_option_arg_callback_request(&options, argc - i, argv + i,
- com_lsatt_callback, &result);
+ com_lsatt_callback, send_result, &fd);
if (!ret) {
if (argc > 1)
ret = send_va_buffer(fd, "no matches\n");
- return ret;
- }
- if (ret < 0) {
+ } else if (ret < 0)
send_va_buffer(fd, "%s\n", para_strerror(-ret));
- return ret;
- }
- ret = send_buffer(fd, (char *)result.data);
- free(result.data);
return ret;
}
-static int com_setatt_callback(const struct osl_object *query,
- __a_unused struct osl_object *result)
+static void com_setatt_callback(__a_unused int fd, const struct osl_object *query)
{
char *p;
uint64_t add_mask = 0, del_mask = 0;
char c;
len = strlen(p);
+ ret = -E_ATTR_SYNTAX;
if (!*p)
- return -E_ATTR_SYNTAX;
+ goto out;
c = p[len - 1];
if (c != '+' && c != '-')
break;
obj.size = len + 1;
ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
if (ret < 0)
- return ret;
+ goto out;
ret = osl_get_object(attribute_table, row, ATTCOL_BITNUM,
&obj);
if (ret < 0)
- return ret;
+ goto out;
if (c == '+')
add_mask |= (1UL << *(unsigned char *)obj.data);
else
del_mask |= (1UL << *(unsigned char *)obj.data);
}
+ ret = -E_ATTR_SYNTAX;
if (!add_mask && !del_mask)
- return -E_ATTR_SYNTAX;
+ goto out;
PARA_DEBUG_LOG("masks: %llx:%llx\n",(long long unsigned)add_mask,
(long long unsigned)del_mask);
for (; p < (char *)query->data + query->size; p += len + 1) { /* TODO: fnmatch */
len = strlen(p);
ret = aft_get_row_of_path(p, &aced.aft_row);
if (ret < 0)
- return ret;
+ goto out;
ret = get_afsi_object_of_row(aced.aft_row, &obj);
if (ret < 0)
- return ret;
+ goto out;
ret = load_afsi(&old_afsi, &obj);
if (ret < 0)
- return ret;
+ goto out;
new_afsi = old_afsi;
new_afsi.attributes |= add_mask;
new_afsi.attributes &= ~del_mask;
save_afsi(&new_afsi, &obj); /* in-place update */
afs_event(AFSI_CHANGE, NULL, &aced);
}
- return 1;
+out:
+ if (ret < 0)
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
}
int com_setatt(__a_unused int fd, int argc, char * const * const argv)
if (argc < 3)
return -E_ATTR_SYNTAX;
return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
- NULL);
+ NULL, NULL);
}
struct addatt_event_data {
};
-static int com_addatt_callback(const struct osl_object *query,
- struct osl_object *result)
+static void com_addatt_callback(int fd, const struct osl_object *query)
{
char *p = query->data;
- int ret = 1;
- struct para_buffer pb = {.size = 0};
+ int ret = 1, ret2 = 0;
+ struct para_buffer pb = {
+ .max_size = SHMMAX,
+ .private_data = &fd,
+ .max_size_handler = pass_buffer_as_shm
+ };
size_t len;
for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
struct osl_object objs[NUM_ATT_COLUMNS];
struct osl_row *row;
unsigned char bitnum;
- len = strlen(p);
struct addatt_event_data aed;
+ len = strlen(p);
if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
- para_printf(&pb, "invalid attribute name: %s\n", p);
+ ret2 = para_printf(&pb, "invalid attribute name: %s\n", p);
+ if (ret2 < 0)
+ goto out;
continue;
}
ret = get_attribute_bitnum_by_name(p, &bitnum);
if (ret >= 0) {
- para_printf(&pb, "attribute \"%s\" already exists\n", p);
+ ret2 = para_printf(&pb, "attribute \"%s\" already exists\n", p);
+ if (ret2 < 0)
+ goto out;
continue;
}
if (ret != -E_RB_KEY_NOT_FOUND) /* error */
aed.name = p;
aed.bitnum = bitnum;
afs_event(ATTRIBUTE_ADD, &pb, &aed);
- greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum);
+ greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, (int)bitnum);
}
out:
- if (ret < 0)
- para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
- result->data = pb.buf;
- result->size = pb.size;
- return result->data? 0 : 1;
+ if (ret < 0 && ret2 >= 0)
+ ret = para_printf(&pb, "%s: %s\n", p, para_strerror(-ret));
+ if (pb.offset)
+ pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ free(pb.buf);
}
int com_addatt(int fd, int argc, char * const * const argv)
{
- struct osl_object result;
int ret;
if (argc < 2)
return -E_ATTR_SYNTAX;
ret = send_standard_callback_request(argc - 1, argv + 1, com_addatt_callback,
- &result);
- if (!ret)
- return 1;
+ send_result, &fd);
if (ret < 0)
- return ret;
- if (!result.data || !result.size)
- return 1;
- ret = send_va_buffer(fd, "%s", (char *) result.data);
- free(result.data);
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
return ret;
}
-static int com_mvatt_callback(const struct osl_object *query,
- struct osl_object *result)
+static void com_mvatt_callback(int fd, const struct osl_object *query)
{
char *old = query->data;
size_t size = strlen(old) + 1;
char *new = old + size;
struct osl_object obj = {.data = old, .size = size};
struct osl_row *row;
- struct para_buffer pb = {.size = 0};
+ struct para_buffer pb = {
+ .max_size = SHMMAX,
+ .private_data = &fd,
+ .max_size_handler = pass_buffer_as_shm
+ };
int ret;
ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
out:
if (ret < 0)
- para_printf(&pb, "%s\n", para_strerror(-ret));
+ ret = para_printf(&pb, "%s\n", para_strerror(-ret));
else
afs_event(ATTRIBUTE_RENAME, &pb, NULL);
- if (!pb.buf)
- return 0;
- result->data = pb.buf;
- result->size = pb.size;
- return 1;
+ if (pb.offset)
+ pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ free(pb.buf);
}
int com_mvatt(int fd, int argc, char * const * const argv)
{
- struct osl_object result;
int ret;
if (argc != 3)
return -E_ATTR_SYNTAX;
ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
- &result);
- if (!ret)
- return 1;
+ send_result, &fd);
if (ret < 0)
- return ret;
- if (!result.data || !result.size)
- return 1;
- ret = send_va_buffer(fd, "%s", (char *) result.data);
- free(result.data);
+ send_va_buffer(fd, "%s\n", para_strerror(-ret));
return ret;
}
struct rmatt_event_data red = {.name = name};
ret = get_attribute_bitnum_by_name(name, &red.bitnum);
- if (ret < 0) {
- para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
- return 1;
- }
+ if (ret < 0)
+ return para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
ret = osl_del_row(table, row);
- if (ret < 0) {
- para_printf(&raad->pb, "%s: %s\n", name, para_strerror(-ret));
- return 1;
- }
- para_printf(&raad->pb, "removed attribute %s\n", name);
+ 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);
raad->num_removed++;
raad->mask_of_removed_atts |= (1 << red.bitnum);
afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red);
- return 1;
+ return ret;
}
-static int com_rmatt_callback(const struct osl_object *query,
- struct osl_object *result)
+static void com_rmatt_callback(int fd, const struct osl_object *query)
{
- struct remove_attribute_action_data raad = {.num_removed = 0};
- int ret;
+ struct remove_attribute_action_data raad = {
+ .num_removed = 0,
+ .pb = {
+ .max_size = SHMMAX,
+ .private_data = &fd,
+ .max_size_handler = pass_buffer_as_shm
+ }
+ };
+ int ret, ret2 = 0;
struct pattern_match_data pmd = {
.table = attribute_table,
.patterns = *query,
};
ret = for_each_matching_row(&pmd);
if (ret < 0)
- para_printf(&raad.pb, "%s\n", para_strerror(-ret));
- if (!raad.num_removed)
- para_printf(&raad.pb, "no match -- nothing removed\n");
- result->data = raad.pb.buf;
- result->size = raad.pb.size;
- return 1;
+ ret2 = para_printf(&raad.pb, "%s\n", para_strerror(-ret));
+ 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);
+ free(raad.pb.buf);
}
int com_rmatt(int fd, int argc, char * const * const argv)
{
int ret;
- struct osl_object result;
if (argc < 2)
return -E_ATTR_SYNTAX;
ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
- &result);
- if (!ret)
- return 0;
- if (ret < 0) {
+ send_result, &fd);
+ if (ret < 0)
send_va_buffer(fd, "%s\n", para_strerror(-ret));
- return ret;
- }
- ret = send_buffer(fd, (char *)result.data);
- free(result.data);
return ret;
}
return osl_create_table(&attribute_table_desc);
}
-
+/**
+ * Initialize the attribute table structure.
+ *
+ * \param t The table structure to initialize.
+ */
void attribute_init(struct afs_table *t)
{
t->name = attribute_table_desc.name;
projects / paraslash.git / blobdiff