Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed dup-detection code to keep the first item in the user's args.
[rsync/rsync.git]
/
uidlist.c
diff --git
a/uidlist.c
b/uidlist.c
index
93fc10e
..
dea3804
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-26,12
+26,6
@@
#include "rsync.h"
#include "io.h"
#include "rsync.h"
#include "io.h"
-#ifdef HAVE_GETGROUPS
-# ifndef GETGROUPS_T
-# define GETGROUPS_T gid_t
-# endif
-#endif
-
extern int verbose;
extern int am_root;
extern int preserve_uid;
extern int verbose;
extern int am_root;
extern int preserve_uid;
@@
-39,6
+33,14
@@
extern int preserve_gid;
extern int preserve_acls;
extern int numeric_ids;
extern int preserve_acls;
extern int numeric_ids;
+#ifdef HAVE_GETGROUPS
+# ifndef GETGROUPS_T
+# define GETGROUPS_T gid_t
+# endif
+#endif
+
+#define GID_NONE ((gid_t)-1)
+
struct idlist {
struct idlist *next;
char *name;
struct idlist {
struct idlist *next;
char *name;
@@
-214,28
+216,24
@@
uid_t match_uid(uid_t uid)
gid_t match_gid(gid_t gid, uint16 *flags_ptr)
{
gid_t match_gid(gid_t gid, uint16 *flags_ptr)
{
- static
gid_t last_in = GID_NONE, last_out = GID_NONE
;
+ static
struct idlist *last = NULL
;
struct idlist *list;
struct idlist *list;
- if (gid == GID_NONE)
- return GID_NONE;
-
- if (gid == last_in)
- return last_out;
-
- last_in = gid;
-
- for (list = gidlist; list; list = list->next) {
- if (list->id == gid)
- break;
+ if (last && gid == last->id)
+ list = last;
+ else {
+ for (list = gidlist; list; list = list->next) {
+ if (list->id == gid)
+ break;
+ }
+ if (!list)
+ list = recv_add_gid(gid, NULL);
+ last = list;
}
}
- if (!list)
- list = recv_add_gid(gid, NULL);
-
if (flags_ptr && list->flags & FLAG_SKIP_GROUP)
*flags_ptr |= FLAG_SKIP_GROUP;
if (flags_ptr && list->flags & FLAG_SKIP_GROUP)
*flags_ptr |= FLAG_SKIP_GROUP;
- return l
ast_out = l
ist->id2;
+ return list->id2;
}
/* Add a uid to the list of uids. Only called on sending side. */
}
/* Add a uid to the list of uids. Only called on sending side. */