Update doc

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 44e444bd5789cc0e99ea040d54eac2c797ade8c4..6363437a6cf8b1b36394884bc2a60d28bf3cced2 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -62,12 +62,11 @@ For 1.33 Testing/Documentation:
 
 For 1.33
 - Complete Win32 installer
+
+For version 1.35:
 - Finish work on Gnome restore GUI.
 - Fix "llist jobid=xx" where no fileset or client exists.
-- Test work on conio.c -- particularly linking.
-
---- Maybe in 1.33
-From Chris Hull:
+- From Chris Hull:
    it seems to be complaining about 12:00pm which should be a valid 12
    hour time.  I changed the time to 11:59am and everything works fine.
    Also 12:00am works fine.  0:00pm also works (which I don't think
@@ -78,9 +77,6 @@ From Chris Hull:
 - Add all pools in Dir conf to DB also update them to catch changed
   LabelFormats and such.
 - Update volumes FromPool=xxx does all volumes.
-
-
-For version 1.35:
 - Pass Director resource name as an option to the Console.
 - Add a "batch" mode to the Console (no unsolicited queries, ...).
 - Add code to check for tape alerts -- tapeinfo.
@@ -1423,4 +1419,4 @@ Block Position: 0
 - Check time/dates printed during restore when using Win32 API.
 - Once a job is canceled, make sure the status reflects that even if the
   job is "stuck" in the run queue.
-
+- Test work on conio.c -- particularly linking.

diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c
index 5b5cc57514f87226fed0edacc2864262fbcd32c8..7d6646305d5769f3f49f16ad9ed42d63c43f4018 100755 (executable)
--- a/bacula/src/console/conio.c
+++ b/bacula/src/console/conio.c
@@ -841,12 +841,12 @@ static void rawmode(FILE *input)
    if (!termtype) {
       printf("Cannot get terminal type.\n");
       normode();
-      _exit(1);
+      exit(1);
    }
    if (tgetent(term_buffer, termtype) < 0) {
       printf("Cannot get terminal termcap entry.\n");
       normode();
-      _exit(1);
+      exit(1);
    }
    t_width = t_height = -1;
    t_width = tgetnum("co") - 1;
@@ -996,9 +996,9 @@ void clrbrk()
 static void sigintcatcher(int sig)
 {
    brkflg++;
-   if (brkflg > 1) {
+   if (brkflg > 3) {
       normode();
-      _exit(1);
+      exit(1);
    }
    signal(SIGINT, sigintcatcher);
 }

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index b3077d05c2b0fb6b31c436ef8bdbcb8014c5a6c7..5393df16a1f0916bd72458111ea2943dcdf6e883 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -222,7 +222,7 @@ static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sa
         dt, JobName);
       sendit(buf, strlen(buf), arg);
    }
-   sendit("====\n", 1, arg);
+   sendit("====\n", 5, arg);
    unlock_last_jobs_list();
 }
 

diff --git a/bacula/src/lib/signal.c b/bacula/src/lib/signal.c
index 48e65c8d474c2561584f8e356e842f166c4fdd6b..a636a7440c4d3d5fc436648a350021582094150c 100644 (file)
--- a/bacula/src/lib/signal.c
+++ b/bacula/src/lib/signal.c
@@ -64,7 +64,7 @@ static void signal_handler(int sig)
 
    /* If we come back more than once, get out fast! */
    if (already_dead > 1) {
-      _exit(1);
+      exit(1);
    }
    /* If we come back once, take normal exit */
    if (already_dead) {