Marc St-Onge
---- orig/backup.c 2005-02-22 02:10:16
-+++ backup.c 2005-02-22 02:11:15
-@@ -22,11 +22,17 @@
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/backup-dir-dels.diff
+ ./configure (optional if already run)
+ make
+
+--- old/backup.c
++++ new/backup.c
+@@ -23,10 +23,15 @@
extern int verbose;
- extern int backup_suffix_len;
-+extern int backup_suffix_dels_len;
extern int backup_dir_len;
+extern int backup_dir_dels_len;
extern unsigned int backup_dir_remainder;
extern int am_root;
extern int preserve_devices;
-@@ -35,6 +41,8 @@ extern int preserve_hard_links;
- extern int orig_umask;
+@@ -34,6 +39,8 @@ extern int preserve_specials;
+ extern int preserve_links;
extern int safe_symlinks;
+static int deleting;
+
/* make a complete pathname for backup file */
- char *get_backup_name(char *fname)
+ char *get_backup_name(const char *fname)
{
-@@ -52,11 +60,28 @@ char *get_backup_name(char *fname)
+@@ -51,11 +58,28 @@ char *get_backup_name(const char *fname)
return NULL;
}
-+static char *get_delete_name(char *fname)
++static char *get_delete_name(const char *fname)
+{
+ if (backup_dir_dels) {
+ if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder,
+}
+
/* simple backup creates a backup with a suffix in the same directory */
- static int make_simple_backup(char *fname)
+ static int make_simple_backup(const char *fname)
{
int rename_errno;
-- char *fnamebak = get_backup_name(fname);
-+ char *fnamebak = deleting ? get_delete_name(fname)
-+ : get_backup_name(fname);
+- const char *fnamebak = get_backup_name(fname);
++ const char *fnamebak = deleting ? get_delete_name(fname)
++ : get_backup_name(fname);
if (!fnamebak)
return 0;
-@@ -97,7 +122,8 @@ path
+@@ -95,7 +119,8 @@ path
static int make_bak_dir(char *fullpath)
{
STRUCT_STAT st;
char *end = rel + strlen(rel);
char *p = end;
-@@ -184,7 +210,8 @@ static int keep_backup(char *fname)
- if (!(file = make_file(fname, NULL, NO_FILTERS)))
+@@ -185,7 +210,8 @@ static int keep_backup(const char *fname
+ if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
- if (!(buf = get_backup_name(fname)))
return 0;
/* Check to see if this is a device file, or link */
-@@ -277,3 +304,13 @@ int make_backup(char *fname)
+@@ -280,3 +306,13 @@ int make_backup(const char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
+ deleting = 0;
+ return ret;
+}
---- orig/generator.c 2005-02-27 18:24:42
-+++ generator.c 2005-02-26 19:31:06
-@@ -82,16 +82,23 @@ extern dev_t filesystem_dev;
+--- old/generator.c
++++ new/generator.c
+@@ -90,6 +90,9 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
+extern char *backup_dir_dels;
+extern char *backup_suffix_dels;
+extern int backup_suffix_dels_len;
-
+ extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
- static int deletion_count = 0; /* used to implement --max-delete */
+@@ -115,10 +118,14 @@ enum delret {
+ static enum delret delete_dir_contents(char *fname, int flags);
-+/* Function now checks if file matches backup- or delete-suffix patterns. */
++/* Function now compares both backup_suffix and backup_suffix_dels. */
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
+ return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
}
-
-@@ -109,8 +116,8 @@ static int delete_item(char *fname, int
- return -1;
-
- if (!S_ISDIR(mode)) {
-- if (make_backups && (backup_dir || !is_backup_file(fname)))
-- ok = make_backup(fname);
-+ if (make_backups && (backup_dir_dels || !is_backup_file(fname)))
-+ ok = safe_delete(fname);
- else
- ok = robust_unlink(fname) == 0;
- if (ok) {
-@@ -131,9 +138,9 @@ static int delete_item(char *fname, int
- if (dry_run && zap_dir) {
- ok = 0;
- errno = ENOTEMPTY;
-- } else if (make_backups && !backup_dir && !is_backup_file(fname)
-+ } else if (make_backups && !backup_dir_dels && !is_backup_file(fname)
- && !(flags & DEL_FORCE_RECURSE))
-- ok = make_backup(fname);
-+ ok = safe_delete(fname);
- else
- ok = do_rmdir(fname) == 0;
- if (ok) {
---- orig/options.c 2005-03-01 05:49:24
-+++ options.c 2005-03-01 01:25:39
-@@ -127,10 +127,14 @@ int no_detach
+ /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
+@@ -154,9 +161,9 @@ static enum delret delete_item(char *fbu
+ if (S_ISDIR(mode)) {
+ what = "rmdir";
+ ok = do_rmdir(fbuf) == 0;
+- } else if (make_backups && (backup_dir || !is_backup_file(fbuf))) {
++ } else if (make_backups && (backup_dir_dels || !is_backup_file(fbuf))) {
+ what = "make_backup";
+- ok = make_backup(fbuf);
++ ok = safe_delete(fbuf);
+ } else {
+ what = "unlink";
+ ok = robust_unlink(fbuf) == 0;
+--- old/options.c
++++ new/options.c
+@@ -138,10 +138,14 @@ int no_detach
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -140,7 +144,9 @@ char *log_format = NULL;
+@@ -153,7 +157,9 @@ char *stdout_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
+char *backup_dir_dels = NULL;
char backup_dir_buf[MAXPATHLEN];
+char backup_dir_dels_buf[MAXPATHLEN];
+ char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
- int link_dest = 0;
-@@ -270,6 +276,8 @@ void usage(enum logcode F)
+@@ -288,6 +294,8 @@ void usage(enum logcode F)
rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
+ rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (defaults to --suffix)\n");
rprintf(F," -u, --update skip files that are newer on the receiver\n");
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
- rprintf(F," -d, --dirs transfer directories without recursing\n");
-@@ -364,6 +372,7 @@ static struct poptOption long_options[]
- /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
- {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0},
- {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-+ {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 },
- {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
- {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
- {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
-@@ -443,6 +452,7 @@ static struct poptOption long_options[]
- {"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 0, 0, 0 },
+ rprintf(F," --append append data onto shorter files\n");
+@@ -516,7 +524,9 @@ static struct poptOption long_options[]
{"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
+ {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
+ {"backup-dir-dels", 0, POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 },
- {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
+ {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
++ {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 },
+ {"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
-@@ -1004,6 +1014,8 @@ int parse_arguments(int *argc, const cha
- partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+@@ -1230,6 +1240,8 @@ int parse_arguments(int *argc, const cha
+ tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
if (backup_dir)
- backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
-+ if (backup_dir_dels)
-+ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
+ backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
++ if (backup_dir_dels)
++ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL);
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
-@@ -1038,6 +1050,14 @@ int parse_arguments(int *argc, const cha
- return 0;
- }
+@@ -1247,6 +1259,14 @@ int parse_arguments(int *argc, const cha
+ if (check_filter(elp, backup_dir, 1) < 0)
+ goto options_rejected;
}
+ /* Clean backup_dir_dels same as for backup_dir */
+ if (backup_dir_dels) {
}
if (!backup_suffix)
-@@ -1049,6 +1069,16 @@ int parse_arguments(int *argc, const cha
+@@ -1258,6 +1278,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);
return 0;
}
if (backup_dir) {
backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
-@@ -1070,6 +1100,31 @@ int parse_arguments(int *argc, const cha
- "--suffix cannot be a null string without --backup-dir\n");
- return 0;
+@@ -1281,6 +1311,31 @@ int parse_arguments(int *argc, const cha
+ "P *%s", backup_suffix);
+ parse_rule(&filter_list, backup_dir_buf, 0, 0);
}
+ /* If backup_dir_dels not supplied default to backup_dir if it has been supplied */
+ if (backup_dir && !backup_dir_dels) {
if (make_backups && !backup_dir)
omit_dir_times = 1;
-@@ -1348,6 +1403,10 @@ void server_options(char **args,int *arg
+@@ -1645,6 +1700,10 @@ void server_options(char **args,int *arg
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
-+ if (backup_dir_dels) {
++ if (backup_dir_dels && backup_dir_dels != backup_dir) {
+ args[ac++] = "--backup-dir-dels";
+ args[ac++] = backup_dir_dels;
+ }
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1356,7 +1415,13 @@ void server_options(char **args,int *arg
+@@ -1653,7 +1712,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}
git.samba.org / rsync-patches.git / blobdiff