[boinc] 01/01: dropped investigate_boinc_api.patch

[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 22b77cc6cec9c5d3e4bb6ecca87dd79ca32094d4
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Mon Jun 23 23:42:24 2014 -0400

    dropped investigate_boinc_api.patch
---
 debian/changelog                           |  1 +
 debian/patches/investigate_boinc_api.patch | 86 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6278ee0..4a64525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 boinc (7.4.1+dfsg-1exp2) UNRELEASED; urgency=medium
 
   * Dropped ticket_1168_verifycerts.patch: the bug was already fixed.
+  * Dropped investigate_boinc_api.patch: it's only for debugging.
 
  -- Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>  Mon, 23 Jun 2014 22:00:17 -0400
 
diff --git a/debian/patches/investigate_boinc_api.patch b/debian/patches/investigate_boinc_api.patch
deleted file mode 100644
index b6f29b3..0000000
--- a/debian/patches/investigate_boinc_api.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/api/boinc_api.cpp
-+++ b/api/boinc_api.cpp
-@@ -369,7 +369,7 @@
- 
-     if (standalone) return true;
- 
--    sprintf(msg_buf,
-+    snprintf(msg_buf,sizeof(msg_buf),
-         "<current_cpu_time>%e</current_cpu_time>\n"
-         "<checkpoint_cpu_time>%e</checkpoint_cpu_time>\n",
-         cpu_t, cp_cpu_t
-@@ -645,6 +645,10 @@
- }
- 
- int boinc_get_status(BOINC_STATUS *s) {
-+    if (!s) {
-+        fprintf(stderr,"E: boinc_get_status(NULL)\n");
-+	return 1;
-+    }
-     s->no_heartbeat = boinc_status.no_heartbeat;
-     s->suspended = boinc_status.suspended;
-     s->quit_request = boinc_status.quit_request;
-@@ -823,7 +827,7 @@
- int boinc_parse_init_data_file() {
-     FILE* f;
-     int retval;
--    char buf[256];
-+    char buf[2560];
- 
-     if (aid.project_preferences) {
-         free(aid.project_preferences);
-@@ -875,15 +879,15 @@
-     );
-     if (other_pid) {
-         sprintf(buf, "<other_pid>%d</other_pid>\n", other_pid);
--        strcat(msg_buf, buf);
-+        strlcat(msg_buf, buf, sizeof(msg_buf));
-     }
-     if (_bytes_sent) {
-         sprintf(buf, "<bytes_sent>%f</bytes_sent>\n", _bytes_sent);
--        strcat(msg_buf, buf);
-+        strlcat(msg_buf, buf, sizeof(msg_buf));
-     }
-     if (_bytes_received) {
-         sprintf(buf, "<bytes_received>%f</bytes_received>\n", _bytes_received);
--        strcat(msg_buf, buf);
-+        strlcat(msg_buf, buf, sizeof(msg_buf));
-     }
-     if (app_client_shm->shm->app_status.send_msg(msg_buf)) {
-         return 0;
-@@ -978,7 +982,7 @@
- }
- 
- static void handle_upload_file_status() {
--    char path[MAXPATHLEN], buf[256], log_name[256], *p, log_buf[256];
-+    char path[MAXPATHLEN], buf[MAXPATHLEN], log_name[MAXPATHLEN], *p, log_buf[256];
-     std::string filename;
-     int status;
- 
-@@ -1193,7 +1197,7 @@
-     // send graphics-related messages
-     //
-     if (send_web_graphics_url && !app_client_shm->shm->graphics_reply.has_msg()) {
--        sprintf(buf,
-+        snprintf(buf, sizeof(buf),
-             "<web_graphics_url>%s</web_graphics_url>",
-             web_graphics_url
-         );
-@@ -1201,7 +1205,7 @@
-         send_web_graphics_url = false;
-     }
-     if (send_remote_desktop_addr && !app_client_shm->shm->graphics_reply.has_msg()) {
--        sprintf(buf,
-+        snprintf(buf, sizeof(buf),
-             "<remote_desktop_addr>%s</remote_desktop_addr>",
-             remote_desktop_addr
-         );
-@@ -1445,7 +1449,7 @@
-         DirScanner dirscan(path);
-         while (dirscan.scan(filename)) {
-             if (strstr(filename.c_str(), "trickle_down")) {
--                strncpy(buf, filename.c_str(), len);
-+                strlcpy(buf, filename.c_str(), len);
-                 return true;
-             }
-         }
diff --git a/debian/patches/series b/debian/patches/series
index e41b069..659cbec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,6 @@ more_maxpathlen.patch
 opendir_error_messages.patch
 sched_driver_char_buffers.patch
 csh2tcsh.patch
-investigate_boinc_api.patch
 slot_dir_source_trace.patch
 opendir_errno.patch
 client_app_maxpathlen.patch

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