projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FEATURES: Fix a typo and use uniform capitalization for list items.
[paraslash.git]
/
attribute.c
diff --git
a/attribute.c
b/attribute.c
index 3acbadbebc149733287d49be1774e6363fcf83e4..c4bc0bcaa167d1fca0e302bbdd9331d8add5337c 100644
(file)
--- a/
attribute.c
+++ b/
attribute.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1997-200
7
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-200
8
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-134,7
+134,7
@@
static int print_attribute(struct osl_table *table, struct osl_row *row,
}
ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
if (ret < 0) {
}
ret = osl_get_object(table, row, ATTCOL_BITNUM, &bitnum_obj);
if (ret < 0) {
- para_printf(&laad->pb, "%s: %s\n", name,
PARA_STRERROR
(-ret));
+ 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 ret;
}
para_printf(&laad->pb, "%u\t%s\n", *(unsigned char*)bitnum_obj.data,
@@
-164,7
+164,7
@@
static int com_lsatt_callback(const struct osl_object *query,
pmd.pm_flags |= PM_REVERSE_LOOP;
ret = for_each_matching_row(&pmd);
if (ret < 0)
pmd.pm_flags |= PM_REVERSE_LOOP;
ret = for_each_matching_row(&pmd);
if (ret < 0)
- para_printf(&laad.pb, "%s\n",
PARA_STRERROR
(-ret));
+ para_printf(&laad.pb, "%s\n",
para_strerror
(-ret));
if (!laad.pb.buf)
return 0;
result->data = laad.pb.buf;
if (!laad.pb.buf)
return 0;
result->data = laad.pb.buf;
@@
-200,13
+200,19
@@
int com_lsatt(int fd, int argc, char * const * const argv)
continue;
}
}
continue;
}
}
- ret = send_option_arg_callback_request(&options, argc -i, argv + i,
+ ret = send_option_arg_callback_request(&options, argc -
i, argv + i,
com_lsatt_callback, &result);
com_lsatt_callback, &result);
- if (ret > 0) {
- ret = send_buffer(fd, (char *)result.data);
- free(result.data);
- } else
- send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+ if (!ret) {
+ if (argc > 1)
+ ret = send_va_buffer(fd, "no matches\n");
+ return ret;
+ }
+ 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 ret;
}
@@
-250,13
+256,13
@@
static int com_setatt_callback(const struct osl_object *query,
(long long unsigned)del_mask);
for (; p < (char *)query->data + query->size; p += len + 1) { /* TODO: fnmatch */
struct afs_info old_afsi, new_afsi;
(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
osl_row *aft_row
;
+ struct
afsi_change_event_data aced = {.old_afsi = &old_afsi}
;
len = strlen(p);
len = strlen(p);
- ret = aft_get_row_of_path(p, &aft_row);
+ ret = aft_get_row_of_path(p, &a
ced.a
ft_row);
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- ret = get_afsi_object_of_row(aft_row, &obj);
+ ret = get_afsi_object_of_row(a
ced.a
ft_row, &obj);
if (ret < 0)
return ret;
ret = load_afsi(&old_afsi, &obj);
if (ret < 0)
return ret;
ret = load_afsi(&old_afsi, &obj);
@@
-266,14
+272,14
@@
static int com_setatt_callback(const struct osl_object *query,
new_afsi.attributes |= add_mask;
new_afsi.attributes &= ~del_mask;
save_afsi(&new_afsi, &obj); /* in-place update */
new_afsi.attributes |= add_mask;
new_afsi.attributes &= ~del_mask;
save_afsi(&new_afsi, &obj); /* in-place update */
- // FIXME: Event?
+ afs_event(AFSI_CHANGE, NULL, &aced);
}
return 1;
}
int com_setatt(__a_unused int fd, int argc, char * const * const argv)
{
}
return 1;
}
int com_setatt(__a_unused int fd, int argc, char * const * const argv)
{
- if (argc <
2
)
+ if (argc <
3
)
return -E_ATTR_SYNTAX;
return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
NULL);
return -E_ATTR_SYNTAX;
return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
NULL);
@@
-304,18
+310,15
@@
static int com_addatt_callback(const struct osl_object *query,
para_printf(&pb, "invalid attribute name: %s\n", p);
continue;
}
para_printf(&pb, "invalid attribute name: %s\n", p);
continue;
}
- objs[ATTCOL_BITNUM].size = 1;
- objs[ATTCOL_NAME].data = p;
- objs[ATTCOL_NAME].size = len + 1;
- ret = osl_get_row(attribute_table, ATTCOL_NAME,
- &objs[ATTCOL_NAME], &row); /* expected to fail FIXME: Use get_attribute_bitnum_by_name() */
+ ret = get_attribute_bitnum_by_name(p, &bitnum);
if (ret >= 0) {
if (ret >= 0) {
- para_printf(&pb, "attribute
%s
already exists\n", p);
+ para_printf(&pb, "attribute
\"%s\"
already exists\n", p);
continue;
}
if (ret != -E_RB_KEY_NOT_FOUND) /* error */
goto out;
continue;
}
if (ret != -E_RB_KEY_NOT_FOUND) /* error */
goto out;
- /* find smallest non-used attribute FIXME: Use find_greatest_att_bitnum() */
+ 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,
for (bitnum = 0; bitnum < 64; bitnum++) {
objs[ATTCOL_BITNUM].data = &bitnum;
ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
@@
-327,9
+330,11
@@
static int com_addatt_callback(const struct osl_object *query,
/* this bit is already in use, try next bit */
}
if (bitnum == 64) {
/* this bit is already in use, try next bit */
}
if (bitnum == 64) {
-
para_printf(&pb, "attribute table full\n")
;
+
ret = -E_ATT_TABLE_FULL
;
goto out;
}
goto out;
}
+ objs[ATTCOL_NAME].data = p;
+ objs[ATTCOL_NAME].size = len + 1;
ret = osl_add_row(attribute_table, objs);
if (ret < 0)
goto out;
ret = osl_add_row(attribute_table, objs);
if (ret < 0)
goto out;
@@
-340,7
+345,7
@@
static int com_addatt_callback(const struct osl_object *query,
}
out:
if (ret < 0)
}
out:
if (ret < 0)
- para_printf(&pb, "%s: %s\n", p,
PARA_STRERROR
(-ret));
+ para_printf(&pb, "%s: %s\n", p,
para_strerror
(-ret));
result->data = pb.buf;
result->size = pb.size;
return result->data? 0 : 1;
result->data = pb.buf;
result->size = pb.size;
return result->data? 0 : 1;
@@
-385,7
+390,7
@@
static int com_mvatt_callback(const struct osl_object *query,
ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
out:
if (ret < 0)
ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
out:
if (ret < 0)
- para_printf(&pb, "%s\n",
PARA_STRERROR
(-ret));
+ para_printf(&pb, "%s\n",
para_strerror
(-ret));
else
afs_event(ATTRIBUTE_RENAME, &pb, NULL);
if (!pb.buf)
else
afs_event(ATTRIBUTE_RENAME, &pb, NULL);
if (!pb.buf)
@@
-434,12
+439,12
@@
static int remove_attribute(struct osl_table *table, struct osl_row *row,
ret = get_attribute_bitnum_by_name(name, &red.bitnum);
if (ret < 0) {
ret = get_attribute_bitnum_by_name(name, &red.bitnum);
if (ret < 0) {
- para_printf(&raad->pb, "%s: %s\n", name,
PARA_STRERROR
(-ret));
+ para_printf(&raad->pb, "%s: %s\n", name,
para_strerror
(-ret));
return 1;
}
ret = osl_del_row(table, row);
if (ret < 0) {
return 1;
}
ret = osl_del_row(table, row);
if (ret < 0) {
- para_printf(&raad->pb, "%s: %s\n", name,
PARA_STRERROR
(-ret));
+ para_printf(&raad->pb, "%s: %s\n", name,
para_strerror
(-ret));
return 1;
}
para_printf(&raad->pb, "removed attribute %s\n", name);
return 1;
}
para_printf(&raad->pb, "removed attribute %s\n", name);
@@
-464,7
+469,7
@@
static int com_rmatt_callback(const struct osl_object *query,
};
ret = for_each_matching_row(&pmd);
if (ret < 0)
};
ret = for_each_matching_row(&pmd);
if (ret < 0)
- para_printf(&raad.pb, "%s\n",
PARA_STRERROR
(-ret));
+ 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;
if (!raad.num_removed)
para_printf(&raad.pb, "no match -- nothing removed\n");
result->data = raad.pb.buf;
@@
-481,11
+486,14
@@
int com_rmatt(int fd, int argc, char * const * const argv)
return -E_ATTR_SYNTAX;
ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
&result);
return -E_ATTR_SYNTAX;
ret = send_standard_callback_request(argc - 1, argv + 1, com_rmatt_callback,
&result);
- if (ret > 0) {
- send_buffer(fd, (char *)result.data);
- free(result.data);
- } else
- send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+ if (!ret)
+ return 0;
+ 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 ret;
}
@@
-530,8
+538,10
@@
int get_attribute_text(uint64_t *atts, const char *delim, char **text)
const uint64_t one = 1;
*text = NULL;
const uint64_t one = 1;
*text = NULL;
- if (greatest_att_bitnum < 0) /* no attributes available */
+ if (greatest_att_bitnum < 0) { /* no attributes available */
+ *text = para_strdup("(no attributes available)");
return 1;
return 1;
+ }
for (i = 0; i <= greatest_att_bitnum; i++) {
unsigned char bn = i;
struct osl_object obj = {.data = &bn, .size = 1};
for (i = 0; i <= greatest_att_bitnum; i++) {
unsigned char bn = i;
struct osl_object obj = {.data = &bn, .size = 1};