if (!list->name)
continue;
len = strlen(list->name);
- write_abbrevint30(f, list->id);
+ write_varint30(f, list->id);
write_byte(f, len);
write_buf(f, list->name, len);
}
/* terminate the uid list with a 0 uid. We explicitly exclude
* 0 from the list */
- write_abbrevint30(f, 0);
+ write_varint30(f, 0);
}
if (preserve_gid || preserve_acls) {
if (!list->name)
continue;
len = strlen(list->name);
- write_abbrevint30(f, list->id);
+ write_varint30(f, list->id);
write_byte(f, len);
write_buf(f, list->name, len);
}
- write_abbrevint30(f, 0);
+ write_varint30(f, 0);
}
}
if ((preserve_uid || preserve_acls) && !numeric_ids) {
/* read the uid list */
- while ((id = read_abbrevint30(f)) != 0)
+ while ((id = read_varint30(f)) != 0)
recv_user_name(f, (uid_t)id);
}
if ((preserve_gid || preserve_acls) && !numeric_ids) {
/* read the gid list */
- while ((id = read_abbrevint30(f)) != 0)
+ while ((id = read_varint30(f)) != 0)
recv_group_name(f, (gid_t)id);
}
+ /* Now convert all the uids/gids from sender values to our values. */
#ifdef SUPPORT_ACLS
- if (preserve_acls && !numeric_ids) {
- id_t *id;
- while ((id = next_acl_uid(flist)) != NULL)
- *id = match_uid(*id);
- while ((id = next_acl_gid(flist)) != NULL)
- *id = match_gid(*id);
- }
+ if (preserve_acls && !numeric_ids)
+ match_acl_ids();
#endif
-
- /* Now convert all the uids/gids from sender values to our values. */
if (am_root && preserve_uid && !numeric_ids) {
for (i = 0; i < flist->count; i++)
F_OWNER(flist->files[i]) = match_uid(F_UID(flist->files[i]));