From 9d328bfc1de74e9b01304cac503a9e3c89a2486d Mon Sep 17 00:00:00 2001
From: Barry Luong <barry@ssl.berkeley.edu>
Date: Fri, 12 Jul 2002 17:44:49 +0000
Subject: [PATCH] Changed error messages in main.C to print user names

svn path=/trunk/boinc/; revision=186
---
 sched/Makefile.in |  3 ++-
 sched/feeder.C    |  1 -
 sched/main.C      | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sched/Makefile.in b/sched/Makefile.in
index 98c069893f..a18d5be7d1 100644
--- a/sched/Makefile.in
+++ b/sched/Makefile.in
@@ -11,9 +11,10 @@ CFLAGS = -g -Wall @DEFS@ \
     -I@top_srcdir@/tools \
     -DBOINC_DB_NAME=\"$(BOINC_DB_NAME)\" \
     -DBOINC_KEY=$(BOINC_KEY) \
+    -DBOINC_KEY_DIR=\"$(BOINC_KEY_DIR)\" \
+    -DBOINC_USER=\"$(BOINC_USER)\" \
     -I/usr/local/mysql/include \
     -I@top_srcdir@/RSAEuro/source \
-    -DBOINC_KEY_DIR=\"$(BOINC_KEY_DIR)\" \
 
 CC = g++ $(CFLAGS)
 
diff --git a/sched/feeder.C b/sched/feeder.C
index 58064b0b75..1a5f02b39d 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -172,7 +172,6 @@ int main(int argc, char** argv) {
     int i, retval;
     bool asynch = false;
     void* p;
-    char* barry;
 
     for (i=1; i<argc; i++) {
         if (!strcmp(argv[i], "-asynch")) {
diff --git a/sched/main.C b/sched/main.C
index a891fcb05f..b5a36540d9 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -57,36 +57,36 @@ int main() {
     retval = read_file_malloc(path, code_sign_key);
     if (retval) {
         fprintf(stderr,
-            "BOINC scheduler: can't read code sign key file (%s)\n", path
+            "BOINC scheduler - compiled by BOINC_USER: can't read code sign key file (%s)\n", path
         );
         exit(1);
     }
 
     retval = attach_shmem(BOINC_KEY, &p);
     if (retval) {
-        fprintf(stderr, "BOINC scheduler: can't attach shmem\n");
+        fprintf(stderr, "BOINC scheduler - Compiled by BOINC_USER: can't attach shmem\n");
         exit(1);
     }
     ssp = (SCHED_SHMEM*)p;
     retval = ssp->verify();
     if (retval) {
-        fprintf(stderr, "BOINC scheduler: shmem has wrong struct sizes - recompile\n");
+        fprintf(stderr, "BOINC scheduler - Compiled by BOINC_USER: shmem has wrong struct sizes - recompile\n");
         exit(1);
     }
 
     for (i=0; i<10; i++) {
         if (ssp->ready) break;
-        fprintf(stderr, "BOINC scheduler: waiting for ready flag\n");
+        fprintf(stderr, "BOINC scheduler - Compiled by BOINC_USER: waiting for ready flag\n");
         sleep(1);
     }
     if (!ssp->ready) {
-        fprintf(stderr, "BOINC scheduler: feeder doesn't seem to be running\n");
+        fprintf(stderr, "BOINC scheduler - Compiled by BOINC_USER: feeder doesn't seem to be running\n");
         exit(1);
     }
     //fprintf(stderr, "got ready flag\n");
     retval = db_open(BOINC_DB_NAME);
     if (retval) {
-        exit(return_error("BOINC scheduler: can't open database"));
+        exit(return_error("BOINC scheduler - Compiled by BOINC_USER: can't open database"));
     }
     pid = getpid();
 #ifdef _USING_FCGI_
@@ -98,24 +98,24 @@ int main() {
     fprintf(stdout, "Content-type: text/plain\n\n");
     fout = fopen(req_path, "w");
     if (!fout) {
-        exit(return_error("can't write request file"));
+        exit(return_error("Compiled by BOINC_USER: can't write request file"));
     }
     copy_stream(stdin, fout);
     fclose(fout);
     fin = fopen(req_path, "r");
     if (!fin) {
-        exit(return_error("can't read request file"));
+        exit(return_error("Compiled by BOINC_USER: can't read request file"));
     }
     fout = fopen(reply_path, "w");
     if (!fout) {
-        exit(return_error("can't write reply file"));
+        exit(return_error("Compiled by BOINC_USER: can't write reply file"));
     }
     handle_request(fin, fout, *ssp, code_sign_key);
     fclose(fin);
     fclose(fout);
     fin = fopen(reply_path, "r");
     if (!fin) {
-        exit(return_error("can't read reply file"));
+        exit(return_error("Compiled by BOINC_USER: can't read reply file"));
     }
     copy_stream(fin, stdout);
     fclose(fin);