Switching to GPL 3.

[rsync/rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index 49985fa..aacac8c 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2003-2007 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 2 as
+ * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  * 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -127,7 +126,7 @@ static int make_bak_dir(char *fullpath)
                if (p >= rel) {
                        /* Try to transfer the directory settings of the
                         * actual dir that the files are coming from. */
-                       if (do_stat(rel, &sx.st) < 0) {
+                       if (x_stat(rel, &sx.st, NULL) < 0) {
                                rsyserr(FERROR, errno,
                                        "make_bak_dir stat %s failed",
                                        full_fname(rel));
@@ -155,7 +154,7 @@ static int make_bak_dir(char *fullpath)
                                }
 #endif
                                set_file_attrs(fullpath, file, NULL, NULL, 0);
-                               free(file);
+                               unmake_file(file);
                        }
                }
                *p = '/';
@@ -200,7 +199,7 @@ static int keep_backup(const char *fname)
        int ret_code;
 
        /* return if no file to keep */
-       if (do_lstat(fname, &sx.st) < 0)
+       if (x_lstat(fname, &sx.st, NULL) < 0)
                return 1;
 #ifdef SUPPORT_ACLS
        sx.acc_acl = sx.def_acl = NULL;