Add the updated version of the the win32 pathname fix.

[bacula/bacula] / bacula / src / lib / btimers.c

diff --git a/bacula/src/lib/btimers.c b/bacula/src/lib/btimers.c
index fcb0b3540c8d4be8ecae87a3682dab765d9abb97..143dc46369629edea778aff8eb7d7ae7c18850c4 100644 (file)
--- a/bacula/src/lib/btimers.c
+++ b/bacula/src/lib/btimers.c
@@ -5,11 +5,11 @@
  *
 */
 /*
-   Copyright (C) 2004-2005 Kern Sibbald
+   Copyright (C) 2004-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
-   version 2 as ammended with additional clauses defined in the
+   version 2 as amended with additional clauses defined in the
    file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
@@ -93,11 +93,13 @@ static void callback_child_timer(watchdog_t *self)
 
       Dmsg2(050, "watchdog %p term PID %d\n", self, wid->pid);
 
-      /* Kill -TERM the specified PID, and reschedule a -KILL for 3 seconds
-       * later.
+      /* Kill -TERM the specified PID, and reschedule a -KILL for 5 seconds
+       * later. (Warning: this should let dvd-writepart enough time to term
+       * and kill growisofs, which takes 3 seconds, so the interval must not
+       * be less than 5 seconds)
        */
       kill(wid->pid, SIGTERM);
-      self->interval = 3;
+      self->interval = 5;
    } else {
       /* This is the second call - terminate with prejudice. */
       Dmsg2(050, "watchdog %p kill PID %d\n", self, wid->pid);
@@ -236,7 +238,7 @@ static btimer_t *btimer_start_common(uint32_t wait)
 static void stop_btimer(btimer_t *wid)
 {
    if (wid == NULL) {
-      Emsg0(M_ABORT, 0, "stop_btimer called with NULL btimer_id\n");
+      Emsg0(M_ABORT, 0, _("stop_btimer called with NULL btimer_id\n"));
    }
    unregister_watchdog(wid->wd);
    free(wid->wd);