Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
987838f
)
Use the abbrevint30 routines in a few more places.
author
Wayne Davison
<wayned@samba.org>
Sun, 11 Mar 2007 05:59:46 +0000
(
05:59
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 11 Mar 2007 05:59:46 +0000
(
05:59
+0000)
uidlist.c
patch
|
blob
|
blame
|
history
diff --git
a/uidlist.c
b/uidlist.c
index
2503d8a
..
32351a2
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-24,6
+24,7
@@
* are special. */
#include "rsync.h"
* are special. */
#include "rsync.h"
+#include "io.h"
#ifdef HAVE_GETGROUPS
# ifndef GETGROUPS_T
#ifdef HAVE_GETGROUPS
# ifndef GETGROUPS_T
@@
-279,14
+280,14
@@
void send_uid_list(int f)
if (!list->name)
continue;
len = strlen(list->name);
if (!list->name)
continue;
len = strlen(list->name);
- write_
int
(f, list->id);
+ write_
abbrevint30
(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_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_
int
(f, 0);
+ write_
abbrevint30
(f, 0);
}
if (preserve_gid || preserve_acls) {
}
if (preserve_gid || preserve_acls) {
@@
-295,11
+296,11
@@
void send_uid_list(int f)
if (!list->name)
continue;
len = strlen(list->name);
if (!list->name)
continue;
len = strlen(list->name);
- write_
int
(f, list->id);
+ write_
abbrevint30
(f, list->id);
write_byte(f, len);
write_buf(f, list->name, len);
}
write_byte(f, len);
write_buf(f, list->name, len);
}
- write_
int
(f, 0);
+ write_
abbrevint30
(f, 0);
}
}
}
}
@@
-331,13
+332,13
@@
void recv_uid_list(int f, struct file_list *flist)
if ((preserve_uid || preserve_acls) && !numeric_ids) {
/* read the uid list */
if ((preserve_uid || preserve_acls) && !numeric_ids) {
/* read the uid list */
- while ((id = read_
int
(f)) != 0)
+ while ((id = read_
abbrevint30
(f)) != 0)
recv_user_name(f, (uid_t)id);
}
if ((preserve_gid || preserve_acls) && !numeric_ids) {
/* read the gid list */
recv_user_name(f, (uid_t)id);
}
if ((preserve_gid || preserve_acls) && !numeric_ids) {
/* read the gid list */
- while ((id = read_
int
(f)) != 0)
+ while ((id = read_
abbrevint30
(f)) != 0)
recv_group_name(f, (gid_t)id);
}
recv_group_name(f, (gid_t)id);
}