[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-17-g9d6f28a

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 9d6f28a0fe12ec9e8a6015c27a620aef6d6a5638
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Tue May 28 01:20:10 2013 +0200

    Added missing patch file (improving error message)
    
    The patch mentiones the current working directory
    when the directory to scan could not be opened.

diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
new file mode 100644
index 0000000..cf7f4fc
--- /dev/null
+++ b/debian/patches/filesys_error_message.patch
@@ -0,0 +1,55 @@
+Index: boinc_debian/lib/filesys.cpp
+===================================================================
+--- boinc_debian.orig/lib/filesys.cpp
++++ boinc_debian/lib/filesys.cpp
+@@ -145,7 +145,9 @@
+ #else
+     dirp = opendir(p);
+     if (!dirp) {
+-        fprintf(stderr,"dir_open: Could not open directory '%s'.\n",p);
++        char b[MAXPATHLEN+1];
++	boinc_getcwd(b);
++        fprintf(stderr,"dir_open: Could not open directory '%s' from '%s'.\n",p,b);
+         return NULL;
+     }
+ #endif
+@@ -592,7 +594,7 @@
+ #endif
+ }
+ 
+-static int boinc_rename_aux(const char* old, const char* newf) {
++static int boinc_rename_aux(const char* const old, const char* const newf) {
+ #ifdef _WIN32
+     if (MoveFileExA(old, newf, MOVEFILE_REPLACE_EXISTING|MOVEFILE_WRITE_THROUGH)) return 0;
+     return GetLastError();
+@@ -602,7 +604,7 @@
+     //
+     int retval = rename(old, newf);
+     if (retval) {
+-        char buf[MAXPATHLEN+MAXPATHLEN];
++        char buf[MAXPATHLEN+MAXPATHLEN+1+7];
+         sprintf(buf, "mv \"%s\" \"%s\"", old, newf);
+         retval = system(buf);
+     }
+@@ -611,7 +613,7 @@
+ #endif
+ }
+ 
+-int boinc_rename(const char* old, const char* newf) {
++int boinc_rename(const char* const old, const char* const newf) {
+     int retval=0;
+ 
+     retval = boinc_rename_aux(old, newf);
+Index: boinc_debian/lib/filesys.h
+===================================================================
+--- boinc_debian.orig/lib/filesys.h
++++ boinc_debian/lib/filesys.h
+@@ -47,7 +47,7 @@
+   extern int boinc_touch_file(const char* const path);
+   extern FILE* boinc_fopen(const char* const path, const char* mode);
+   extern int boinc_copy(const char* orig, const char* newf);
+-  extern int boinc_rename(const char* old, const char* newf);
++  extern int boinc_rename(const char* const old, const char* const newf);
+   extern int boinc_mkdir(const char* const);
+ #ifdef _WIN32
+   extern int boinc_allocate_file(const char* const, double size);
diff --git a/debian/patches/series b/debian/patches/series
index 06eae34..ebd6dac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,5 +65,5 @@ server_installs_itself.patch
 lib_cppcheck.patch
 fopen_closing.patch
 rrsim_iterator_cppcheck.patch
-#filesys_error_message.patch
+filesys_error_message.patch
 de.po.patch

-- 
BOINC packaging