Commit9df43a0

itagaki.takahiro

committed

Yet another fixes for DST.

git-svn-id:http://pg-rman.googlecode.com/svn/trunk@35 182aca00-e38e-11de-a668-6fd11605f5ce

1 parent5933d52 commit9df43a0Copy full SHA for 9df43a0

File tree

-0

lines changed

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -459,6 +459,7 @@ dir_read_file_list(const char root, const char file_txt)`
`459`	`459`	`structtmtm;`
`460`	`460`	`pgFile*file;`
`461`	`461`
	`462`	`+memset(&tm,0,sizeof(tm));`
`462`	`463`	`if (sscanf(buf,"%s %c %lu %u %o %d-%d-%d %d:%d:%d",`
`463`	`464`	`path,&type,&write_size,&crc,&mode,`
`464`	`465`	`&tm.tm_year,&tm.tm_mon,&tm.tm_mday,`
`@@ -472,6 +473,7 @@ dir_read_file_list(const char root, const char file_txt)`
`472`	`473`	`elog(ERROR_CORRUPTED,_("invalid type '%c' found in \"%s\""),`
`473`	`474`	`type,file_txt);`
`474`	`475`	`}`
	`476`	`+tm.tm_isdst=-1;`
`475`	`477`
`476`	`478`	`file= (pgFile*)pgut_malloc(offsetof(pgFile,path)+`
`477`	`479`	`(root ?strlen(root)+1 :0)+strlen(path)+1);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ parse_range(pgBackupRange range, const char arg1, const char *arg2)`
`248`	`248`	`if (arg2!=NULL)`
`249`	`249`	`remove_not_digit(tmp+strlen(tmp),len-strlen(tmp),arg2);`
`250`	`250`
	`251`	`+memset(&tm,0,sizeof(tm));`
`251`	`252`	`tm.tm_year=0;/* tm_year is year - 1900 */`
`252`	`253`	`tm.tm_mon=0;/* tm_mon is 0 - 11 */`
`253`	`254`	`tm.tm_mday=1;/* tm_mday is 1 - 31 */`
`@@ -267,6 +268,7 @@ parse_range(pgBackupRange range, const char arg1, const char *arg2)`
`267`	`268`	`tm.tm_year-=1900;`
`268`	`269`	`if (num>1)`
`269`	`270`	`tm.tm_mon-=1;`
	`271`	`+tm.tm_isdst=-1;`
`270`	`272`	`range->begin=mktime(&tm);`
`271`	`273`
`272`	`274`	`switch (num)`

Comments

(0)