Commit5e0e881

committed

New option: delete --expired. Minor bugfixes.

1 parent1edaabf commit5e0e881Copy full SHA for 5e0e881

File tree

+25

-8

lines changed

+25

-8

lines changed

Lines changed: 15 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,23 @@ pgFileNew(const char *path, bool omit_symlink)`
`128`	`128`	`strerror(errno));`
`129`	`129`	`}`
`130`	`130`
	`131`	`+file=pgFileInit(path);`
	`132`	`+file->size=st.st_size;`
	`133`	`+file->mode=st.st_mode;`
	`134`	`+`
	`135`	`+returnfile;`
	`136`	`+}`
	`137`	`+`
	`138`	`+pgFile*`
	`139`	`+pgFileInit(constchar*path)`
	`140`	`+{`
	`141`	`+pgFile*file;`
`131`	`142`	`file= (pgFile*)pgut_malloc(sizeof(pgFile));`
`132`	`143`
`133`		`-file->size=st.st_size;`
	`144`	`+file->size=0;`
	`145`	`+file->mode=0;`
`134`	`146`	`file->read_size=0;`
`135`	`147`	`file->write_size=0;`
`136`		`-file->mode=st.st_mode;`
`137`	`148`	`file->crc=0;`
`138`	`149`	`file->is_datafile= false;`
`139`	`150`	`file->linked=NULL;`
`@@ -142,10 +153,9 @@ pgFileNew(const char *path, bool omit_symlink)`
`142`	`153`	`file->ptrack_path=NULL;`
`143`	`154`	`file->segno=0;`
`144`	`155`	`file->path=pgut_malloc(strlen(path)+1);`
	`156`	`+strcpy(file->path,path);/* enough buffer size guaranteed */`
`145`	`157`	`file->generation=-1;`
`146`	`158`	`file->is_partial_copy=0;`
`147`		`-strcpy(file->path,path);/* enough buffer size guaranteed */`
`148`		`-`
`149`	`159`	`returnfile;`
`150`	`160`	`}`
`151`	`161`
`@@ -725,7 +735,7 @@ dir_read_file_list(const char root, const char file_txt)`
`725`	`735`	`else`
`726`	`736`	`strcpy(filepath,path);`
`727`	`737`
`728`		`-file=pgFileNew(filepath, false);`
	`738`	`+file=pgFileInit(filepath);`
`729`	`739`
`730`	`740`	`file->write_size=write_size;`
`731`	`741`	`file->mode=mode;`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,11 @@ static pgut_option options[] =`
`83`	`83`	`{'b',12,"wal",&delete_wal,SOURCE_CMDLINE },`
`84`	`84`	`{'b',16,"expired",&delete_expired,SOURCE_CMDLINE },`
`85`	`85`	`{'b',17,"all",&apply_to_all,SOURCE_CMDLINE },`
	`86`	`+/* TODO not implemented yet */`
`86`	`87`	`{'b',18,"force",&force_delete,SOURCE_CMDLINE },`
`87`	`88`	`/* configure options */`
`88`		`-{'u',13,"set-retention-redundancy",&retention_redundancy,SOURCE_CMDLINE },`
`89`		`-{'u',14,"set-retention-window",&retention_window,SOURCE_CMDLINE },`
	`89`	`+{'u',13,"retention-redundancy",&retention_redundancy,SOURCE_CMDLINE },`
	`90`	`+{'u',14,"retention-window",&retention_window,SOURCE_CMDLINE },`
`90`	`91`	`/* other */`
`91`	`92`	`{'U',15,"system-identifier",&system_identifier,SOURCE_FILE_STRICT },`
`92`	`93`
`@@ -235,7 +236,12 @@ main(int argc, char *argv[])`
`235`	`236`	`caseSHOW:`
`236`	`237`	`returndo_show(current.backup_id);`
`237`	`238`	`caseDELETE:`
`238`		`-returndo_delete(current.backup_id);`
	`239`	`+if (delete_expired&&backup_id_string_param)`
	`240`	`+elog(ERROR,"You cannot specify --delete-expired and --backup-id options together");`
	`241`	`+if (delete_expired)`
	`242`	`+returndo_retention_purge();`
	`243`	`+else`
	`244`	`+returndo_delete(current.backup_id);`
`239`	`245`	`caseCONFIGURE:`
`240`	`246`	`/* TODO fixit */`
`241`	`247`	`if (argc==4)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,7 @@ extern int dir_create_dir(const char *path, mode_t mode);`
`329`	`329`	`externbooldir_is_empty(constchar*path);`
`330`	`330`
`331`	`331`	`externpgFilepgFileNew(constcharpath,boolomit_symlink);`
	`332`	`+externpgFilepgFileInit(constcharpath);`
`332`	`333`	`externvoidpgFileDelete(pgFile*file);`
`333`	`334`	`externvoidpgFileFree(void*file);`
`334`	`335`	`externpg_crc32pgFileGetCRC(pgFile*file);`

Comments

(0)