X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=7777a8ddc4cdf2a9a25f9a2b67f1935277d371ae;hp=edf3baf51fa376708785eaa014f321eaff827aa4;hb=093dda1824631372587d107d64601389027c6187;hpb=2830b9f881898aaec073d5ba19e33482e30190bd diff --git a/attribute.c b/attribute.c index edf3baf5..7777a8dd 100644 --- a/attribute.c +++ b/attribute.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2012 Andre Noll + * Copyright (C) 1997-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -154,6 +154,7 @@ static void com_lsatt_callback(int fd, const struct osl_object *query) .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 } @@ -175,7 +176,7 @@ 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, SBD_OUTPUT, laad.pb.buf, laad.pb.offset); free(laad.pb.buf); } @@ -208,84 +209,11 @@ int com_lsatt(struct command_context *cc) } ret = send_option_arg_callback_request(&options, cc->argc - i, cc->argv + i, com_lsatt_callback, afs_cb_result_handler, cc); - if (!ret) { - if (cc->argc > 1) - ret = sc_send_va_buffer(&cc->scc, "no matches\n"); - } else if (ret < 0) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); - return ret; -} - -static void com_setatt_callback(__a_unused int fd, const struct osl_object *query) -{ - char *p; - uint64_t add_mask = 0, del_mask = 0; - int ret; - size_t len; - struct osl_object obj; - struct osl_row *row; - - for (p = query->data; p < (char *)query->data + query->size; p += len + 1) { - char c; - - len = strlen(p); - ret = -E_ATTR_SYNTAX; - if (!*p) - goto out; - c = p[len - 1]; - if (c != '+' && c != '-') - break; - p[len - 1] = '\0'; - obj.data = p; - obj.size = len + 1; - ret = osl(osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row)); - if (ret < 0) - goto out; - ret = osl(osl_get_object(attribute_table, row, ATTCOL_BITNUM, - &obj)); - if (ret < 0) - 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) - 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 */ - struct afs_info old_afsi, new_afsi; - struct afsi_change_event_data aced = {.old_afsi = &old_afsi}; - - len = strlen(p); - ret = aft_get_row_of_path(p, &aced.aft_row); - if (ret < 0) - goto out; - ret = get_afsi_object_of_row(aced.aft_row, &obj); - if (ret < 0) - goto out; - ret = load_afsi(&old_afsi, &obj); - if (ret < 0) - 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); - } -out: if (ret < 0) - PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); -} - -int com_setatt(struct command_context *cc) -{ - if (cc->argc < 3) - return -E_ATTR_SYNTAX; - return send_standard_callback_request(cc->argc - 1, cc->argv + 1, - com_setatt_callback, NULL, NULL); + send_strerror(cc, -ret); + else if (ret == 0 && cc->argc > 1) + ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "no matches\n"); + return ret; } struct addatt_event_data { @@ -302,6 +230,7 @@ static void com_addatt_callback(int fd, const struct osl_object *query) .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 }; @@ -359,7 +288,7 @@ 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, SBD_OUTPUT, pb.buf, pb.offset); free(pb.buf); } @@ -372,7 +301,7 @@ int com_addatt(struct command_context *cc) ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, com_addatt_callback, afs_cb_result_handler, cc); if (ret < 0) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -387,6 +316,7 @@ static void com_mvatt_callback(int fd, const struct osl_object *query) .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, }; @@ -404,7 +334,7 @@ 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, SBD_OUTPUT, pb.buf, pb.offset); free(pb.buf); } @@ -417,7 +347,7 @@ int com_mvatt(struct command_context *cc) ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, com_mvatt_callback, afs_cb_result_handler, cc); if (ret < 0) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -425,7 +355,7 @@ int com_mvatt(struct command_context *cc) struct remove_attribute_action_data { /** Message buffer. */ struct para_buffer pb; - /** Numver of attributes removed. */ + /** Number of attributes removed. */ int num_removed; /** Bitwise "or" of the removed attributes. */ uint64_t mask_of_removed_atts; @@ -459,6 +389,7 @@ static void com_rmatt_callback(int fd, const struct osl_object *query) .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, } @@ -478,7 +409,7 @@ 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, SBD_OUTPUT, raad.pb.buf, raad.pb.offset); free(raad.pb.buf); } @@ -491,7 +422,7 @@ int com_rmatt(struct command_context *cc) ret = send_standard_callback_request(cc->argc - 1, cc->argv + 1, com_rmatt_callback, afs_cb_result_handler, cc); if (ret < 0) - sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret)); + send_strerror(cc, -ret); return ret; } @@ -507,7 +438,7 @@ int com_rmatt(struct command_context *cc) * used for unset attributes. * * In practice, not all 64 attributes are defined. In this case, the function - * only prints \a N + 1 charaters where \a N is the greatest id of a defined + * only prints \a N + 1 characters where \a N is the greatest id of a defined * attribute. */ void get_attribute_bitmap(const uint64_t *atts, char *buf)