diff --git a/checkin_notes b/checkin_notes index 60142fc8ed..e280f37977 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3709,7 +3709,7 @@ Charlie 8 Apr 2009 boinc.xcodeproj/ project.pbxproj -Charlie 8 Apr 2009 +Charlie 9 Apr 2009 - Mac client: fill in command field of PROCINFO struct so log flag works properly on Mac. diff --git a/lib/procinfo_mac.cpp b/lib/procinfo_mac.cpp index a37470b239..3ae9154663 100644 --- a/lib/procinfo_mac.cpp +++ b/lib/procinfo_mac.cpp @@ -97,9 +97,10 @@ int procinfo_setup(vector& pi) { while (1) { memset(&p, 0, sizeof(p)); - c = fscanf(fd, "%d%d%d%d%ld%d:%lf %[^\n]", &p.id, &p.parentid, &real_mem, - &virtual_mem, &p.page_fault_count, &hours, &p.user_time, p.command); + c = fscanf(fd, "%d%d%d%d%ld%d:%lf ", &p.id, &p.parentid, &real_mem, + &virtual_mem, &p.page_fault_count, &hours, &p.user_time); if (c < 7) break; + if (fgets(p.command, sizeof(p.command) , fd) == NULL) break; p.working_set_size = (double)real_mem * 1024.; p.swap_size = (double)virtual_mem * 1024.; p.user_time += 60. * (float)hours;