X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=c51ab116e41294853f2baea41cb175b4518e915d;hb=8c75b1387a33fdbf3cbc8ba8bfa0ab1851d30894;hp=8c81cad0393cbea477c6fa9610f0f3b7eb696520;hpb=1f9b376c90f50836b1ca2517cda0bfcab75ad8ae;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 8c81cad..c51ab11 100644 --- a/src/common.h +++ b/src/common.h @@ -183,6 +183,7 @@ enum old_files OVERWRITE_OLD_FILES, /* --overwrite */ UNLINK_FIRST_OLD_FILES, /* --unlink-first */ KEEP_OLD_FILES, /* --keep-old-files */ + SKIP_OLD_FILES, /* --skip-old-files */ KEEP_NEWER_FILES /* --keep-newer-files */ }; GLOBAL enum old_files old_files_option; @@ -524,6 +525,7 @@ void update_parent_directory (struct tar_stat_info *st); size_t dumpdir_size (const char *p); bool is_dumpdir (struct tar_stat_info *stat_info); +void clear_directory_table (void); /* Module list.c. */ @@ -619,6 +621,9 @@ void undo_last_backup (void); int deref_stat (char const *name, struct stat *buf); +size_t blocking_read (int fd, void *buf, size_t count); +size_t blocking_write (int fd, void const *buf, size_t count); + extern int chdir_current; extern int chdir_fd; int chdir_arg (char const *dir); @@ -809,11 +814,12 @@ void checkpoint_run (bool do_write); #define WARN_UNKNOWN_KEYWORD 0x00020000 #define WARN_XDEV 0x00040000 #define WARN_DECOMPRESS_PROGRAM 0x00080000 +#define WARN_EXISTING_FILE 0x00100000 /* The warnings composing WARN_VERBOSE_WARNINGS are enabled by default in verbose mode */ #define WARN_VERBOSE_WARNINGS (WARN_RENAME_DIRECTORY|WARN_NEW_DIRECTORY|\ - WARN_DECOMPRESS_PROGRAM) + WARN_DECOMPRESS_PROGRAM|WARN_EXISTING_FILE) #define WARN_ALL (~WARN_VERBOSE_WARNINGS) void set_warning_option (const char *arg);