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
Enhanced the --stats output:
[rsync/rsync.git]
/
uidlist.c
diff --git
a/uidlist.c
b/uidlist.c
index
bb7a301
..
d9ca7a2
100644
(file)
--- a/
uidlist.c
+++ b/
uidlist.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-200
7
Wayne Davison
+ * Copyright (C) 2004-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-26,7
+26,6
@@
#include "rsync.h"
#include "io.h"
#include "rsync.h"
#include "io.h"
-extern int verbose;
extern int am_root;
extern int preserve_uid;
extern int preserve_gid;
extern int am_root;
extern int preserve_uid;
extern int preserve_gid;
@@
-84,7
+83,7
@@
static const char *gid_to_name(gid_t gid)
return NULL;
}
return NULL;
}
-static uid_t map_uid(uid_t id, char *name)
+static uid_t map_uid(uid_t id, c
onst c
har *name)
{
uid_t uid;
if (id != 0 && name_to_uid(name, &uid))
{
uid_t uid;
if (id != 0 && name_to_uid(name, &uid))
@@
-92,7
+91,7
@@
static uid_t map_uid(uid_t id, char *name)
return id;
}
return id;
}
-static gid_t map_gid(gid_t id, char *name)
+static gid_t map_gid(gid_t id, c
onst c
har *name)
{
gid_t gid;
if (id != 0 && name_to_gid(name, &gid))
{
gid_t gid;
if (id != 0 && name_to_gid(name, &gid))
@@
-126,7
+125,7
@@
static int is_in_group(gid_t gid)
}
if (n == ngroups)
gidset[ngroups++] = mygid;
}
if (n == ngroups)
gidset[ngroups++] = mygid;
- if (
verbose > 3
) {
+ if (
DEBUG_GTE(OWN, 2)
) {
int pos;
char *gidbuf = new_array(char, ngroups*21+32);
if (!gidbuf)
int pos;
char *gidbuf = new_array(char, ngroups*21+32);
if (!gidbuf)
@@
-152,7
+151,7
@@
static int is_in_group(gid_t gid)
static gid_t mygid = GID_NONE;
if (mygid == GID_NONE) {
mygid = MY_GID();
static gid_t mygid = GID_NONE;
if (mygid == GID_NONE) {
mygid = MY_GID();
- if (
verbose > 3
)
+ if (
DEBUG_GTE(OWN, 2)
)
rprintf(FINFO, "process has gid %u\n", (unsigned)mygid);
}
return gid == mygid;
rprintf(FINFO, "process has gid %u\n", (unsigned)mygid);
}
return gid == mygid;
@@
-160,14
+159,14
@@
static int is_in_group(gid_t gid)
}
/* Add a uid to the list of uids. Only called on receiving side. */
}
/* Add a uid to the list of uids. Only called on receiving side. */
-static struct idlist *recv_add_uid(uid_t id, char *name)
+static struct idlist *recv_add_uid(uid_t id, c
onst c
har *name)
{
uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
node = add_to_list(&uidlist, id, name, id2, 0);
{
uid_t id2 = name ? map_uid(id, name) : id;
struct idlist *node;
node = add_to_list(&uidlist, id, name, id2, 0);
- if (
verbose > 3
) {
+ if (
DEBUG_GTE(OWN, 2)
) {
rprintf(FINFO, "uid %u(%s) maps to %u\n",
(unsigned)id, name ? name : "", (unsigned)id2);
}
rprintf(FINFO, "uid %u(%s) maps to %u\n",
(unsigned)id, name ? name : "", (unsigned)id2);
}
@@
-176,7
+175,7
@@
static struct idlist *recv_add_uid(uid_t id, char *name)
}
/* Add a gid to the list of gids. Only called on receiving side. */
}
/* Add a gid to the list of gids. Only called on receiving side. */
-static struct idlist *recv_add_gid(gid_t id, char *name)
+static struct idlist *recv_add_gid(gid_t id, c
onst c
har *name)
{
gid_t id2 = name ? map_gid(id, name) : id;
struct idlist *node;
{
gid_t id2 = name ? map_gid(id, name) : id;
struct idlist *node;
@@
-184,7
+183,7
@@
static struct idlist *recv_add_gid(gid_t id, char *name)
node = add_to_list(&gidlist, id, name, id2,
!am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0);
node = add_to_list(&gidlist, id, name, id2,
!am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0);
- if (
verbose > 3
) {
+ if (
DEBUG_GTE(OWN, 2)
) {
rprintf(FINFO, "gid %u(%s) maps to %u\n",
(unsigned)id, name ? name : "", (unsigned)id2);
}
rprintf(FINFO, "gid %u(%s) maps to %u\n",
(unsigned)id, name ? name : "", (unsigned)id2);
}