Include 2008 in the copyright years.

[rsync/rsync.git] / uidlist.c

diff --git a/uidlist.c b/uidlist.c
index bce11e9..3d9c774 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -3,11 +3,12 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-2007 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -42,7 +43,7 @@ extern int numeric_ids;
 
 struct idlist {
        struct idlist *next;
-       char *name;
+       const char *name;
        id_t id, id2;
        uint16 flags;
 };
@@ -50,7 +51,7 @@ struct idlist {
 static struct idlist *uidlist;
 static struct idlist *gidlist;
 
-static struct idlist *add_to_list(struct idlist **root, id_t id, char *name,
+static struct idlist *add_to_list(struct idlist **root, id_t id, const char *name,
                                  id_t id2, uint16 flags)
 {
        struct idlist *node = new(struct idlist);
@@ -66,7 +67,7 @@ static struct idlist *add_to_list(struct idlist **root, id_t id, char *name,
 }
 
 /* turn a uid into a user name */
-static char *uid_to_name(uid_t uid)
+static const char *uid_to_name(uid_t uid)
 {
        struct passwd *pass = getpwuid(uid);
        if (pass)
@@ -75,7 +76,7 @@ static char *uid_to_name(uid_t uid)
 }
 
 /* turn a gid into a group name */
-static char *gid_to_name(gid_t gid)
+static const char *gid_to_name(gid_t gid)
 {
        struct group *grp = getgrgid(gid);
        if (grp)
@@ -83,7 +84,7 @@ static char *gid_to_name(gid_t gid)
        return NULL;
 }
 
-static uid_t map_uid(uid_t id, char *name)
+static uid_t map_uid(uid_t id, const char *name)
 {
        uid_t uid;
        if (id != 0 && name_to_uid(name, &uid))
@@ -91,7 +92,7 @@ static uid_t map_uid(uid_t id, char *name)
        return id;
 }
 
-static gid_t map_gid(gid_t id, char *name)
+static gid_t map_gid(gid_t id, const char *name)
 {
        gid_t gid;
        if (id != 0 && name_to_gid(name, &gid))
@@ -159,7 +160,7 @@ static int is_in_group(gid_t gid)
 }
 
 /* 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, const char *name)
 {
        uid_t id2 = name ? map_uid(id, name) : id;
        struct idlist *node;
@@ -175,7 +176,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. */
-static struct idlist *recv_add_gid(gid_t id, char *name)
+static struct idlist *recv_add_gid(gid_t id, const char *name)
 {
        gid_t id2 = name ? map_gid(id, name) : id;
        struct idlist *node;
@@ -236,7 +237,7 @@ gid_t match_gid(gid_t gid, uint16 *flags_ptr)
 }
 
 /* Add a uid to the list of uids.  Only called on sending side. */
-char *add_uid(uid_t uid)
+const char *add_uid(uid_t uid)
 {
        struct idlist *list;
        struct idlist *node;
@@ -254,7 +255,7 @@ char *add_uid(uid_t uid)
 }
 
 /* Add a gid to the list of gids.  Only called on sending side. */
-char *add_gid(gid_t gid)
+const char *add_gid(gid_t gid)
 {
        struct idlist *list;
        struct idlist *node;
@@ -315,6 +316,10 @@ uid_t recv_user_name(int f, uid_t uid)
        if (!name)
                out_of_memory("recv_user_name");
        read_sbuf(f, name, len);
+       if (numeric_ids < 0) {
+               free(name);
+               name = NULL;
+       }
        node = recv_add_uid(uid, name); /* node keeps name's memory */
        return node->id2;
 }
@@ -327,6 +332,10 @@ gid_t recv_group_name(int f, gid_t gid, uint16 *flags_ptr)
        if (!name)
                out_of_memory("recv_group_name");
        read_sbuf(f, name, len);
+       if (numeric_ids < 0) {
+               free(name);
+               name = NULL;
+       }
        node = recv_add_gid(gid, name); /* node keeps name's memory */
        if (flags_ptr && node->flags & FLAG_SKIP_GROUP)
                *flags_ptr |= FLAG_SKIP_GROUP;
@@ -340,13 +349,13 @@ void recv_id_list(int f, struct file_list *flist)
        id_t id;
        int i;
 
-       if ((preserve_uid || preserve_acls) && !numeric_ids) {
+       if ((preserve_uid || preserve_acls) && numeric_ids <= 0) {
                /* read the uid list */
                while ((id = read_varint30(f)) != 0)
                        recv_user_name(f, id);
        }
 
-       if ((preserve_gid || preserve_acls) && !numeric_ids) {
+       if ((preserve_gid || preserve_acls) && numeric_ids <= 0) {
                /* read the gid list */
                while ((id = read_varint30(f)) != 0)
                        recv_group_name(f, id, NULL);
@@ -358,11 +367,11 @@ void recv_id_list(int f, struct file_list *flist)
                match_acl_ids();
 #endif
        if (am_root && preserve_uid && !numeric_ids) {
-               for (i = 0; i < flist->count; i++)
+               for (i = 0; i < flist->used; i++)
                        F_OWNER(flist->files[i]) = match_uid(F_OWNER(flist->files[i]));
        }
        if (preserve_gid && (!am_root || !numeric_ids)) {
-               for (i = 0; i < flist->count; i++) {
+               for (i = 0; i < flist->used; i++) {
                        F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
                                                             &flist->files[i]->flags);
                }