Simplify pass_buffer_as_shm().

[paraslash.git] / attribute.c

diff --git a/attribute.c b/attribute.c
index d94589871562038a7ba96aad85c741de0db05b65..8dcfa28fa6c5f77e4ae8f02cfc045ee0ec401bf6 100644 (file)
--- a/attribute.c
+++ b/attribute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file attribute.c Attribute handling functions. */
 
 #include <regex.h>
-#include <openssl/rc4.h>
 #include <osl.h>
 
 #include "para.h"
@@ -16,8 +15,9 @@
 #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;
@@ -151,9 +151,11 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
        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,
+                       },
+                       .max_size_handler = afs_max_size_handler
                }
 
        };
@@ -173,18 +175,18 @@ static void com_lsatt_callback(int fd, const struct osl_object *query)
                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, laad.pb.buf, laad.pb.offset);
        free(laad.pb.buf);
 }
 
-int com_lsatt(struct rc4_context *rc4c, 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, "--")) {
@@ -204,13 +206,13 @@ int com_lsatt(struct rc4_context *rc4c, int argc, char * const * const argv)
                        continue;
                }
        }
-       ret = send_option_arg_callback_request(&options, argc - i, argv + i,
-               com_lsatt_callback, rc4_send_result, rc4c);
+       ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i,
+               com_lsatt_callback, afs_cb_result_handler, cc);
        if (!ret) {
-               if (argc > 1)
-                       ret = rc4_send_va_buffer(rc4c, "no matches\n");
+               if (cc->argc > 1)
+                       ret = sc_send_va_buffer(&cc->scc, "no matches\n");
        } else if (ret < 0)
-               rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+               sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
        return ret;
 }
 
@@ -278,12 +280,12 @@ out:
                PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
-int com_setatt(__a_unused struct rc4_context *rc4c, 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 {
@@ -297,9 +299,11 @@ static void com_addatt_callback(int fd, const struct osl_object *query)
        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,
+               },
+               .max_size_handler = afs_max_size_handler
        };
        size_t len;
 
@@ -355,20 +359,20 @@ out:
        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, pb.buf, pb.offset);
        free(pb.buf);
 }
 
-int com_addatt(struct rc4_context *rc4c, 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,
-               rc4_send_result, rc4c);
+       ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+               com_addatt_callback, afs_cb_result_handler, cc);
        if (ret < 0)
-               rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+               sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
        return ret;
 }
 
@@ -380,9 +384,11 @@ static void com_mvatt_callback(int fd, const struct osl_object *query)
        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,
+               },
+               .max_size_handler = afs_max_size_handler,
        };
        int ret;
 
@@ -398,20 +404,20 @@ out:
        else
                afs_event(ATTRIBUTE_RENAME, &pb, NULL);
        if (pb.offset)
-               pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+               pass_buffer_as_shm(fd, pb.buf, pb.offset);
        free(pb.buf);
 }
 
-int com_mvatt(struct rc4_context *rc4c, 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,
-               rc4_send_result, rc4c);
+       ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+               com_mvatt_callback, afs_cb_result_handler, cc);
        if (ret < 0)
-               rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+               sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
        return ret;
 }
 
@@ -450,9 +456,11 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
        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,
+                       },
+                       .max_size_handler = afs_max_size_handler,
                }
        };
        int ret, ret2 = 0;
@@ -470,20 +478,20 @@ static void com_rmatt_callback(int fd, const struct osl_object *query)
        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, raad.pb.buf, raad.pb.offset);
        free(raad.pb.buf);
 }
 
-int com_rmatt(struct rc4_context *rc4c, 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,
-               rc4_send_result, rc4c);
+       ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+               com_rmatt_callback, afs_cb_result_handler, cc);
        if (ret < 0)
-               rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
+               sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
        return ret;
 }