Add patch 1.36.3-wx-console-fix-dir-alignment.diff (bug #304).

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

diff --git a/bacula/patches/1.36.3-wx-console-fix-dir-alignment.diff b/bacula/patches/1.36.3-wx-console-fix-dir-alignment.diff
new file mode 100644 (file)
index 0000000..253fdea
--- /dev/null
+++ b/bacula/patches/1.36.3-wx-console-fix-dir-alignment.diff
@@ -0,0 +1,48 @@
+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] = "";
+ 

diff --git a/bacula/patches/patches-1.36.3 b/bacula/patches/patches-1.36.3
index c8c7404dbe77fbea473a3f2e5f898e1298fc2973..fced06c28f23c03d1f66ad4478e1fea9b5a5639d 100644 (file)
--- a/bacula/patches/patches-1.36.3
+++ b/bacula/patches/patches-1.36.3
@@ -1,3 +1,5 @@
+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).