Implement berrno for bpipes and run_program

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1496 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 377e7e83aca25e2f7afa9e719c069b583a045aa4..3f47599c7e4d75204d044f668c371ad24008b6b3 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -4,10 +4,6 @@
 1.35 Items to do:
 - Add bscan to four-concurrent-jobs regression.
 - Do tape alerts -- see tapealert.txt
-- Fix errno handling in win32 compat routines.
-- Add better error codes to run_program (10000+)
-- Revisit and revise Disaster Recovery (fix SCSI and RAID 
-  disk detection)
 - Document a get out of jail procedure if everything breaks if 
   you lost/broke the Catalog -- do the same for "I know my
   file is there how do I get it back?".
@@ -27,6 +23,7 @@
 - Fix restore ++++ that get intermingled with "Building directory tree"
 - Solve the termcap.h problem on Solaris configure.
 - Fix ./configure to handle installed SQLite
+- Test Win32 errno handling.
 
 Documentation to do: (any release a little bit at a time)
 - Document query file format.
@@ -1115,3 +1112,8 @@ Block Position: 0
    Building directory tree for JobId 856 ...
    Building directory tree for JobId 797 ...3 
    Jobs inserted into the tree.
+- Fix errno handling in win32 compat routines.
+- Add better error codes to run_program (10000+)
+- Revisit and revise Disaster Recovery (fix SCSI and RAID 
+  disk detection)
+

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 9d0726f0dd593fcbde975125381b0958dbdff978..a10f73318059b429bd8954e61382ead615815098 100644 (file)
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -362,8 +362,9 @@ static void backup_cleanup(JCR *jcr, int TermCode, char *since, FILESET_DBR *fsr
            fclose(fd);
         }
       } else {
+        berrno be;
          Jmsg(jcr, M_ERROR, 0, _("Could not open WriteBootstrap file:\n"
-              "%s: ERR=%s\n"), fname, strerror(errno));
+              "%s: ERR=%s\n"), fname, be.strerror());
         set_jcr_job_status(jcr, JS_ErrorTerminated);
       }
    }

diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index c37db4900a77753119902c1a786f06b81412b6d1..fdc8617cf49f14f345ba6b1c0ed8d45e326fae3b 100644 (file)
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -254,8 +254,9 @@ static int send_list(JCR *jcr, int list)
             fd->msg = edit_job_codes(jcr, fd->msg, p, "");
             bpipe = open_bpipe(fd->msg, 0, "r");
            if (!bpipe) {
+              berrno be;
                Jmsg(jcr, M_FATAL, 0, _("Cannot run program: %s. ERR=%s\n"),
-                 p, strerror(errno));
+                 p, be.strerror());
               goto bail_out;
            }
            /* Copy File options */
@@ -276,8 +277,10 @@ static int send_list(JCR *jcr, int list)
               }
            }
            if ((stat=close_bpipe(bpipe)) != 0) {
-               Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. RtnStat=%d ERR=%s\n"),
-                 p, stat, strerror(errno));
+              berrno be;
+              be.set_errno(stat);
+               Jmsg(jcr, M_FATAL, 0, _("Error running program %p: ERR=%s\n"),
+                 p, be.strerror());
               goto bail_out;
            }
            break;
@@ -415,8 +418,10 @@ static int send_fileset(JCR *jcr)
                  }
               }
               if ((stat=close_bpipe(bpipe)) != 0) {
-                  Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. RtnStat=%d ERR=%s\n"),
-                    p, stat, strerror(errno));
+                 berrno be;
+                 be.set_errno(stat);
+                  Jmsg(jcr, M_FATAL, 0, _("Error running program: %s. ERR=%s\n"),
+                    p, be.strerror());
                  goto bail_out;
               }
               break;

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index bbbefa8997e049899c29c5d712e3060a4b362ae5..e387dd9255193a5622c35c6b9c1e1b9dae96508b 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -57,7 +57,9 @@ void init_job_server(int max_workers)
    watchdog_t *wd;
    
    if ((stat = jobq_init(&job_queue, max_workers, job_thread)) != 0) {
-      Emsg1(M_ABORT, 0, _("Could not init job queue: ERR=%s\n"), strerror(stat));
+      berrno be;
+      be.set_errno(stat);
+      Emsg1(M_ABORT, 0, _("Could not init job queue: ERR=%s\n"), be.strerror());
    }
    if ((wd = new_watchdog()) == NULL) {
       Emsg0(M_ABORT, 0, _("Could not init job monitor watchdogs\n"));
@@ -89,7 +91,9 @@ JobId_t run_job(JCR *jcr)
 
    /* Initialize termination condition variable */
    if ((errstat = pthread_cond_init(&jcr->term_wait, NULL)) != 0) {
-      Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+      berrno be;
+      be.set_errno(errstat);
+      Jmsg1(jcr, M_FATAL, 0, _("Unable to init job cond variable: ERR=%s\n"), be.strerror());
       goto bail_out;
    }
    jcr->term_wait_inited = true;
@@ -129,7 +133,9 @@ JobId_t run_job(JCR *jcr)
 
    /* Queue the job to be run */
    if ((stat = jobq_add(&job_queue, jcr)) != 0) {
-      Jmsg(jcr, M_FATAL, 0, _("Could not add job queue: ERR=%s\n"), strerror(stat));
+      berrno be;
+      be.set_errno(stat);
+      Jmsg(jcr, M_FATAL, 0, _("Could not add job queue: ERR=%s\n"), be.strerror());
       JobId = 0;
       goto bail_out;
    }
@@ -189,8 +195,9 @@ static void *job_thread(void *arg)
            }
            status = close_bpipe(bpipe);
            if (status != 0) {
-               Jmsg(jcr, M_FATAL, 0, _("RunBeforeJob returned non-zero status=%d\n"),
-                 status);
+              berrno be;
+              be.set_errno(status);
+               Jmsg(jcr, M_FATAL, 0, _("RunBeforeJob error: ERR=%s\n"), be.strerror());
               set_jcr_job_status(jcr, JS_FatalError);
               update_job_end_record(jcr);
               goto bail_out;
@@ -248,12 +255,12 @@ static void *job_thread(void *arg)
             *  job in error, simply report the error condition.   
             */
            if (status != 0) {
+              berrno be;
+              be.set_errno(status);
               if (jcr->JobStatus == JS_Terminated) {
-                  Jmsg(jcr, M_WARNING, 0, _("RunAfterJob returned non-zero status=%d\n"),
-                      status);
+                  Jmsg(jcr, M_WARNING, 0, _("RunAfterJob error: ERR=%s\n"), be.strerror());
               } else {
-                  Jmsg(jcr, M_FATAL, 0, _("RunAfterFailedJob returned non-zero status=%d\n"),
-                      status);
+                  Jmsg(jcr, M_FATAL, 0, _("RunAfterFailedJob error: ERR=%s\n"), be.strerror());
               }
            }
         }

diff --git a/bacula/src/lib/berrno.c b/bacula/src/lib/berrno.c
index 9ec5fbd6bba196751d0806754380c87c3d694fe3..9354bb8ca93a8a65d824c56d12db11f02a17f241 100644 (file)
--- a/bacula/src/lib/berrno.c
+++ b/bacula/src/lib/berrno.c
@@ -33,77 +33,69 @@
 
 #include "bacula.h"
 
+#ifndef HAVE_WIN32
+extern const char *get_signal_name(int sig);
+extern int num_execvp_errors;
+extern int execvp_errors[];
+#endif
+
 const char *berrno::strerror()
 {
+   int stat = 0; 
 #ifdef HAVE_WIN32
    LPVOID msg;
 
-   if (errnum && b_errno_win32) {
+   if (berrno_ && b_errno_win32) {
       FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
          FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
          NULL,
          GetLastError(),
          MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-         (LPTSTR)&msg;
+         (LPTSTR)&msg,
          0,
          NULL);
 
-      pm_strcpy(&buf_, msg);
+      pm_strcpy(&buf_, (const char *)msg);
       LocalFree(msg);
       return (const char *)buf_;
    }
+#else
+   if (berrno_ & b_errno_exit) {
+      stat = (berrno_ & ~b_errno_exit);       /* remove bit */
+      if (stat == 0) {
+         return "Child exited normally.";    /* this really shouldn't happen */
+      } else {
+        /* Maybe an execvp failure */
+        if (stat >= 200) {
+           if (stat < 200 + num_execvp_errors) {
+              berrno_ = execvp_errors[stat - 200];
+           } else {
+               return "Unknown error during program execvp";
+           }
+        } else {
+            Mmsg(&buf_, "Child exited with code %d", stat);
+           return buf_;
+        }
+        /* If we drop out here, berrno_ is set to an execvp errno */
+      }
+   }
+   if (berrno_ & b_errno_signal) {
+      stat = (berrno_ & ~b_errno_signal);       /* remove bit */
+      Mmsg(&buf_, "Child died from signal %d: %s", stat, get_signal_name(stat));
+      return buf_;
+   }
 #endif
+   /* Normal errno */
    if (bstrerror(berrno_, buf_, 1024) < 0) {
       return "Invalid errno. No error message possible."; 
    }
-   return (const char *)buf_;
+   return buf_;
 }
 
 
 #ifdef TEST_PROGRAM
 
-
-struct FILESET {
-   alist mylist;
-};
-
 int main()
 {
-   FILESET *fileset;
-   char buf[30];
-   alist *mlist;
-
-   fileset = (FILESET *)malloc(sizeof(FILESET));
-   memset(fileset, 0, sizeof(FILESET));
-   fileset->mylist.init();
-
-   printf("Manual allocation/destruction of list:\n");
-   
-   for (int i=0; i<20; i++) {
-      sprintf(buf, "This is item %d", i);
-      fileset->mylist.append(bstrdup(buf));
-   } 
-   for (int i=0; i< fileset->mylist.size(); i++) {
-      printf("Item %d = %s\n", i, (char *)fileset->mylist[i]);  
-   }
-   fileset->mylist.destroy();
-   free(fileset);
-
-   printf("Allocation/destruction using new delete\n");
-   mlist = new alist(10);
-
-   for (int i=0; i<20; i++) {
-      sprintf(buf, "This is item %d", i);
-      mlist->append(bstrdup(buf));
-   } 
-   for (int i=0; i< mlist->size(); i++) {
-      printf("Item %d = %s\n", i, (char *)mlist->get(i));  
-   }
-
-   delete mlist;
-
-
-   sm_dump(false);
-
 }
 #endif

diff --git a/bacula/src/lib/berrno.h b/bacula/src/lib/berrno.h
index 88492e1772e160e31ad83602c880bdc08d21bb0c..7efdeba61bede9cdc3d0aa34a2cadfadd2d6ba2d 100644 (file)
--- a/bacula/src/lib/berrno.h
+++ b/bacula/src/lib/berrno.h
@@ -25,8 +25,10 @@
  */
 
 #ifdef HAVE_WIN32
-#define b_errno_win32 (1<<29)         /* user reserved bit */
+#define b_errno_win32  (1<<29)        /* user reserved bit */
 #endif
+#define b_errno_exit   (1<<28)        /* child exited, exit code returned */
+#define b_errno_signal (1<<27)        /* child died, signal code returned */
 
 /*
  * A more generalized way of handling errno that works with Unix, Windows,

diff --git a/bacula/src/lib/bpipe.c b/bacula/src/lib/bpipe.c
index 6955aa650e0899838401f1d6b02be79fbec2687a..20cf5bee82f0572e83006b5e594bcee8b43622f7 100644 (file)
--- a/bacula/src/lib/bpipe.c
+++ b/bacula/src/lib/bpipe.c
@@ -29,12 +29,14 @@
 #include "bacula.h"
 #include "jcr.h"
 
+int execvp_errors[] = {EACCES, ENOEXEC, EFAULT, EINTR, E2BIG, 
+                    ENAMETOOLONG, ENOMEM, ETXTBSY, ENOENT};
+int num_execvp_errors = (int)(sizeof(execvp_errors)/sizeof(int));
+
 
 #define MAX_ARGV 100
 static void build_argc_argv(char *cmd, int *bargc, char *bargv[], int max_arg);
 
-
-
 /*
  * Run an external program. Optionally wait a specified number
  *   of seconds. Program killed if wait exceeded. We open
@@ -49,6 +51,7 @@ BPIPE *open_bpipe(char *prog, int wait, const char *mode)
    POOLMEM *tprog;
    int mode_read, mode_write;
    BPIPE *bpipe;
+   int save_errno;
 
    bpipe = (BPIPE *)malloc(sizeof(BPIPE));
    memset(bpipe, 0, sizeof(BPIPE));
@@ -68,20 +71,25 @@ BPIPE *open_bpipe(char *prog, int wait, const char *mode)
 
    /* Each pipe is one way, write one end, read the other, so we need two */
    if (mode_write && pipe(writep) == -1) {
+      save_errno = errno;
       free(bpipe);
+      errno = save_errno;
       return NULL;
    }
    if (mode_read && pipe(readp) == -1) {
+      save_errno = errno;
       if (mode_write) {
         close(writep[0]);
         close(writep[1]);
       }
       free(bpipe);
+      errno = save_errno;
       return NULL;
    }
    /* Start worker process */
    switch (bpipe->worker_pid = fork()) {
    case -1:                          /* error */
+      save_errno = errno;
       if (mode_write) {
         close(writep[0]);
         close(writep[1]);
@@ -91,6 +99,7 @@ BPIPE *open_bpipe(char *prog, int wait, const char *mode)
         close(readp[1]);
       }
       free(bpipe);
+      errno = save_errno;
       return NULL;
 
    case 0:                           /* child */
@@ -108,7 +117,15 @@ BPIPE *open_bpipe(char *prog, int wait, const char *mode)
         close(i);
       }
       execvp(bargv[0], bargv);       /* call the program */
-      exit(errno);                    /* shouldn't get here */
+      /* Convert errno into an exit code for later analysis */
+      for (i=0; i< num_execvp_errors; i++) {
+        if (execvp_errors[i] == errno) {
+           exit(200 + i);            /* exit code => errno */
+        }
+      }
+      exit(255);                     /* unknown errno */
+
+
 
    default:                          /* parent */
       break;
@@ -148,7 +165,7 @@ int close_wpipe(BPIPE *bpipe)
  * Close both pipes and free resources  
  *
  *  Returns: 0 on success
- *          errno on failure
+ *          berrno on failure
  */
 int close_bpipe(BPIPE *bpipe) 
 {
@@ -183,6 +200,7 @@ int close_bpipe(BPIPE *bpipe)
         wpid = waitpid(bpipe->worker_pid, &chldstatus, wait_option);
       } while (wpid == -1 && (errno == EINTR || errno == EAGAIN));
       if (wpid == bpipe->worker_pid || wpid == -1) {
+        stat = errno;
          Dmsg3(200, "Got break wpid=%d status=%d ERR=%s\n", wpid, chldstatus,
             wpid==-1?strerror(errno):"none");
         break;
@@ -190,7 +208,7 @@ int close_bpipe(BPIPE *bpipe)
       Dmsg3(200, "Got wpid=%d status=%d ERR=%s\n", wpid, chldstatus,
             wpid==-1?strerror(errno):"none");
       if (remaining_wait > 0) {
-        bmicrosleep(1, 0);            /* wait one second */
+        bmicrosleep(1, 0);           /* wait one second */
         remaining_wait--;
       } else {
         stat = ETIME;                /* set error status */
@@ -199,18 +217,19 @@ int close_bpipe(BPIPE *bpipe)
       }
    }
    if (wpid > 0) {
-      if (WIFEXITED(chldstatus)) {          /* process exit()ed */
+      if (WIFEXITED(chldstatus)) {    /* process exit()ed */
         stat = WEXITSTATUS(chldstatus);
         if (stat != 0) {
             Dmsg1(100, "Non-zero status %s returned from child.\n", stat);
-           stat = ECHILD;
+           stat |= b_errno_exit;        /* exit status returned */
         }
-         Dmsg1(200, "child status=%d\n", stat);
+         Dmsg1(200, "child status=%d\n", stat & ~b_errno_exit);
       } else if (WIFSIGNALED(chldstatus)) {  /* process died */
-        stat = ECHILD;
-         Dmsg0(200, "Signaled\n");
+        stat = WTERMSIG(chldstatus);
+         Dmsg1(200, "Child died from signale %d\n", stat);
+        stat |= b_errno_signal;      /* exit signal returned */
       }
-   }  
+   }      
    if (bpipe->timer_id) {
       stop_child_timer(bpipe->timer_id);
    }
@@ -228,7 +247,7 @@ int close_bpipe(BPIPE *bpipe)
  * Contrary to my normal calling conventions, this program 
  *
  *  Returns: 0 on success
- *          non-zero on error == errno
+ *          non-zero on error == berrno status
  */
 int run_program(char *prog, int wait, POOLMEM *results)
 {

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 93e82570a4c391ff3131e0b22205c2c3562af292..f33380aa678db9741e9b8699942302eea05a1cc1 100755 (executable)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -473,10 +473,12 @@ void close_msg(JCR *jcr)
 
            stat = close_bpipe(bpipe);
            if (stat != 0 && msgs != daemon_msgs) {
+              berrno be;
+              be.set_errno(stat);
                Dmsg1(150, "Calling emsg. CMD=%s\n", cmd);
-               Jmsg3(jcr, M_ERROR, 0, _("Mail program terminated in error. stat=%d\n"
+               Jmsg2(jcr, M_ERROR, 0, _("Mail program terminated in error.\n"
                                         "CMD=%s\n"
-                                        "ERR=%s\n"), stat, cmd, strerror(stat));
+                                        "ERR=%s\n"), cmd, be.strerror());
            }
            free_memory(line);
 rem_temp_file:
@@ -645,9 +647,11 @@ void dispatch_message(JCR *jcr, int type, int level, char *msg)
                   /* Messages to the operator go one at a time */
                   stat = close_bpipe(bpipe);
                   if (stat != 0) {
+                     berrno be;
+                     be.set_errno(stat);
                       Jmsg2(jcr, M_ERROR, 0, _("Operator mail program terminated in error.\n"
                             "CMD=%s\n"
-                            "ERR=%s\n"), mcmd, strerror(stat));
+                            "ERR=%s\n"), mcmd, be.strerror());
                   }
                }
                free_pool_memory(mcmd);

diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c
index 74091e75c187087baab82a11ba3bde99c773769d..b6ae5eafa190c8a410ba68892f1a58e2080d9cb8 100644 (file)
--- a/bacula/src/lib/signal.c
+++ b/bacula/src/lib/signal.c
@@ -55,6 +55,15 @@ static SIG_HANDLER *exit_handler;
 /* main process id */
 static pid_t main_pid = 0;
 
+const char *get_signal_name(int sig)
+{
+   if (sig < 0 || sig > BA_NSIG || !sig_names[sig]) {
+      return "Invalid signal number";
+   } else {
+      return sig_names[sig];
+   }
+}
+
 /* 
  * Handle signals here
  */

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index d73c564092c8c7cfa69da1e1f0cf824399207000..342619ad304eaa00b6c9e497f8172dc27c825109 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -95,6 +95,13 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
            changer = edit_device_codes(jcr, changer, 
                         jcr->device->changer_command, "unload");
            status = run_program(changer, timeout, NULL);
+           if (status != 0) {
+              berrno be;
+              be.set_errno(status);
+               Jmsg(jcr, M_INFO, 0, _("3992 Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n"),
+                   slot, drive, be.strerror());
+           }
+
             Dmsg1(400, "unload status=%d\n", status);
         }
         /*
@@ -112,8 +119,10 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
             Jmsg(jcr, M_INFO, 0, _("3305 Autochanger \"load slot %d, drive %d\", status is OK.\n"),
                    slot, drive);
         } else {
-            Jmsg(jcr, M_INFO, 0, _("3992 Bad autochanger \"load slot %d, drive %d\", status=%d.\n"),
-                   slot, drive, status);
+          berrno be;
+          be.set_errno(status);
+            Jmsg(jcr, M_INFO, 0, _("3992 Bad autochanger \"load slot %d, drive %d\": ERR=%s.\n"),
+                   slot, drive, be.strerror());
         }
          Dmsg2(400, "load slot %d status=%d\n", slot, status);
       } else { 
@@ -157,8 +166,10 @@ static int get_autochanger_loaded_slot(JCR *jcr)
              drive);
       }
    } else {
-      Jmsg(jcr, M_INFO, 0, _("3991 Bad autochanger \"loaded drive %d\" command, status=%d.\n"), 
-          drive, status);
+      berrno be;
+      be.set_errno(status);
+      Jmsg(jcr, M_INFO, 0, _("3991 Bad autochanger \"loaded drive %d\" command: ERR=%s.\n"), 
+          drive, be.strerror());
       loaded = -1;             /* force unload */
    }
    free_pool_memory(changer);
@@ -216,7 +227,13 @@ bool autochanger_list(DCR *dcr, BSOCK *dir)
       slot = jcr->VolCatInfo.Slot; 
       jcr->VolCatInfo.Slot = loaded;
       changer = edit_device_codes(jcr, changer, jcr->device->changer_command, "unload");
-      run_program(changer, timeout, NULL);
+      int stat = run_program(changer, timeout, NULL);
+      if (stat != 0) {
+        berrno be;
+        be.set_errno(stat);
+         Jmsg(jcr, M_INFO, 0, _("3995 Bad autochanger \"unload slot %d\" command: ERR=%s.\n"), 
+             loaded, be.strerror());
+      }
       jcr->VolCatInfo.Slot = slot;
    }
 
@@ -234,8 +251,13 @@ bool autochanger_list(DCR *dcr, BSOCK *dir)
       dir->msglen = strlen(dir->msg);
       bnet_send(dir);
    }
+   int stat = close_bpipe(bpipe);
+   if (stat != 0) {
+      berrno be;
+      be.set_errno(stat);
+      bnet_fsend(dir, "Autochanger error: ERR=%s\n", be.strerror());
+   }
    bnet_sig(dir, BNET_EOD);
-   close_bpipe(bpipe);
 
    free_pool_memory(changer);
    return true;

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index 5ac4c6a46a2eddce8b501b540b2a5ddbf992d2f2..e9a1dc548b1d9aaa91042aef7040e399ad5e0cf3 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -1102,12 +1102,14 @@ try_again:
    changer = edit_device_codes(jcr, changer, jcr->device->changer_command, 
                 "loaded");
    status = run_program(changer, timeout, results);
-   Dmsg3(100, "run_prog: %s stat=%d result=%s\n", changer, status, results);
+   Dmsg3(100, "run_prog: %s stat=%d result=\"%s\"\n", changer, status, results);
    if (status == 0) {
       loaded = atoi(results);
    } else {
+      berrno be;
+      be.set_errno(status);
       Pmsg1(-1, _("3991 Bad autochanger command: %s\n"), changer);
-      Pmsg2(-1, _("3991 status=%d result=%s\n"), status, results);
+      Pmsg2(-1, _("3991 result=\"%s\": ERR=%s\n"), results, be.strerror());
       goto bail_out;
    }
    if (loaded) {
@@ -1128,8 +1130,10 @@ try_again:
       status = run_program(changer, timeout, results);
       Pmsg2(-1, "unload status=%s %d\n", status==0?"OK":"Bad", status);
       if (status != 0) {
+        berrno be;
+        be.set_errno(status);
          Pmsg1(-1, _("3992 Bad autochanger command: %s\n"), changer);
-         Pmsg2(-1, _("3992 status=%d result=%s\n"), status, results);
+         Pmsg2(-1, _("3992 result=\"%s\": ERR=%s\n"), results, be.strerror());
       }
    }
 
@@ -1149,8 +1153,10 @@ try_again:
       Pmsg2(-1,  _("3303 Autochanger \"load slot %d %d\" status is OK.\n"),
         slot, dev->drive_index);
    } else {
+      berrno be;
+      be.set_errno(status);
       Pmsg1(-1, _("3993 Bad autochanger command: %s\n"), changer);
-      Pmsg2(-1, _("3993 status=%d result=%s\n"), status, results);
+      Pmsg2(-1, _("3993 result=\"%s\": ERR=%s\n"), results, be.strerror());
       goto bail_out;
    }
 

diff --git a/bacula/src/win32/baculafd/baculafd.mak b/bacula/src/win32/baculafd/baculafd.mak
index 8dd3586b2d366213843dd845bafa9a3d747c597b..ee1d3b01d3297f5f29c3487fbedfaf73af85488d 100644 (file)
--- a/bacula/src/win32/baculafd/baculafd.mak
+++ b/bacula/src/win32/baculafd/baculafd.mak
@@ -47,6 +47,7 @@ CLEAN :
         -@erase "$(INTDIR)\authenticate.obj"
         -@erase "$(INTDIR)\backup.obj"
         -@erase "$(INTDIR)\base64.obj"
+        -@erase "$(INTDIR)\berrno.obj"
         -@erase "$(INTDIR)\bfile.obj"
         -@erase "$(INTDIR)\bget_msg.obj"
         -@erase "$(INTDIR)\bnet.obj"
@@ -133,6 +134,7 @@ LINK32_OBJS= \
         "$(INTDIR)\authenticate.obj" \
         "$(INTDIR)\backup.obj" \
         "$(INTDIR)\base64.obj" \
+        "$(INTDIR)\berrno.obj" \
         "$(INTDIR)\bfile.obj" \
         "$(INTDIR)\bget_msg.obj" \
         "$(INTDIR)\bnet.obj" \
@@ -229,6 +231,8 @@ CLEAN :
         -@erase "$(INTDIR)\backup.sbr"
         -@erase "$(INTDIR)\base64.obj"
         -@erase "$(INTDIR)\base64.sbr"
+        -@erase "$(INTDIR)\berrno.obj"
+        -@erase "$(INTDIR)\berrno.sbr"
         -@erase "$(INTDIR)\bfile.obj"
         -@erase "$(INTDIR)\bfile.sbr"
         -@erase "$(INTDIR)\bget_msg.obj"
@@ -376,6 +380,7 @@ BSC32_SBRS= \
         "$(INTDIR)\authenticate.sbr" \
         "$(INTDIR)\backup.sbr" \
         "$(INTDIR)\base64.sbr" \
+        "$(INTDIR)\berrno.sbr" \
         "$(INTDIR)\bfile.sbr" \
         "$(INTDIR)\bget_msg.sbr" \
         "$(INTDIR)\bnet.sbr" \
@@ -455,6 +460,7 @@ LINK32_OBJS= \
         "$(INTDIR)\authenticate.obj" \
         "$(INTDIR)\backup.obj" \
         "$(INTDIR)\base64.obj" \
+        "$(INTDIR)\berrno.obj" \
         "$(INTDIR)\bfile.obj" \
         "$(INTDIR)\bget_msg.obj" \
         "$(INTDIR)\bnet.obj" \
@@ -694,6 +700,25 @@ SOURCE=..\lib\base64.cpp
 
 !ENDIF 
 
+SOURCE=..\lib\berrno.cpp
+
+!IF  "$(CFG)" == "baculafd - Win32 Release"
+
+
+"$(INTDIR)\berrno.obj" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "baculafd - Win32 Debug"
+
+
+"$(INTDIR)\berrno.obj"  "$(INTDIR)\berrno.sbr" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
 SOURCE=..\findlib\bfile.cpp
 
 !IF  "$(CFG)" == "baculafd - Win32 Release"

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index e9cc05cc9ae83984986221916ac702322d995bb8..d57575bdf936dd8d613332bf383862eaa7ca7ec5 100644 (file)
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -31,6 +31,8 @@
 #include "compat.h"
 #include "pthread.h"
 
+#define b_errno_win32 (1<<29)
+
 #define USE_WIN32_COMPAT_IO 1
 
 extern void d_msg(const char *file, int line, int level, const char *fmt,...);
@@ -1064,7 +1066,7 @@ cleanup:
     CloseIfValid(hChildStdinWrDup);
 
     free((void *) bpipe);
-
+    errno = b_errno_win32;            /* do GetLastError() for error code */
     return NULL;
 }
 
@@ -1074,8 +1076,10 @@ int
 kill(int pid, int signal)
 {
     int rval = 0;
-    if (!TerminateProcess((HANDLE)pid, (UINT) signal))
+    if (!TerminateProcess((HANDLE)pid, (UINT) signal)) {
         rval = -1;
+        errno = b_errno_win32;
+    }
     CloseHandle((HANDLE)pid);
     return rval;
 }
@@ -1095,7 +1099,7 @@ close_bpipe(BPIPE *bpipe)
             DWORD exitCode;
             if (!GetExitCodeProcess((HANDLE)bpipe->worker_pid, &exitCode)) {
                 const char *err = errorString();
-                rval = GetLastError();
+                rval = b_errno_win32;
                 d_msg(__FILE__, __LINE__, 0,
                       "GetExitCode error %s\n", err);
                 LocalFree((void *)err);
@@ -1108,6 +1112,7 @@ close_bpipe(BPIPE *bpipe)
             }
             else break;
         } while(remaining_wait);
+        rval = ETIME;                 /* timed out */
     }
 
     if (bpipe->timer_id) {

diff --git a/bacula/src/win32/console/console.mak b/bacula/src/win32/console/console.mak
index 8c9e2534f80d1ed7ec3e06e25965b5d4de9408eb..5ac8c61c938d00b104ef1197b6af55a69c83cd99 100644 (file)
--- a/bacula/src/win32/console/console.mak
+++ b/bacula/src/win32/console/console.mak
@@ -43,6 +43,7 @@ CLEAN :
         -@erase "$(INTDIR)\alist.obj"
         -@erase "$(INTDIR)\authenticate.obj"
         -@erase "$(INTDIR)\base64.obj"
+        -@erase "$(INTDIR)\berrno.obj"
         -@erase "$(INTDIR)\bnet.obj"
         -@erase "$(INTDIR)\bsys.obj"
         -@erase "$(INTDIR)\btime.obj"
@@ -91,6 +92,7 @@ LINK32_OBJS= \
         "$(INTDIR)\alist.obj" \
         "$(INTDIR)\authenticate.obj" \
         "$(INTDIR)\base64.obj" \
+        "$(INTDIR)\berrno.obj" \
         "$(INTDIR)\bnet.obj" \
         "$(INTDIR)\bsys.obj" \
         "$(INTDIR)\btime.obj" \
@@ -142,6 +144,7 @@ CLEAN :
         -@erase "$(INTDIR)\alist.obj"
         -@erase "$(INTDIR)\authenticate.obj"
         -@erase "$(INTDIR)\base64.obj"
+        -@erase "$(INTDIR)\berrno.obj"
         -@erase "$(INTDIR)\bnet.obj"
         -@erase "$(INTDIR)\bsys.obj"
         -@erase "$(INTDIR)\btime.obj"
@@ -191,6 +194,7 @@ LINK32_OBJS= \
         "$(INTDIR)\alist.obj" \
         "$(INTDIR)\authenticate.obj" \
         "$(INTDIR)\base64.obj" \
+        "$(INTDIR)\berrno.obj" \
         "$(INTDIR)\bnet.obj" \
         "$(INTDIR)\bsys.obj" \
         "$(INTDIR)\btime.obj" \
@@ -286,6 +290,12 @@ SOURCE=..\lib\base64.cpp
 "$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"
         $(CPP) $(CPP_PROJ) $(SOURCE)
 
+SOURCE=..\lib\berrno.cpp
+
+"$(INTDIR)\berrno.obj" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
 
 SOURCE=..\lib\bnet.cpp
 
@@ -485,4 +495,3 @@ SOURCE=..\lib\watchdog.cpp
 
 
 !ENDIF 
-

diff --git a/bacula/src/win32/lib/berrno.cpp b/bacula/src/win32/lib/berrno.cpp
new file mode 100644 (file)
index 0000000..a630abb
--- /dev/null
+++ b/bacula/src/win32/lib/berrno.cpp
@@ -0,0 +1 @@
+#include "../../lib/berrno.c"

diff --git a/bacula/src/win32/wx-console/filelist b/bacula/src/win32/wx-console/filelist
index b8bccdca1920a46f1e8478865bbfe9a25c53dd3e..aa737be66b3fced59faca05534649967907ef86d 100644 (file)
--- a/bacula/src/win32/wx-console/filelist
+++ b/bacula/src/win32/wx-console/filelist
@@ -2,6 +2,7 @@
 ..\lib\alloc
 ..\lib\attr
 ..\lib\base64
+..\lib\berrno
 ..\lib\bget_msg
 ..\lib\bnet
 ..\lib\bnet_pkt

diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak
index d3f0ac5486318bae6673a2a1e9af6df193fb8e0a..ec3a9a2cf54c4368274c89e0462670f2c757835f 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak
+++ b/bacula/src/win32/wx-console/wx-console.mak
@@ -40,61 +40,62 @@ ALL : "$(OUTDIR)\wx-console.exe"
 
 
 CLEAN :
-        -@erase "$(INTDIR)\alist.obj"
-        -@erase "$(INTDIR)\alloc.obj"
-        -@erase "$(INTDIR)\attr.obj"
-        -@erase "$(INTDIR)\base64.obj"
-        -@erase "$(INTDIR)\bget_msg.obj"
-        -@erase "$(INTDIR)\bnet.obj"
-        -@erase "$(INTDIR)\bnet_pkt.obj"
-        -@erase "$(INTDIR)\bnet_server.obj"
-        -@erase "$(INTDIR)\bshm.obj"
-        -@erase "$(INTDIR)\bsys.obj"
-        -@erase "$(INTDIR)\btime.obj"
-        -@erase "$(INTDIR)\cram-md5.obj"
-        -@erase "$(INTDIR)\crc32.obj"
-        -@erase "$(INTDIR)\daemon.obj"
-        -@erase "$(INTDIR)\dlist.obj"
-        -@erase "$(INTDIR)\edit.obj"
-        -@erase "$(INTDIR)\fnmatch.obj"
-        -@erase "$(INTDIR)\hmac.obj"
-        -@erase "$(INTDIR)\htable.obj"
-        -@erase "$(INTDIR)\idcache.obj"
-        -@erase "$(INTDIR)\jcr.obj"
-        -@erase "$(INTDIR)\lex.obj"
-        -@erase "$(INTDIR)\md5.obj"
-        -@erase "$(INTDIR)\mem_pool.obj"
-        -@erase "$(INTDIR)\message.obj"
-        -@erase "$(INTDIR)\parse_conf.obj"
-        -@erase "$(INTDIR)\queue.obj"
-        -@erase "$(INTDIR)\rwlock.obj"
-        -@erase "$(INTDIR)\scan.obj"
-        -@erase "$(INTDIR)\semlock.obj"
-        -@erase "$(INTDIR)\serial.obj"
-        -@erase "$(INTDIR)\sha1.obj"
-        -@erase "$(INTDIR)\signal.obj"
-        -@erase "$(INTDIR)\smartall.obj"
-        -@erase "$(INTDIR)\btimers.obj"
-        -@erase "$(INTDIR)\tree.obj"
-        -@erase "$(INTDIR)\util.obj"
-        -@erase "$(INTDIR)\var.obj"
-        -@erase "$(INTDIR)\watchdog.obj"
-        -@erase "$(INTDIR)\workq.obj"
-        -@erase "$(INTDIR)\compat.obj"
-        -@erase "$(INTDIR)\print.obj"
-        -@erase "$(INTDIR)\authenticate.obj"
-        -@erase "$(INTDIR)\console_conf.obj"
-        -@erase "$(INTDIR)\console_thread.obj"
-        -@erase "$(INTDIR)\main.obj"
-        -@erase "$(INTDIR)\wxblistctrl.obj"
-        -@erase "$(INTDIR)\wxbmainframe.obj"
-        -@erase "$(INTDIR)\wxbrestorepanel.obj"
-        -@erase "$(INTDIR)\wxbtableparser.obj"
-        -@erase "$(INTDIR)\wxbtreectrl.obj"
-        -@erase "$(INTDIR)\wxbutils.obj"
-        -@erase "$(INTDIR)\wxbconfigpanel.obj"
-        -@erase "$(INTDIR)\wxbconfigfileeditor.obj"
-        -@erase "$(INTDIR)\wxbhistorytextctrl.obj"
+       -@erase "$(INTDIR)\alist.obj"
+       -@erase "$(INTDIR)\alloc.obj"
+       -@erase "$(INTDIR)\attr.obj"
+       -@erase "$(INTDIR)\base64.obj"
+       -@erase "$(INTDIR)\berrno.obj"
+       -@erase "$(INTDIR)\bget_msg.obj"
+       -@erase "$(INTDIR)\bnet.obj"
+       -@erase "$(INTDIR)\bnet_pkt.obj"
+       -@erase "$(INTDIR)\bnet_server.obj"
+       -@erase "$(INTDIR)\bshm.obj"
+       -@erase "$(INTDIR)\bsys.obj"
+       -@erase "$(INTDIR)\btime.obj"
+       -@erase "$(INTDIR)\cram-md5.obj"
+       -@erase "$(INTDIR)\crc32.obj"
+       -@erase "$(INTDIR)\daemon.obj"
+       -@erase "$(INTDIR)\dlist.obj"
+       -@erase "$(INTDIR)\edit.obj"
+       -@erase "$(INTDIR)\fnmatch.obj"
+       -@erase "$(INTDIR)\hmac.obj"
+       -@erase "$(INTDIR)\htable.obj"
+       -@erase "$(INTDIR)\idcache.obj"
+       -@erase "$(INTDIR)\jcr.obj"
+       -@erase "$(INTDIR)\lex.obj"
+       -@erase "$(INTDIR)\md5.obj"
+       -@erase "$(INTDIR)\mem_pool.obj"
+       -@erase "$(INTDIR)\message.obj"
+       -@erase "$(INTDIR)\parse_conf.obj"
+       -@erase "$(INTDIR)\queue.obj"
+       -@erase "$(INTDIR)\rwlock.obj"
+       -@erase "$(INTDIR)\scan.obj"
+       -@erase "$(INTDIR)\semlock.obj"
+       -@erase "$(INTDIR)\serial.obj"
+       -@erase "$(INTDIR)\sha1.obj"
+       -@erase "$(INTDIR)\signal.obj"
+       -@erase "$(INTDIR)\smartall.obj"
+       -@erase "$(INTDIR)\btimers.obj"
+       -@erase "$(INTDIR)\tree.obj"
+       -@erase "$(INTDIR)\util.obj"
+       -@erase "$(INTDIR)\var.obj"
+       -@erase "$(INTDIR)\watchdog.obj"
+       -@erase "$(INTDIR)\workq.obj"
+       -@erase "$(INTDIR)\compat.obj"
+       -@erase "$(INTDIR)\print.obj"
+       -@erase "$(INTDIR)\authenticate.obj"
+       -@erase "$(INTDIR)\console_conf.obj"
+       -@erase "$(INTDIR)\console_thread.obj"
+       -@erase "$(INTDIR)\main.obj"
+       -@erase "$(INTDIR)\wxblistctrl.obj"
+       -@erase "$(INTDIR)\wxbmainframe.obj"
+       -@erase "$(INTDIR)\wxbrestorepanel.obj"
+       -@erase "$(INTDIR)\wxbtableparser.obj"
+       -@erase "$(INTDIR)\wxbtreectrl.obj"
+       -@erase "$(INTDIR)\wxbutils.obj"
+       -@erase "$(INTDIR)\wxbconfigpanel.obj"
+       -@erase "$(INTDIR)\wxbconfigfileeditor.obj"
+       -@erase "$(INTDIR)\wxbhistorytextctrl.obj"
         -@erase "$(OUTDIR)\wx-console.exe"
 
 "$(OUTDIR)" :
@@ -112,61 +113,62 @@ LINK32_FLAGS=wxmsw.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib w
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmt.lib \
   /nologo /subsystem:windows /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
 LINK32_OBJS= \
-        "$(INTDIR)\alist.obj" \
-        "$(INTDIR)\alloc.obj" \
-        "$(INTDIR)\attr.obj" \
-        "$(INTDIR)\base64.obj" \
-        "$(INTDIR)\bget_msg.obj" \
-        "$(INTDIR)\bnet.obj" \
-        "$(INTDIR)\bnet_pkt.obj" \
-        "$(INTDIR)\bnet_server.obj" \
-        "$(INTDIR)\bshm.obj" \
-        "$(INTDIR)\bsys.obj" \
-        "$(INTDIR)\btime.obj" \
-        "$(INTDIR)\cram-md5.obj" \
-        "$(INTDIR)\crc32.obj" \
-        "$(INTDIR)\daemon.obj" \
-        "$(INTDIR)\dlist.obj" \
-        "$(INTDIR)\edit.obj" \
-        "$(INTDIR)\fnmatch.obj" \
-        "$(INTDIR)\hmac.obj" \
-        "$(INTDIR)\htable.obj" \
-        "$(INTDIR)\idcache.obj" \
-        "$(INTDIR)\jcr.obj" \
-        "$(INTDIR)\lex.obj" \
-        "$(INTDIR)\md5.obj" \
-        "$(INTDIR)\mem_pool.obj" \
-        "$(INTDIR)\message.obj" \
-        "$(INTDIR)\parse_conf.obj" \
-        "$(INTDIR)\queue.obj" \
-        "$(INTDIR)\rwlock.obj" \
-        "$(INTDIR)\scan.obj" \
-        "$(INTDIR)\semlock.obj" \
-        "$(INTDIR)\serial.obj" \
-        "$(INTDIR)\sha1.obj" \
-        "$(INTDIR)\signal.obj" \
-        "$(INTDIR)\smartall.obj" \
-        "$(INTDIR)\btimers.obj" \
-        "$(INTDIR)\tree.obj" \
-        "$(INTDIR)\util.obj" \
-        "$(INTDIR)\var.obj" \
-        "$(INTDIR)\watchdog.obj" \
-        "$(INTDIR)\workq.obj" \
-        "$(INTDIR)\compat.obj" \
-        "$(INTDIR)\print.obj" \
-        "$(INTDIR)\authenticate.obj" \
-        "$(INTDIR)\console_conf.obj" \
-        "$(INTDIR)\console_thread.obj" \
-        "$(INTDIR)\main.obj" \
-        "$(INTDIR)\wxblistctrl.obj" \
-        "$(INTDIR)\wxbmainframe.obj" \
-        "$(INTDIR)\wxbrestorepanel.obj" \
-        "$(INTDIR)\wxbtableparser.obj" \
-        "$(INTDIR)\wxbtreectrl.obj" \
-        "$(INTDIR)\wxbutils.obj" \
-        "$(INTDIR)\wxbconfigpanel.obj" \
-        "$(INTDIR)\wxbconfigfileeditor.obj" \
-        "$(INTDIR)\wxbhistorytextctrl.obj" \
+       "$(INTDIR)\alist.obj" \
+       "$(INTDIR)\alloc.obj" \
+       "$(INTDIR)\attr.obj" \
+       "$(INTDIR)\base64.obj" \
+       "$(INTDIR)\berrno.obj" \
+       "$(INTDIR)\bget_msg.obj" \
+       "$(INTDIR)\bnet.obj" \
+       "$(INTDIR)\bnet_pkt.obj" \
+       "$(INTDIR)\bnet_server.obj" \
+       "$(INTDIR)\bshm.obj" \
+       "$(INTDIR)\bsys.obj" \
+       "$(INTDIR)\btime.obj" \
+       "$(INTDIR)\cram-md5.obj" \
+       "$(INTDIR)\crc32.obj" \
+       "$(INTDIR)\daemon.obj" \
+       "$(INTDIR)\dlist.obj" \
+       "$(INTDIR)\edit.obj" \
+       "$(INTDIR)\fnmatch.obj" \
+       "$(INTDIR)\hmac.obj" \
+       "$(INTDIR)\htable.obj" \
+       "$(INTDIR)\idcache.obj" \
+       "$(INTDIR)\jcr.obj" \
+       "$(INTDIR)\lex.obj" \
+       "$(INTDIR)\md5.obj" \
+       "$(INTDIR)\mem_pool.obj" \
+       "$(INTDIR)\message.obj" \
+       "$(INTDIR)\parse_conf.obj" \
+       "$(INTDIR)\queue.obj" \
+       "$(INTDIR)\rwlock.obj" \
+       "$(INTDIR)\scan.obj" \
+       "$(INTDIR)\semlock.obj" \
+       "$(INTDIR)\serial.obj" \
+       "$(INTDIR)\sha1.obj" \
+       "$(INTDIR)\signal.obj" \
+       "$(INTDIR)\smartall.obj" \
+       "$(INTDIR)\btimers.obj" \
+       "$(INTDIR)\tree.obj" \
+       "$(INTDIR)\util.obj" \
+       "$(INTDIR)\var.obj" \
+       "$(INTDIR)\watchdog.obj" \
+       "$(INTDIR)\workq.obj" \
+       "$(INTDIR)\compat.obj" \
+       "$(INTDIR)\print.obj" \
+       "$(INTDIR)\authenticate.obj" \
+       "$(INTDIR)\console_conf.obj" \
+       "$(INTDIR)\console_thread.obj" \
+       "$(INTDIR)\main.obj" \
+       "$(INTDIR)\wxblistctrl.obj" \
+       "$(INTDIR)\wxbmainframe.obj" \
+       "$(INTDIR)\wxbrestorepanel.obj" \
+       "$(INTDIR)\wxbtableparser.obj" \
+       "$(INTDIR)\wxbtreectrl.obj" \
+       "$(INTDIR)\wxbutils.obj" \
+       "$(INTDIR)\wxbconfigpanel.obj" \
+       "$(INTDIR)\wxbconfigfileeditor.obj" \
+       "$(INTDIR)\wxbhistorytextctrl.obj" \
         "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -185,116 +187,118 @@ OutDir=.\Debug
 ALL : "$(OUTDIR)\wx-console.exe" "$(OUTDIR)\wx-console.bsc"
 
 CLEAN :
-        -@erase "$(INTDIR)\alist.obj
-        -@erase "$(INTDIR)\alist.sbr"
-        -@erase "$(INTDIR)\alloc.obj
-        -@erase "$(INTDIR)\alloc.sbr"
-        -@erase "$(INTDIR)\attr.obj
-        -@erase "$(INTDIR)\attr.sbr"
-        -@erase "$(INTDIR)\base64.obj
-        -@erase "$(INTDIR)\base64.sbr"
-        -@erase "$(INTDIR)\bget_msg.obj
-        -@erase "$(INTDIR)\bget_msg.sbr"
-        -@erase "$(INTDIR)\bnet.obj
-        -@erase "$(INTDIR)\bnet.sbr"
-        -@erase "$(INTDIR)\bnet_pkt.obj
-        -@erase "$(INTDIR)\bnet_pkt.sbr"
-        -@erase "$(INTDIR)\bnet_server.obj
-        -@erase "$(INTDIR)\bnet_server.sbr"
-        -@erase "$(INTDIR)\bshm.obj
-        -@erase "$(INTDIR)\bshm.sbr"
-        -@erase "$(INTDIR)\bsys.obj
-        -@erase "$(INTDIR)\bsys.sbr"
-        -@erase "$(INTDIR)\btime.obj
-        -@erase "$(INTDIR)\btime.sbr"
-        -@erase "$(INTDIR)\cram-md5.obj
-        -@erase "$(INTDIR)\cram-md5.sbr"
-        -@erase "$(INTDIR)\crc32.obj
-        -@erase "$(INTDIR)\crc32.sbr"
-        -@erase "$(INTDIR)\daemon.obj
-        -@erase "$(INTDIR)\daemon.sbr"
-        -@erase "$(INTDIR)\dlist.obj
-        -@erase "$(INTDIR)\dlist.sbr"
-        -@erase "$(INTDIR)\edit.obj
-        -@erase "$(INTDIR)\edit.sbr"
-        -@erase "$(INTDIR)\fnmatch.obj
-        -@erase "$(INTDIR)\fnmatch.sbr"
-        -@erase "$(INTDIR)\hmac.obj
-        -@erase "$(INTDIR)\hmac.sbr"
-        -@erase "$(INTDIR)\htable.obj
-        -@erase "$(INTDIR)\htable.sbr"
-        -@erase "$(INTDIR)\idcache.obj
-        -@erase "$(INTDIR)\idcache.sbr"
-        -@erase "$(INTDIR)\jcr.obj
-        -@erase "$(INTDIR)\jcr.sbr"
-        -@erase "$(INTDIR)\lex.obj
-        -@erase "$(INTDIR)\lex.sbr"
-        -@erase "$(INTDIR)\md5.obj
-        -@erase "$(INTDIR)\md5.sbr"
-        -@erase "$(INTDIR)\mem_pool.obj
-        -@erase "$(INTDIR)\mem_pool.sbr"
-        -@erase "$(INTDIR)\message.obj
-        -@erase "$(INTDIR)\message.sbr"
-        -@erase "$(INTDIR)\parse_conf.obj
-        -@erase "$(INTDIR)\parse_conf.sbr"
-        -@erase "$(INTDIR)\queue.obj
-        -@erase "$(INTDIR)\queue.sbr"
-        -@erase "$(INTDIR)\rwlock.obj
-        -@erase "$(INTDIR)\rwlock.sbr"
-        -@erase "$(INTDIR)\scan.obj
-        -@erase "$(INTDIR)\scan.sbr"
-        -@erase "$(INTDIR)\semlock.obj
-        -@erase "$(INTDIR)\semlock.sbr"
-        -@erase "$(INTDIR)\serial.obj
-        -@erase "$(INTDIR)\serial.sbr"
-        -@erase "$(INTDIR)\sha1.obj
-        -@erase "$(INTDIR)\sha1.sbr"
-        -@erase "$(INTDIR)\signal.obj
-        -@erase "$(INTDIR)\signal.sbr"
-        -@erase "$(INTDIR)\smartall.obj
-        -@erase "$(INTDIR)\smartall.sbr"
-        -@erase "$(INTDIR)\btimers.obj
-        -@erase "$(INTDIR)\btimers.sbr"
-        -@erase "$(INTDIR)\tree.obj
-        -@erase "$(INTDIR)\tree.sbr"
-        -@erase "$(INTDIR)\util.obj
-        -@erase "$(INTDIR)\util.sbr"
-        -@erase "$(INTDIR)\var.obj
-        -@erase "$(INTDIR)\var.sbr"
-        -@erase "$(INTDIR)\watchdog.obj
-        -@erase "$(INTDIR)\watchdog.sbr"
-        -@erase "$(INTDIR)\workq.obj
-        -@erase "$(INTDIR)\workq.sbr"
-        -@erase "$(INTDIR)\compat.obj
-        -@erase "$(INTDIR)\compat.sbr"
-        -@erase "$(INTDIR)\print.obj
-        -@erase "$(INTDIR)\print.sbr"
-        -@erase "$(INTDIR)\authenticate.obj
-        -@erase "$(INTDIR)\authenticate.sbr"
-        -@erase "$(INTDIR)\console_conf.obj
-        -@erase "$(INTDIR)\console_conf.sbr"
-        -@erase "$(INTDIR)\console_thread.obj
-        -@erase "$(INTDIR)\console_thread.sbr"
-        -@erase "$(INTDIR)\main.obj
-        -@erase "$(INTDIR)\main.sbr"
-        -@erase "$(INTDIR)\wxblistctrl.obj
-        -@erase "$(INTDIR)\wxblistctrl.sbr"
-        -@erase "$(INTDIR)\wxbmainframe.obj
-        -@erase "$(INTDIR)\wxbmainframe.sbr"
-        -@erase "$(INTDIR)\wxbrestorepanel.obj
-        -@erase "$(INTDIR)\wxbrestorepanel.sbr"
-        -@erase "$(INTDIR)\wxbtableparser.obj
-        -@erase "$(INTDIR)\wxbtableparser.sbr"
-        -@erase "$(INTDIR)\wxbtreectrl.obj
-        -@erase "$(INTDIR)\wxbtreectrl.sbr"
-        -@erase "$(INTDIR)\wxbutils.obj
-        -@erase "$(INTDIR)\wxbutils.sbr"
-        -@erase "$(INTDIR)\wxbconfigpanel.obj
-        -@erase "$(INTDIR)\wxbconfigpanel.sbr"
-        -@erase "$(INTDIR)\wxbconfigfileeditor.obj
-        -@erase "$(INTDIR)\wxbconfigfileeditor.sbr"
-        -@erase "$(INTDIR)\wxbhistorytextctrl.obj
-        -@erase "$(INTDIR)\wxbhistorytextctrl.sbr"
+       -@erase "$(INTDIR)\alist.obj
+       -@erase "$(INTDIR)\alist.sbr"
+       -@erase "$(INTDIR)\alloc.obj
+       -@erase "$(INTDIR)\alloc.sbr"
+       -@erase "$(INTDIR)\attr.obj
+       -@erase "$(INTDIR)\attr.sbr"
+       -@erase "$(INTDIR)\base64.obj
+       -@erase "$(INTDIR)\base64.sbr"
+       -@erase "$(INTDIR)\berrno.obj
+       -@erase "$(INTDIR)\berrno.sbr"
+       -@erase "$(INTDIR)\bget_msg.obj
+       -@erase "$(INTDIR)\bget_msg.sbr"
+       -@erase "$(INTDIR)\bnet.obj
+       -@erase "$(INTDIR)\bnet.sbr"
+       -@erase "$(INTDIR)\bnet_pkt.obj
+       -@erase "$(INTDIR)\bnet_pkt.sbr"
+       -@erase "$(INTDIR)\bnet_server.obj
+       -@erase "$(INTDIR)\bnet_server.sbr"
+       -@erase "$(INTDIR)\bshm.obj
+       -@erase "$(INTDIR)\bshm.sbr"
+       -@erase "$(INTDIR)\bsys.obj
+       -@erase "$(INTDIR)\bsys.sbr"
+       -@erase "$(INTDIR)\btime.obj
+       -@erase "$(INTDIR)\btime.sbr"
+       -@erase "$(INTDIR)\cram-md5.obj
+       -@erase "$(INTDIR)\cram-md5.sbr"
+       -@erase "$(INTDIR)\crc32.obj
+       -@erase "$(INTDIR)\crc32.sbr"
+       -@erase "$(INTDIR)\daemon.obj
+       -@erase "$(INTDIR)\daemon.sbr"
+       -@erase "$(INTDIR)\dlist.obj
+       -@erase "$(INTDIR)\dlist.sbr"
+       -@erase "$(INTDIR)\edit.obj
+       -@erase "$(INTDIR)\edit.sbr"
+       -@erase "$(INTDIR)\fnmatch.obj
+       -@erase "$(INTDIR)\fnmatch.sbr"
+       -@erase "$(INTDIR)\hmac.obj
+       -@erase "$(INTDIR)\hmac.sbr"
+       -@erase "$(INTDIR)\htable.obj
+       -@erase "$(INTDIR)\htable.sbr"
+       -@erase "$(INTDIR)\idcache.obj
+       -@erase "$(INTDIR)\idcache.sbr"
+       -@erase "$(INTDIR)\jcr.obj
+       -@erase "$(INTDIR)\jcr.sbr"
+       -@erase "$(INTDIR)\lex.obj
+       -@erase "$(INTDIR)\lex.sbr"
+       -@erase "$(INTDIR)\md5.obj
+       -@erase "$(INTDIR)\md5.sbr"
+       -@erase "$(INTDIR)\mem_pool.obj
+       -@erase "$(INTDIR)\mem_pool.sbr"
+       -@erase "$(INTDIR)\message.obj
+       -@erase "$(INTDIR)\message.sbr"
+       -@erase "$(INTDIR)\parse_conf.obj
+       -@erase "$(INTDIR)\parse_conf.sbr"
+       -@erase "$(INTDIR)\queue.obj
+       -@erase "$(INTDIR)\queue.sbr"
+       -@erase "$(INTDIR)\rwlock.obj
+       -@erase "$(INTDIR)\rwlock.sbr"
+       -@erase "$(INTDIR)\scan.obj
+       -@erase "$(INTDIR)\scan.sbr"
+       -@erase "$(INTDIR)\semlock.obj
+       -@erase "$(INTDIR)\semlock.sbr"
+       -@erase "$(INTDIR)\serial.obj
+       -@erase "$(INTDIR)\serial.sbr"
+       -@erase "$(INTDIR)\sha1.obj
+       -@erase "$(INTDIR)\sha1.sbr"
+       -@erase "$(INTDIR)\signal.obj
+       -@erase "$(INTDIR)\signal.sbr"
+       -@erase "$(INTDIR)\smartall.obj
+       -@erase "$(INTDIR)\smartall.sbr"
+       -@erase "$(INTDIR)\btimers.obj
+       -@erase "$(INTDIR)\btimers.sbr"
+       -@erase "$(INTDIR)\tree.obj
+       -@erase "$(INTDIR)\tree.sbr"
+       -@erase "$(INTDIR)\util.obj
+       -@erase "$(INTDIR)\util.sbr"
+       -@erase "$(INTDIR)\var.obj
+       -@erase "$(INTDIR)\var.sbr"
+       -@erase "$(INTDIR)\watchdog.obj
+       -@erase "$(INTDIR)\watchdog.sbr"
+       -@erase "$(INTDIR)\workq.obj
+       -@erase "$(INTDIR)\workq.sbr"
+       -@erase "$(INTDIR)\compat.obj
+       -@erase "$(INTDIR)\compat.sbr"
+       -@erase "$(INTDIR)\print.obj
+       -@erase "$(INTDIR)\print.sbr"
+       -@erase "$(INTDIR)\authenticate.obj
+       -@erase "$(INTDIR)\authenticate.sbr"
+       -@erase "$(INTDIR)\console_conf.obj
+       -@erase "$(INTDIR)\console_conf.sbr"
+       -@erase "$(INTDIR)\console_thread.obj
+       -@erase "$(INTDIR)\console_thread.sbr"
+       -@erase "$(INTDIR)\main.obj
+       -@erase "$(INTDIR)\main.sbr"
+       -@erase "$(INTDIR)\wxblistctrl.obj
+       -@erase "$(INTDIR)\wxblistctrl.sbr"
+       -@erase "$(INTDIR)\wxbmainframe.obj
+       -@erase "$(INTDIR)\wxbmainframe.sbr"
+       -@erase "$(INTDIR)\wxbrestorepanel.obj
+       -@erase "$(INTDIR)\wxbrestorepanel.sbr"
+       -@erase "$(INTDIR)\wxbtableparser.obj
+       -@erase "$(INTDIR)\wxbtableparser.sbr"
+       -@erase "$(INTDIR)\wxbtreectrl.obj
+       -@erase "$(INTDIR)\wxbtreectrl.sbr"
+       -@erase "$(INTDIR)\wxbutils.obj
+       -@erase "$(INTDIR)\wxbutils.sbr"
+       -@erase "$(INTDIR)\wxbconfigpanel.obj
+       -@erase "$(INTDIR)\wxbconfigpanel.sbr"
+       -@erase "$(INTDIR)\wxbconfigfileeditor.obj
+       -@erase "$(INTDIR)\wxbconfigfileeditor.sbr"
+       -@erase "$(INTDIR)\wxbhistorytextctrl.obj
+       -@erase "$(INTDIR)\wxbhistorytextctrl.sbr"
         -@erase "$(OUTDIR)\wx-console.exe"
         -@erase "$(OUTDIR)\wx-console.bsc"
 
@@ -307,61 +311,62 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\winres.res" /d "_DEBUG"
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\wx-console.bsc" 
 BSC32_SBRS= \
-        "$(INTDIR)\alist.sbr" \
-        "$(INTDIR)\alloc.sbr" \
-        "$(INTDIR)\attr.sbr" \
-        "$(INTDIR)\base64.sbr" \
-        "$(INTDIR)\bget_msg.sbr" \
-        "$(INTDIR)\bnet.sbr" \
-        "$(INTDIR)\bnet_pkt.sbr" \
-        "$(INTDIR)\bnet_server.sbr" \
-        "$(INTDIR)\bshm.sbr" \
-        "$(INTDIR)\bsys.sbr" \
-        "$(INTDIR)\btime.sbr" \
-        "$(INTDIR)\cram-md5.sbr" \
-        "$(INTDIR)\crc32.sbr" \
-        "$(INTDIR)\daemon.sbr" \
-        "$(INTDIR)\dlist.sbr" \
-        "$(INTDIR)\edit.sbr" \
-        "$(INTDIR)\fnmatch.sbr" \
-        "$(INTDIR)\hmac.sbr" \
-        "$(INTDIR)\htable.sbr" \
-        "$(INTDIR)\idcache.sbr" \
-        "$(INTDIR)\jcr.sbr" \
-        "$(INTDIR)\lex.sbr" \
-        "$(INTDIR)\md5.sbr" \
-        "$(INTDIR)\mem_pool.sbr" \
-        "$(INTDIR)\message.sbr" \
-        "$(INTDIR)\parse_conf.sbr" \
-        "$(INTDIR)\queue.sbr" \
-        "$(INTDIR)\rwlock.sbr" \
-        "$(INTDIR)\scan.sbr" \
-        "$(INTDIR)\semlock.sbr" \
-        "$(INTDIR)\serial.sbr" \
-        "$(INTDIR)\sha1.sbr" \
-        "$(INTDIR)\signal.sbr" \
-        "$(INTDIR)\smartall.sbr" \
-        "$(INTDIR)\btimers.sbr" \
-        "$(INTDIR)\tree.sbr" \
-        "$(INTDIR)\util.sbr" \
-        "$(INTDIR)\var.sbr" \
-        "$(INTDIR)\watchdog.sbr" \
-        "$(INTDIR)\workq.sbr" \
-        "$(INTDIR)\compat.sbr" \
-        "$(INTDIR)\print.sbr" \
-        "$(INTDIR)\authenticate.sbr" \
-        "$(INTDIR)\console_conf.sbr" \
-        "$(INTDIR)\console_thread.sbr" \
-        "$(INTDIR)\main.sbr" \
-        "$(INTDIR)\wxblistctrl.sbr" \
-        "$(INTDIR)\wxbmainframe.sbr" \
-        "$(INTDIR)\wxbrestorepanel.sbr" \
-        "$(INTDIR)\wxbtableparser.sbr" \
-        "$(INTDIR)\wxbtreectrl.sbr" \
-        "$(INTDIR)\wxbutils.sbr" \
-        "$(INTDIR)\wxbconfigpanel.sbr" \
-        "$(INTDIR)\wxbconfigfileeditor.sbr" \
-        "$(INTDIR)\wxbhistorytextctrl.sbr" \
+       "$(INTDIR)\alist.sbr" \
+       "$(INTDIR)\alloc.sbr" \
+       "$(INTDIR)\attr.sbr" \
+       "$(INTDIR)\base64.sbr" \
+       "$(INTDIR)\berrno.sbr" \
+       "$(INTDIR)\bget_msg.sbr" \
+       "$(INTDIR)\bnet.sbr" \
+       "$(INTDIR)\bnet_pkt.sbr" \
+       "$(INTDIR)\bnet_server.sbr" \
+       "$(INTDIR)\bshm.sbr" \
+       "$(INTDIR)\bsys.sbr" \
+       "$(INTDIR)\btime.sbr" \
+       "$(INTDIR)\cram-md5.sbr" \
+       "$(INTDIR)\crc32.sbr" \
+       "$(INTDIR)\daemon.sbr" \
+       "$(INTDIR)\dlist.sbr" \
+       "$(INTDIR)\edit.sbr" \
+       "$(INTDIR)\fnmatch.sbr" \
+       "$(INTDIR)\hmac.sbr" \
+       "$(INTDIR)\htable.sbr" \
+       "$(INTDIR)\idcache.sbr" \
+       "$(INTDIR)\jcr.sbr" \
+       "$(INTDIR)\lex.sbr" \
+       "$(INTDIR)\md5.sbr" \
+       "$(INTDIR)\mem_pool.sbr" \
+       "$(INTDIR)\message.sbr" \
+       "$(INTDIR)\parse_conf.sbr" \
+       "$(INTDIR)\queue.sbr" \
+       "$(INTDIR)\rwlock.sbr" \
+       "$(INTDIR)\scan.sbr" \
+       "$(INTDIR)\semlock.sbr" \
+       "$(INTDIR)\serial.sbr" \
+       "$(INTDIR)\sha1.sbr" \
+       "$(INTDIR)\signal.sbr" \
+       "$(INTDIR)\smartall.sbr" \
+       "$(INTDIR)\btimers.sbr" \
+       "$(INTDIR)\tree.sbr" \
+       "$(INTDIR)\util.sbr" \
+       "$(INTDIR)\var.sbr" \
+       "$(INTDIR)\watchdog.sbr" \
+       "$(INTDIR)\workq.sbr" \
+       "$(INTDIR)\compat.sbr" \
+       "$(INTDIR)\print.sbr" \
+       "$(INTDIR)\authenticate.sbr" \
+       "$(INTDIR)\console_conf.sbr" \
+       "$(INTDIR)\console_thread.sbr" \
+       "$(INTDIR)\main.sbr" \
+       "$(INTDIR)\wxblistctrl.sbr" \
+       "$(INTDIR)\wxbmainframe.sbr" \
+       "$(INTDIR)\wxbrestorepanel.sbr" \
+       "$(INTDIR)\wxbtableparser.sbr" \
+       "$(INTDIR)\wxbtreectrl.sbr" \
+       "$(INTDIR)\wxbutils.sbr" \
+       "$(INTDIR)\wxbconfigpanel.sbr" \
+       "$(INTDIR)\wxbconfigfileeditor.sbr" \
+       "$(INTDIR)\wxbhistorytextctrl.sbr" \
 
 "$(OUTDIR)\wx-console.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
@@ -374,61 +379,62 @@ LINK32_FLAGS=wxmswd.lib rpcrt4.lib oleaut32.lib ole32.lib uuid.lib winspool.lib
   wldap32.lib pthreadVCE.lib zlib.lib /nodefaultlib:libcmtd.lib \
   /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"$(OUTDIR)\wx-console.exe" /libpath:"../../../../depkgs-win32/wx/lib" /libpath:"../../../../depkgs-win32/pthreads" /libpath:"../../../../depkgs-win32/zlib" 
 LINK32_OBJS= \
-        "$(INTDIR)\alist.obj" \
-        "$(INTDIR)\alloc.obj" \
-        "$(INTDIR)\attr.obj" \
-        "$(INTDIR)\base64.obj" \
-        "$(INTDIR)\bget_msg.obj" \
-        "$(INTDIR)\bnet.obj" \
-        "$(INTDIR)\bnet_pkt.obj" \
-        "$(INTDIR)\bnet_server.obj" \
-        "$(INTDIR)\bshm.obj" \
-        "$(INTDIR)\bsys.obj" \
-        "$(INTDIR)\btime.obj" \
-        "$(INTDIR)\cram-md5.obj" \
-        "$(INTDIR)\crc32.obj" \
-        "$(INTDIR)\daemon.obj" \
-        "$(INTDIR)\dlist.obj" \
-        "$(INTDIR)\edit.obj" \
-        "$(INTDIR)\fnmatch.obj" \
-        "$(INTDIR)\hmac.obj" \
-        "$(INTDIR)\htable.obj" \
-        "$(INTDIR)\idcache.obj" \
-        "$(INTDIR)\jcr.obj" \
-        "$(INTDIR)\lex.obj" \
-        "$(INTDIR)\md5.obj" \
-        "$(INTDIR)\mem_pool.obj" \
-        "$(INTDIR)\message.obj" \
-        "$(INTDIR)\parse_conf.obj" \
-        "$(INTDIR)\queue.obj" \
-        "$(INTDIR)\rwlock.obj" \
-        "$(INTDIR)\scan.obj" \
-        "$(INTDIR)\semlock.obj" \
-        "$(INTDIR)\serial.obj" \
-        "$(INTDIR)\sha1.obj" \
-        "$(INTDIR)\signal.obj" \
-        "$(INTDIR)\smartall.obj" \
-        "$(INTDIR)\btimers.obj" \
-        "$(INTDIR)\tree.obj" \
-        "$(INTDIR)\util.obj" \
-        "$(INTDIR)\var.obj" \
-        "$(INTDIR)\watchdog.obj" \
-        "$(INTDIR)\workq.obj" \
-        "$(INTDIR)\compat.obj" \
-        "$(INTDIR)\print.obj" \
-        "$(INTDIR)\authenticate.obj" \
-        "$(INTDIR)\console_conf.obj" \
-        "$(INTDIR)\console_thread.obj" \
-        "$(INTDIR)\main.obj" \
-        "$(INTDIR)\wxblistctrl.obj" \
-        "$(INTDIR)\wxbmainframe.obj" \
-        "$(INTDIR)\wxbrestorepanel.obj" \
-        "$(INTDIR)\wxbtableparser.obj" \
-        "$(INTDIR)\wxbtreectrl.obj" \
-        "$(INTDIR)\wxbutils.obj" \
-        "$(INTDIR)\wxbconfigpanel.obj" \
-        "$(INTDIR)\wxbconfigfileeditor.obj" \
-        "$(INTDIR)\wxbhistorytextctrl.obj" \
+       "$(INTDIR)\alist.obj" \
+       "$(INTDIR)\alloc.obj" \
+       "$(INTDIR)\attr.obj" \
+       "$(INTDIR)\base64.obj" \
+       "$(INTDIR)\berrno.obj" \
+       "$(INTDIR)\bget_msg.obj" \
+       "$(INTDIR)\bnet.obj" \
+       "$(INTDIR)\bnet_pkt.obj" \
+       "$(INTDIR)\bnet_server.obj" \
+       "$(INTDIR)\bshm.obj" \
+       "$(INTDIR)\bsys.obj" \
+       "$(INTDIR)\btime.obj" \
+       "$(INTDIR)\cram-md5.obj" \
+       "$(INTDIR)\crc32.obj" \
+       "$(INTDIR)\daemon.obj" \
+       "$(INTDIR)\dlist.obj" \
+       "$(INTDIR)\edit.obj" \
+       "$(INTDIR)\fnmatch.obj" \
+       "$(INTDIR)\hmac.obj" \
+       "$(INTDIR)\htable.obj" \
+       "$(INTDIR)\idcache.obj" \
+       "$(INTDIR)\jcr.obj" \
+       "$(INTDIR)\lex.obj" \
+       "$(INTDIR)\md5.obj" \
+       "$(INTDIR)\mem_pool.obj" \
+       "$(INTDIR)\message.obj" \
+       "$(INTDIR)\parse_conf.obj" \
+       "$(INTDIR)\queue.obj" \
+       "$(INTDIR)\rwlock.obj" \
+       "$(INTDIR)\scan.obj" \
+       "$(INTDIR)\semlock.obj" \
+       "$(INTDIR)\serial.obj" \
+       "$(INTDIR)\sha1.obj" \
+       "$(INTDIR)\signal.obj" \
+       "$(INTDIR)\smartall.obj" \
+       "$(INTDIR)\btimers.obj" \
+       "$(INTDIR)\tree.obj" \
+       "$(INTDIR)\util.obj" \
+       "$(INTDIR)\var.obj" \
+       "$(INTDIR)\watchdog.obj" \
+       "$(INTDIR)\workq.obj" \
+       "$(INTDIR)\compat.obj" \
+       "$(INTDIR)\print.obj" \
+       "$(INTDIR)\authenticate.obj" \
+       "$(INTDIR)\console_conf.obj" \
+       "$(INTDIR)\console_thread.obj" \
+       "$(INTDIR)\main.obj" \
+       "$(INTDIR)\wxblistctrl.obj" \
+       "$(INTDIR)\wxbmainframe.obj" \
+       "$(INTDIR)\wxbrestorepanel.obj" \
+       "$(INTDIR)\wxbtableparser.obj" \
+       "$(INTDIR)\wxbtreectrl.obj" \
+       "$(INTDIR)\wxbutils.obj" \
+       "$(INTDIR)\wxbconfigpanel.obj" \
+       "$(INTDIR)\wxbconfigfileeditor.obj" \
+       "$(INTDIR)\wxbhistorytextctrl.obj" \
         "$(INTDIR)\wx-console_private.res"
 
 "$(OUTDIR)\wx-console.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -488,14 +494,14 @@ SOURCE=..\lib\alist.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -507,14 +513,14 @@ SOURCE=..\lib\alloc.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -526,14 +532,14 @@ SOURCE=..\lib\attr.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -545,14 +551,33 @@ SOURCE=..\lib\base64.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+FILENAME=berrno
+SOURCE=..\lib\berrno.cpp
+!IF  "$(CFG)" == "wx-console - Win32 Release"
+
+
+"$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
+
+
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -564,14 +589,14 @@ SOURCE=..\lib\bget_msg.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -583,14 +608,14 @@ SOURCE=..\lib\bnet.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -602,14 +627,14 @@ SOURCE=..\lib\bnet_pkt.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -621,14 +646,14 @@ SOURCE=..\lib\bnet_server.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -640,14 +665,14 @@ SOURCE=..\lib\bshm.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -659,14 +684,14 @@ SOURCE=..\lib\bsys.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -678,14 +703,14 @@ SOURCE=..\lib\btime.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -697,14 +722,14 @@ SOURCE=..\lib\cram-md5.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -716,14 +741,14 @@ SOURCE=..\lib\crc32.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -735,14 +760,14 @@ SOURCE=..\lib\daemon.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -754,14 +779,14 @@ SOURCE=..\lib\dlist.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -773,14 +798,14 @@ SOURCE=..\lib\edit.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -792,14 +817,14 @@ SOURCE=..\lib\fnmatch.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -811,14 +836,14 @@ SOURCE=..\lib\hmac.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -830,14 +855,14 @@ SOURCE=..\lib\htable.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -849,14 +874,14 @@ SOURCE=..\lib\idcache.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -868,14 +893,14 @@ SOURCE=..\lib\jcr.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -887,14 +912,14 @@ SOURCE=..\lib\lex.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -906,14 +931,14 @@ SOURCE=..\lib\md5.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -925,14 +950,14 @@ SOURCE=..\lib\mem_pool.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -944,14 +969,14 @@ SOURCE=..\lib\message.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -963,14 +988,14 @@ SOURCE=..\lib\parse_conf.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -982,14 +1007,14 @@ SOURCE=..\lib\queue.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1001,14 +1026,14 @@ SOURCE=..\lib\rwlock.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1020,14 +1045,14 @@ SOURCE=..\lib\scan.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1039,14 +1064,14 @@ SOURCE=..\lib\semlock.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1058,14 +1083,14 @@ SOURCE=..\lib\serial.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1077,14 +1102,14 @@ SOURCE=..\lib\sha1.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1096,14 +1121,14 @@ SOURCE=..\lib\signal.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1115,14 +1140,14 @@ SOURCE=..\lib\smartall.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1134,14 +1159,14 @@ SOURCE=..\lib\btimers.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1153,14 +1178,14 @@ SOURCE=..\lib\tree.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1172,14 +1197,14 @@ SOURCE=..\lib\util.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1191,14 +1216,14 @@ SOURCE=..\lib\var.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1210,14 +1235,14 @@ SOURCE=..\lib\watchdog.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1229,14 +1254,14 @@ SOURCE=..\lib\workq.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1248,14 +1273,14 @@ SOURCE=..\compat\compat.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1267,14 +1292,14 @@ SOURCE=..\compat\print.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1286,14 +1311,14 @@ SOURCE=.\authenticate.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1305,14 +1330,14 @@ SOURCE=.\console_conf.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1324,14 +1349,14 @@ SOURCE=..\..\wx-console\console_thread.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1343,14 +1368,14 @@ SOURCE=..\..\wx-console\main.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1362,14 +1387,14 @@ SOURCE=..\..\wx-console\wxblistctrl.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1381,14 +1406,14 @@ SOURCE=..\..\wx-console\wxbmainframe.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1400,14 +1425,14 @@ SOURCE=..\..\wx-console\wxbrestorepanel.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1419,14 +1444,14 @@ SOURCE=..\..\wx-console\wxbtableparser.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1438,14 +1463,14 @@ SOURCE=..\..\wx-console\wxbtreectrl.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1457,14 +1482,14 @@ SOURCE=..\..\wx-console\wxbutils.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1476,14 +1501,14 @@ SOURCE=..\..\wx-console\wxbconfigpanel.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1495,14 +1520,14 @@ SOURCE=..\..\wx-console\wxbconfigfileeditor.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
@@ -1514,16 +1539,17 @@ SOURCE=..\..\wx-console\wxbhistorytextctrl.cpp
 
 
 "$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
 
 
-"$(INTDIR)\$(FILENAME).obj"     "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
-        $(CPP) $(CPP_PROJ) $(SOURCE)
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 !ENDIF 
 
 
+