Split code to generate "rwx-----" strings into lib/permstring.c so it

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index ed6d75e..561ea73 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -56,7 +56,7 @@ void init_hard_links(struct file_list *flist)
                out_of_memory("init_hard_links");
 
        for (i = 0; i < flist->count; i++)
-               bcopy(flist->files[i], &hlink_list[i], sizeof(hlink_list[0]));
+               memcpy(&hlink_list[i], flist->files[i], sizeof(hlink_list[0]));
 
        qsort(hlink_list,flist->count,
              sizeof(hlink_list[0]),
@@ -120,7 +120,7 @@ static void hard_link_one(int i)
        } else {
                if (st2.st_dev == st1.st_dev && st2.st_ino == st1.st_ino) return;
                
-               if (do_unlink(f_name(&hlink_list[i])) != 0 ||
+               if (robust_unlink(f_name(&hlink_list[i])) != 0 ||
                    do_link(f_name(&hlink_list[i-1]),f_name(&hlink_list[i])) != 0) {
                        if (verbose > 0)
                                rprintf(FINFO,"link %s => %s : %s\n",