- Typical tranfers now save 12-20 bytes per file because several vars

[rsync/rsync.git] / uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 5b25243..8104eca 100644 (file)
--- a/uidlist.c
+++ b/uidlist.c
@@ -15,9 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /* If the source username/group does not exist on the target then use
@@ -126,12 +126,10 @@ static int is_in_group(gid_t gid)
                        char *gidbuf = new_array(char, ngroups*21+32);
                        if (!gidbuf)
                                out_of_memory("is_in_group");
-                       sprintf(gidbuf, "process has %d gid%s: ",
-                           ngroups, ngroups == 1? "" : "s");
-                       pos = strlen(gidbuf);
+                       pos = snprintf(gidbuf, 32, "process has %d gid%s: ",
+                                      ngroups, ngroups == 1? "" : "s");
                        for (n = 0; n < ngroups; n++) {
-                               sprintf(gidbuf+pos, " %d", (int)gidset[n]);
-                               pos += strlen(gidbuf+pos);
+                               pos += snprintf(gidbuf+pos, 21, " %d", (int)gidset[n]);
                        }
                        rprintf(FINFO, "%s\n", gidbuf);
                        free(gidbuf);
@@ -272,9 +270,6 @@ void send_uid_list(int f)
 {
        struct idlist *list;
 
-       if (numeric_ids)
-               return;
-
        if (preserve_uid) {
                int len;
                /* we send sequences of uid/byte-length/name */
@@ -340,10 +335,10 @@ void recv_uid_list(int f, struct file_list *flist)
        /* 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++)
-                       flist->files[i]->uid = match_uid(flist->files[i]->uid);
+                       F_UID(flist->files[i]) = match_uid(F_UID(flist->files[i]));
        }
        if (preserve_gid && (!am_root || !numeric_ids)) {
                for (i = 0; i < flist->count; i++)
-                       flist->files[i]->gid = match_gid(flist->files[i]->gid);
+                       F_GID(flist->files[i]) = match_gid(F_GID(flist->files[i]));
        }
 }