Hello community,
here is the log from the commit of package unrar for openSUSE:Factory:NonFree checked in at 2013-07-16 07:40:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory:NonFree/unrar (Old)
and /work/SRC/openSUSE:Factory:NonFree/.unrar.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unrar"
Changes:
--------
--- /work/SRC/openSUSE:Factory:NonFree/unrar/unrar.changes 2013-06-28 19:29:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory:NonFree/.unrar.new/unrar.changes 2013-07-16 07:40:59.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jul 14 06:44:02 UTC 2013 - lazy.kent@opensuse.org
+
+- Update to 5.0.8.
+ * No changes announced for unrar.
+
+-------------------------------------------------------------------
Old:
----
unrarsrc-5.0.7.tar.gz
New:
----
unrarsrc-5.0.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unrar.spec ++++++
--- /var/tmp/diff_new_pack.8QwbjE/_old 2013-07-16 07:41:00.000000000 +0200
+++ /var/tmp/diff_new_pack.8QwbjE/_new 2013-07-16 07:41:00.000000000 +0200
@@ -18,10 +18,10 @@
# majorversion should match the major version number.
%define majorversion 5
-%define libsuffix 5_0_7
+%define libsuffix 5_0_8
Name: unrar
-Version: 5.0.7
+Version: 5.0.8
Release: 0
License: SUSE-NonFree
Summary: A program to extract, test, and view RAR archives
++++++ unrarsrc-5.0.7.tar.gz -> unrarsrc-5.0.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/cmddata.cpp new/unrar/cmddata.cpp
--- old/unrar/cmddata.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/cmddata.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -673,7 +673,6 @@
case '0':
Recurse=RECURSE_WILDCARDS;
break;
-#ifndef _WIN_CE
case 'I':
{
Priority=atoiw(Switch+2);
@@ -690,7 +689,6 @@
SetPriority(Priority);
}
break;
-#endif
}
break;
case 'S':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/dll.rc new/unrar/dll.rc
--- old/unrar/dll.rc 2013-06-19 12:14:48.000000000 +0200
+++ new/unrar/dll.rc 2013-07-13 12:55:13.000000000 +0200
@@ -2,8 +2,8 @@
#include
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 5, 0, 6, 901
-PRODUCTVERSION 5, 0, 6, 901
+FILEVERSION 5, 0, 7, 925
+PRODUCTVERSION 5, 0, 7, 925
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
{
@@ -14,8 +14,8 @@
VALUE "CompanyName", "Alexander Roshal\0"
VALUE "ProductName", "RAR decompression library\0"
VALUE "FileDescription", "RAR decompression library\0"
- VALUE "FileVersion", "5.0.6\0"
- VALUE "ProductVersion", "5.0.6\0"
+ VALUE "FileVersion", "5.0.7\0"
+ VALUE "ProductVersion", "5.0.7\0"
VALUE "LegalCopyright", "Copyright � Alexander Roshal 1993-2013\0"
VALUE "OriginalFilename", "Unrar.dll\0"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/errhnd.cpp new/unrar/errhnd.cpp
--- old/unrar/errhnd.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/errhnd.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -288,7 +288,7 @@
#ifdef _WIN_ALL
// Let the main thread to handle 'throw' and destroy file objects.
Sleep(200);
-#if defined(USE_RC) && !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(RARDLL)
+#if defined(USE_RC) && !defined(SFX_MODULE) && !defined(RARDLL)
ExtRes.UnloadDLL();
#endif
exit(RARX_USERBREAK);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/extract.cpp new/unrar/extract.cpp
--- old/unrar/extract.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/extract.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -231,7 +231,7 @@
HEADER_TYPE HeaderType=Arc.GetHeaderType();
if (HeaderType!=HEAD_FILE)
{
-#if !defined(SFX_MODULE) && !defined(_WIN_CE)
+#ifndef SFX_MODULE
if (HeaderType==HEAD3_OLDSERVICE && PrevExtracted)
SetExtraInfo20(Cmd,Arc,DestFileName);
#endif
@@ -615,12 +615,12 @@
bool BrokenFile=false;
// Checksum is not calculated in skip solid mode for performance reason.
- if (!SkipSolid && ShowChecksum)
+ if (!SkipSolid)
{
if (!WrongPassword && ValidCRC)
{
#ifndef GUI
- if (Command!='P' && Command!='I')
+ if (Command!='P' && Command!='I' && ShowChecksum)
mprintf(L"%s%s ",Cmd->DisablePercentage ? L" ":L"\b\b\b\b\b ",
Arc.FileHead.FileHash.Type==HASH_NONE ? L" ?":St(MOk));
#endif
@@ -671,7 +671,7 @@
Cmd->xctime==EXTTIME_NONE ? NULL:&Arc.FileHead.ctime,
Cmd->xatime==EXTTIME_NONE ? NULL:&Arc.FileHead.atime);
CurFile.Close();
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
if (Cmd->SetCompressedAttr &&
(Arc.FileHead.FileAttr & FILE_ATTRIBUTE_COMPRESSED)!=0)
SetFileCompression(CurFile.FileName,true);
@@ -966,7 +966,7 @@
}
if (PrevExtracted)
{
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
if (Cmd->SetCompressedAttr &&
(Arc.FileHead.FileAttr & FILE_ATTRIBUTE_COMPRESSED)!=0 && WinNT())
SetFileCompression(DestFileName,true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/filcreat.hpp new/unrar/filcreat.hpp
--- old/unrar/filcreat.hpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/filcreat.hpp 2013-07-13 13:30:21.000000000 +0200
@@ -7,7 +7,7 @@
bool GetAutoRenamedName(wchar *Name,size_t MaxNameSize);
-#if defined(_WIN_ALL) && !defined(_WIN_CE)
+#ifdef _WIN_ALL
bool UpdateExistingShortName(const wchar *Name);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/file.cpp new/unrar/file.cpp
--- old/unrar/file.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/file.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -250,7 +250,6 @@
{
if (Size==0)
return;
-#ifndef _WIN_CE
if (HandleType!=FILE_HANDLENORMAL)
switch(HandleType)
{
@@ -269,7 +268,6 @@
#endif
break;
}
-#endif
while (1)
{
bool Success=false;
@@ -364,7 +362,6 @@
const size_t MaxDeviceRead=20000;
const size_t MaxLockedRead=32768;
#endif
-#ifndef _WIN_CE
if (HandleType==FILE_HANDLESTD)
{
#ifdef _WIN_ALL
@@ -375,7 +372,6 @@
hFile=stdin;
#endif
}
-#endif
#ifdef _WIN_ALL
DWORD Read;
if (!ReadFile(hFile,Data,(DWORD)Size,&Read,NULL))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/filefn.cpp new/unrar/filefn.cpp
--- old/unrar/filefn.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/filefn.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -310,7 +310,7 @@
void CalcFileSum(File *SrcFile,uint *CRC32,byte *Blake2,uint Threads,int64 Size,uint Flags)
{
SaveFilePos SavePos(*SrcFile);
-#if !defined(SILENT) && !defined(_WIN_CE)
+#ifndef SILENT
int64 FileLength=SrcFile->FileLength();
if ((Flags & (CALCFSUM_SHOWTEXT|CALCFSUM_SHOWALL))!=0)
{
@@ -345,7 +345,7 @@
if ((++BlockCount & 0xf)==0)
{
-#if !defined(SILENT) && !defined(_WIN_CE)
+#ifndef SILENT
if ((Flags & CALCFSUM_SHOWALL)!=0)
mprintf(L"\b\b\b\b%3d%%",ToPercent(BlockCount*int64(BufSize),FileLength));
#endif
@@ -419,7 +419,7 @@
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
bool SetFileCompression(const wchar *Name,bool State)
{
HANDLE hFile=CreateFile(Name,FILE_READ_DATA|FILE_WRITE_DATA,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/filefn.hpp new/unrar/filefn.hpp
--- old/unrar/filefn.hpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/filefn.hpp 2013-07-13 13:30:21.000000000 +0200
@@ -33,7 +33,7 @@
bool DelFile(const wchar *Name);
bool DelDir(const wchar *Name);
-#if defined(_WIN_ALL) && !defined(_WIN_CE)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
bool SetFileCompression(const wchar *Name,bool State);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/filestr.cpp new/unrar/filestr.cpp
--- old/unrar/filestr.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/filestr.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -17,7 +17,7 @@
if (Name!=NULL)
if (Config)
- GetConfigName(Name,FileName,ASIZE(FileName),true);
+ GetConfigName(Name,FileName,ASIZE(FileName),true,false);
else
wcsncpyz(FileName,Name,ASIZE(FileName));
@@ -93,7 +93,7 @@
}
bool Expanded=false;
-#if defined(_WIN_ALL) && !defined(_WIN_CE)
+#ifdef _WIN_ALL
if (ExpandEnvStr && *CurStr=='%')
{
// Expanding environment variables in Windows version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/find.cpp new/unrar/find.cpp
--- old/unrar/find.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/find.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -161,7 +161,7 @@
#ifdef _WIN_ALL
HANDLE FindFile::Win32Find(HANDLE hFind,const wchar *Mask,FindData *fd)
{
- WIN32_FIND_DATAW FindData;
+ WIN32_FIND_DATA FindData;
if (hFind==INVALID_HANDLE_VALUE)
{
hFind=FindFirstFile(Mask,&FindData);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/global.cpp new/unrar/global.cpp
--- old/unrar/global.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/global.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -1,4 +1,7 @@
#define INCLUDEGLOBAL
+#if defined(__BORLANDC__) || defined(_MSC_VER)
+#pragma hdrstop
+#endif
#include "rar.hpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/hardlinks.cpp new/unrar/hardlinks.cpp
--- old/unrar/hardlinks.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/hardlinks.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -2,6 +2,8 @@
{
if (!FileExist(NameExisting))
return false;
+ CreatePath(NameNew,true);
+
#ifdef _WIN_ALL
UnixSlashToDos(NameExisting,NameExisting,NameExistingSize);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/os.hpp new/unrar/os.hpp
--- old/unrar/os.hpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/os.hpp 2013-07-13 13:30:21.000000000 +0200
@@ -233,7 +233,7 @@
#endif
#endif
-#if !defined(BIG_ENDIAN) && !defined(_WIN_CE) && defined(_WIN_ALL)
+#if !defined(BIG_ENDIAN) && defined(_WIN_ALL)
// Allow not aligned integer access, increases speed in some operations.
#define ALLOW_NOT_ALIGNED_INT
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/pathfn.cpp new/unrar/pathfn.cpp
--- old/unrar/pathfn.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/pathfn.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -200,8 +200,8 @@
}
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE)
-static void GetAppDataPath(wchar *Path,size_t MaxSize)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
+static void GetAppDataPath(wchar *Path,size_t MaxSize,bool Create)
{
LPMALLOC g_pMalloc;
SHGetMalloc(&g_pMalloc);
@@ -213,7 +213,9 @@
{
AddEndSlash(Path,MaxSize);
wcsncatz(Path,L"WinRAR",MaxSize);
- Success=FileExist(Path) || MakeDir(Path,false,0)==MKDIR_SUCCESS;
+ Success=FileExist(Path);
+ if (!Success && Create)
+ Success=MakeDir(Path,false,0)==MKDIR_SUCCESS;
}
if (!Success)
{
@@ -226,27 +228,27 @@
#if defined(_WIN_ALL) && !defined(SFX_MODULE)
-void GetRarDataPath(wchar *Path,size_t MaxSize)
+void GetRarDataPath(wchar *Path,size_t MaxSize,bool Create)
{
*Path=0;
HKEY hKey;
- if (RegOpenKeyExW(HKEY_CURRENT_USER,L"Software\\WinRAR\\Paths",0,
- KEY_QUERY_VALUE,&hKey)==ERROR_SUCCESS)
+ if (RegOpenKeyEx(HKEY_CURRENT_USER,L"Software\\WinRAR\\Paths",0,
+ KEY_QUERY_VALUE,&hKey)==ERROR_SUCCESS)
{
DWORD DataSize=(DWORD)MaxSize,Type;
- RegQueryValueExW(hKey,L"AppData",0,&Type,(BYTE *)Path,&DataSize);
+ RegQueryValueEx(hKey,L"AppData",0,&Type,(BYTE *)Path,&DataSize);
RegCloseKey(hKey);
}
if (*Path==0 || !FileExist(Path))
- GetAppDataPath(Path,MaxSize);
+ GetAppDataPath(Path,MaxSize,Create);
}
#endif
#ifndef SFX_MODULE
-bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize)
+bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize,bool Create)
{
#ifdef _UNIX
static const wchar *ConfPath[]={
@@ -270,10 +272,10 @@
if (Number>1)
return false;
if (Number==0)
- GetRarDataPath(Path,MaxSize);
+ GetRarDataPath(Path,MaxSize,Create);
else
{
- GetModuleFileNameW(NULL,Path,(DWORD)MaxSize);
+ GetModuleFileName(NULL,Path,(DWORD)MaxSize);
RemoveNameFromPath(Path);
}
return true;
@@ -285,10 +287,10 @@
#ifndef SFX_MODULE
-void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist)
+void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist,bool Create)
{
*FullName=0;
- for (uint I=0;EnumConfigPaths(I,FullName,MaxSize);I++)
+ for (uint I=0;EnumConfigPaths(I,FullName,MaxSize,Create);I++)
{
AddEndSlash(FullName,MaxSize);
wcsncatz(FullName,Name,MaxSize);
@@ -919,6 +921,8 @@
// characters, even if their path length is normal.
bool GetWinLongPath(const wchar *Src,wchar *Dest,size_t MaxSize)
{
+ if (*Src==0)
+ return false;
const wchar *Prefix=L"\\\\?\\";
const size_t PrefixLength=4;
bool FullPath=IsDiskLetter(Src) && IsPathDiv(Src[2]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/pathfn.hpp new/unrar/pathfn.hpp
--- old/unrar/pathfn.hpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/pathfn.hpp 2013-07-13 13:30:21.000000000 +0200
@@ -17,9 +17,9 @@
void MakeName(const wchar *Path,const wchar *Name,wchar *Pathname,size_t MaxSize);
void GetFilePath(const wchar *FullName,wchar *Path,size_t MaxLength);
void RemoveNameFromPath(wchar *Path);
-void GetRarDataPath(wchar *Path,size_t MaxSize);
-bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize);
-void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist);
+void GetRarDataPath(wchar *Path,size_t MaxSize,bool Create);
+bool EnumConfigPaths(uint Number,wchar *Path,size_t MaxSize,bool Create);
+void GetConfigName(const wchar *Name,wchar *FullName,size_t MaxSize,bool CheckExist,bool Create);
wchar* GetVolNumPart(const wchar *ArcName);
void NextVolumeName(wchar *ArcName,uint MaxLength,bool OldNumbering);
bool IsNameUsable(const wchar *Name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/rar.hpp new/unrar/rar.hpp
--- old/unrar/rar.hpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/rar.hpp 2013-07-13 13:30:21.000000000 +0200
@@ -8,9 +8,7 @@
#include "dll.hpp"
#endif
-#ifndef _WIN_CE
#include "version.hpp"
-#endif
#include "rartypes.hpp"
#include "rardefs.hpp"
#include "rarlang.hpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/raros.hpp new/unrar/raros.hpp
--- old/unrar/raros.hpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/raros.hpp 2013-07-13 13:30:21.000000000 +0200
@@ -19,16 +19,6 @@
#endif
#endif
-#ifdef _WIN32_WCE
- #define _WIN_ALL
- #define _WIN_CE
- #ifdef WM_FILECHANGEINFO
- #define PC2002
- #else
- #undef PC2002
- #endif
-#endif
-
#ifdef __APPLE__
#define _UNIX
#define _APPLE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/resource.cpp new/unrar/resource.cpp
--- old/unrar/resource.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/resource.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -16,4 +16,3 @@
}
#endif
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/system.cpp new/unrar/system.cpp
--- old/unrar/system.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/system.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -1,16 +1,14 @@
#include "rar.hpp"
-#ifndef _WIN_CE
static int SleepTime=0;
void InitSystemOptions(int SleepTime)
{
::SleepTime=SleepTime;
}
-#endif
-#if !defined(SFX_MODULE) && !defined(_WIN_CE) && !defined(SETUP)
+#if !defined(SFX_MODULE) && !defined(SETUP)
void SetPriority(int Priority)
{
#ifdef _WIN_ALL
@@ -74,7 +72,7 @@
{
if (ErrHandler.UserBreak)
ErrHandler.Exit(RARX_USERBREAK);
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE)
if (SleepTime!=0)
Sleep(SleepTime);
#endif
@@ -84,7 +82,7 @@
-#if defined(_WIN_ALL) && !defined(_WIN_CE) && !defined(SFX_MODULE) && !defined(SHELL_EXT) && !defined(SETUP)
+#if defined(_WIN_ALL) && !defined(SFX_MODULE) && !defined(SHELL_EXT) && !defined(SETUP)
void Shutdown()
{
HANDLE hToken;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/timefn.cpp new/unrar/timefn.cpp
--- old/unrar/timefn.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/timefn.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -272,17 +272,17 @@
}
-#if !defined(SFX_MODULE) && !defined(_WIN_CE)
+#ifndef SFX_MODULE
const wchar *GetMonthName(int Month)
{
#ifdef SILENT
- return(L"");
+ return L"";
#else
static MSGID MonthID[]={
MMonthJan,MMonthFeb,MMonthMar,MMonthApr,MMonthMay,MMonthJun,
MMonthJul,MMonthAug,MMonthSep,MMonthOct,MMonthNov,MMonthDec
};
- return(St(MonthID[Month]));
+ return St(MonthID[Month]);
#endif
}
#endif
@@ -290,5 +290,5 @@
bool IsLeapYear(int Year)
{
- return((Year&3)==0 && (Year%100!=0 || Year%400==0));
+ return (Year&3)==0 && (Year%100!=0 || Year%400==0);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/ulinks.cpp new/unrar/ulinks.cpp
--- old/unrar/ulinks.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/ulinks.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -15,7 +15,6 @@
Log(NULL,St(MErrCreateLnkS),LinkName);
ErrHandler.SetErrorCode(RARX_WARNING);
}
- mprintf(L" "); // Provide space for "OK" message.
return false;
}
// We do not set time of created symlink, because utime changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/version.hpp new/unrar/version.hpp
--- old/unrar/version.hpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/version.hpp 2013-07-13 13:30:21.000000000 +0200
@@ -1,6 +1,6 @@
#define RARVER_MAJOR 5
#define RARVER_MINOR 0
-#define RARVER_BETA 6
-#define RARVER_DAY 19
-#define RARVER_MONTH 6
+#define RARVER_BETA 7
+#define RARVER_DAY 13
+#define RARVER_MONTH 7
#define RARVER_YEAR 2013
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/unrar/volume.cpp new/unrar/volume.cpp
--- old/unrar/volume.cpp 2013-06-19 12:36:26.000000000 +0200
+++ new/unrar/volume.cpp 2013-07-13 13:30:21.000000000 +0200
@@ -83,7 +83,7 @@
}
#else // !RARDLL
-#if !defined(SFX_MODULE) && !defined(_WIN_CE)
+#ifndef SFX_MODULE
if (!RecoveryDone)
{
RecVolumesRestore(Cmd,Arc.FileName,true);
@@ -112,7 +112,7 @@
if (FailedOpen)
{
-#if !defined(SILENT) && !defined(_WIN_CE)
+#ifndef SILENT
Log(Arc.FileName,St(MAbsNextVol),NextName);
#endif
Arc.Open(Arc.FileName,0);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org