- Updated the address for the FSF in the opening comment.

[rsync/rsync.git] / backup.c

diff --git a/backup.c b/backup.c
index 4669c7e..b822358 100644 (file)
--- a/backup.c
+++ b/backup.c
@@ -1,27 +1,27 @@
 /*
-   Copyright (C) Andrew Tridgell 1999
-
-   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
-   the Free Software Foundation; either version 2 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
-   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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/* backup handling code */
+ * Backup handling code.
+ *
+ * Copyright (C) 1999 Andrew Tridgell
+ * Copyright (C) 2003, 2004, 2005, 2006 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
+ * the Free Software Foundation; either version 2 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
+ * 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
+ */
 
 #include "rsync.h"
 
 extern int verbose;
-extern int backup_suffix_len;
 extern int backup_dir_len;
 extern unsigned int backup_dir_remainder;
 extern char backup_dir_buf[MAXPATHLEN];
@@ -32,8 +32,6 @@ extern int am_root;
 extern int preserve_devices;
 extern int preserve_specials;
 extern int preserve_links;
-extern int preserve_hard_links;
-extern int orig_umask;
 extern int safe_symlinks;
 
 /* make a complete pathname for backup file */
@@ -112,7 +110,7 @@ static int make_bak_dir(char *fullpath)
                }
                if (*p == '/') {
                        *p = '\0';
-                       if (do_mkdir(fullpath, 0777 & ~orig_umask) == 0)
+                       if (mkdir_defmode(fullpath) == 0)
                                break;
                        if (errno != ENOENT) {
                                rsyserr(FERROR, errno,
@@ -141,7 +139,7 @@ static int make_bak_dir(char *fullpath)
                p += strlen(p);
                if (p == end)
                        break;
-               if (do_mkdir(fullpath, 0777 & ~orig_umask) < 0) {
+               if (mkdir_defmode(fullpath) < 0) {
                        rsyserr(FERROR, errno, "make_bak_dir mkdir %s failed",
                                full_fname(fullpath));
                        goto failure;