diff --git a/html/user/job_file.php b/html/user/job_file.php index 947e5d2270..d10700870a 100644 --- a/html/user/job_file.php +++ b/html/user/job_file.php @@ -102,9 +102,9 @@ function query_files($r) { // $job_file = BoincJobFile::lookup_md5($md5); if ($job_file && $job_file->delete_time < $delete_time) { - $retval = $job_file::update("delete_time=$delete_time"); + $retval = $job_file->update("delete_time=$delete_time"); if ($retval) { - xml_error(-1, "job_file::update() failed: ".mysql_error()); + xml_error(-1, "job_file->update() failed: ".mysql_error()); } } if (file_exists($path)) { diff --git a/samples/condor/boinc_gahp.cpp b/samples/condor/boinc_gahp.cpp index f30dd4e6f5..f17b8fb8bd 100644 --- a/samples/condor/boinc_gahp.cpp +++ b/samples/condor/boinc_gahp.cpp @@ -714,7 +714,7 @@ char* get_cmd() { if (c == EOF) { return NULL; } - if (c == '\n') { + if (c == '\n' || c == '\r') { p[len] = 0; return p; }