[boinc] 01/01: refreshed patches

[Guo Yixuan]

This is an automated email from the git hooks/post-receive script.

yixuan-guest pushed a commit to branch master
in repository boinc.

commit 2aff06bfdc35cb9f1ed34d99a032d6540d8cb332
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Tue Jun 24 00:35:47 2014 -0400

    refreshed patches
---
 debian/patches/client_app_maxpathlen.patch | 17 +++--------------
 debian/patches/filesys_error_message.patch | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index 93607b0..9c387bb 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -1,17 +1,6 @@
---- a/client/app.h
-+++ b/client/app.h
-@@ -48,7 +48,7 @@
- typedef int PROCESS_ID;
- 
- #define MAX_STDERR_LEN  65536
--#define SLOT_DIR_LEN 256
-+#define SLOT_DIR_LEN MAXPATHLEN
-     // The stderr output of an application is truncated to this length
-     // before sending to server,
-     // to protect against apps that write unbounded amounts.
 --- a/client/file_names.cpp
 +++ b/client/file_names.cpp
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ int make_soft_link(PROJECT* project, cha
  //
  void get_pathname(FILE_INFO* fip, char* path, int len) {
      PROJECT* p = fip->project;
@@ -20,7 +9,7 @@
  
      // for testing purposes, it's handy to allow a FILE_INFO without
      // an associated PROJECT.
-@@ -91,28 +91,28 @@
+@@ -91,28 +91,28 @@ void get_pathname(FILE_INFO* fip, char*
  }
  
  void get_sched_request_filename(PROJECT& project, char* buf, int len) {
@@ -53,7 +42,7 @@
  
      escape_project_url(project.master_url, url);
      snprintf(buf, len, "%s%s.txt", JOB_LOG_BASE, url);
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ int make_slot_dir(int slot) {
  // delete unused stuff in the slots/ directory
  //
  void delete_old_slot_dirs() {
diff --git a/debian/patches/filesys_error_message.patch b/debian/patches/filesys_error_message.patch
index 5e878a8..fd6cdaf 100644
--- a/debian/patches/filesys_error_message.patch
+++ b/debian/patches/filesys_error_message.patch
@@ -1,17 +1,20 @@
 --- a/lib/filesys.cpp
 +++ b/lib/filesys.cpp
-@@ -145,7 +145,9 @@ DIRREF dir_open(const char* const p) {
+@@ -144,7 +144,12 @@ DIRREF dir_open(const char* p) {
+     dirp->handle = INVALID_HANDLE_VALUE;
  #else
      dirp = opendir(p);
-     if (!dirp) {
--        fprintf(stderr,"dir_open: Could not open directory '%s'.\n",p);
+-    if (!dirp) return NULL;
++    if (!dirp) {
 +        char b[MAXPATHLEN+1];
-+	boinc_getcwd(b);
++        boinc_getcwd(b);
 +        fprintf(stderr,"dir_open: Could not open directory '%s' from '%s'.\n",p,b);
-         return NULL;
-     }
++        return NULL;
++    }
  #endif
-@@ -602,7 +604,7 @@ static int boinc_rename_aux(const char*
+     return dirp;
+ }
+@@ -599,7 +604,7 @@ static int boinc_rename_aux(const char*
      //
      int retval = rename(old, newf);
      if (retval) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git