[Bacula-commits] bacula/patches/1.36.3 1.36.3-tray-monitor-fix-broken-pipe.diff,NONE,1.1 1.36.3-wx-console-fix-dir-alignment.diff,NONE,1.1 patches-1.36.3,NONE,1.1

[Kern S. <ke...@us...>]

Update of /cvsroot/bacula/bacula/patches/1.36.3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv985/patches/1.36.3

Added Files:
	1.36.3-tray-monitor-fix-broken-pipe.diff 
	1.36.3-wx-console-fix-dir-alignment.diff patches-1.36.3 
Log Message:
- Integrate libwrap patch from Szechuan Death. They should
  also fix bug 423.
- Clean up patches directory for next release.
- Add PS variable in bacula.in script as recommended by a user.
- Correct mtx-changer.in so it only creates a temp file when
  actually needed.
- Add patch supplied by user in a bug report to fix gnome2
  console buttons.
- Add patch from Peter Eriksson <pe...@if...> to correct
  NLS error in tray-monitor.c

--- NEW FILE: 1.36.3-wx-console-fix-dir-alignment.diff ---
Index: src/wx-console/wxbrestorepanel.cpp
===================================================================
RCS file: /cvsroot/bacula/bacula/src/wx-console/wxbrestorepanel.cpp,v
retrieving revision 1.40.8.1
diff -u -r1.40.8.1 wxbrestorepanel.cpp
--- src/wx-console/wxbrestorepanel.cpp	24 Mar 2005 14:52:55 -0000	1.40.8.1
+++ src/wx-console/wxbrestorepanel.cpp	5 May 2005 18:45:05 -0000
@@ -1469,23 +1469,29 @@
 wxString* wxbRestorePanel::ParseList(wxString line) {
    /* See ls_output in dird/ua_tree.c */
   
-   //drwxrwxrwx   1 root     root           0  2004-04-03 14:35:21  f:/tocd/NVSU 1.00.00/
-   //+ 10     +  ++ +   8  + +   8  ++   8  +  +      19         + *+ ->
-   //0           12 15       24      32        42                  62
-
+   //drwxrwxrwx  111 root     root           0  2004-04-03 14:35:21  f:/tocd/NVSU 1.00.00/
+   //+ 10     +  +i+ +   8  + +   8  ++   8  +  +      19         + *+ ->
+   //0           12  i+15     i+24    i+32      i+42                i+62
+ 
+   int i;
+   
    if (line.Length() < 63)
       return NULL;
 
    wxString* ret = new wxString[9];
 
    ret[0] = line.Mid(0, 10).Trim();
-   ret[1] = line.Mid(12, 2).Trim();
-   ret[2] = line.Mid(15, 8).Trim();
-   ret[3] = line.Mid(24, 8).Trim();
-   ret[4] = line.Mid(32, 8).Trim();
-   ret[5] = line.Mid(42, 19).Trim();
-   ret[6] = line.Mid(62, 1);
-   ret[7] = line.Mid(63).Trim();
+   
+   /* Column 1 has a variable width  */
+   i = line.find(' ', 14) - 14;
+   ret[1] = line.Mid(12, 2+i).Trim();
+      
+   ret[2] = line.Mid(15+i, 8).Trim();
+   ret[3] = line.Mid(24+i, 8).Trim();
+   ret[4] = line.Mid(32+i, 8).Trim();
+   ret[5] = line.Mid(42+i, 19).Trim();
+   ret[6] = line.Mid(62+i, 1);
+   ret[7] = line.Mid(63+i).Trim();
 
    if (ret[6] == " ") ret[6] = "";
 

--- NEW FILE: patches-1.36.3 ---
05May05 1.36.3-wx-console-fix-dir-alignment.diff
 Fix a problem when link count for a file is greater than 99 (bug #304).

25Apr05 1.36.3-tray-monitor-fix-broken-pipe.diff
 Fix broken pipe when closing bacula-tray-monitor (bug #292).

--- NEW FILE: 1.36.3-tray-monitor-fix-broken-pipe.diff ---
Index: src/tray-monitor/tray-monitor.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/tray-monitor/tray-monitor.c,v
retrieving revision 1.21
diff -r1.21 tray-monitor.c
455c455,468
<          writecmd(&items[i], "quit");
---
>          switch (items[i].type) {
>          case R_DIRECTOR:
>             trayMessage("Disconnecting from Director %s:%d\n", ((DIRRES*)items[i].resource)->address, ((DIRRES*)items[i].resource)->DIRport);
>             break;
>          case R_CLIENT:
>             trayMessage("Disconnecting from Client %s:%d\n", ((CLIENT*)items[i].resource)->address, ((CLIENT*)items[i].resource)->FDport);
>             break;
>          case R_STORAGE:
>             trayMessage("Disconnecting from Storage %s:%d\n", ((STORE*)items[i].resource)->address, ((STORE*)items[i].resource)->SDport);
>             break;          
>          default:
>             break;
>          }
>          //writecmd(&items[i], "quit");