=== modified file 'src/Makefile'
--- src/Makefile	2005-07-08 19:04:03 +0000
+++ src/Makefile	2012-12-17 12:30:38 +0000
@@ -101,7 +101,7 @@
 CATOBJEXT = .gmo
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -O3
+CFLAGS = -O2
 CPP = gcc -E
 CPPFLAGS = 
 CYGPATH_W = echo

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2006-09-15 20:02:58 +0000
+++ src/Makefile.am	2012-12-17 11:40:02 +0000
@@ -18,7 +18,7 @@
               smb-ext.c smb-ext.h
 
 smbc_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wall
-CFLAGS = -O3
+CFLAGS = -O2
 
 if GDB
   smbc_CFLAGS += -ggdb -g

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2006-09-15 20:02:58 +0000
+++ src/Makefile.in	2012-12-17 11:40:28 +0000
@@ -101,7 +101,7 @@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
-CFLAGS = -O3
+CFLAGS = -O2
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@

=== modified file 'src/convertm.c'
--- src/convertm.c	2006-09-15 20:02:58 +0000
+++ src/convertm.c	2012-12-17 10:53:01 +0000
@@ -43,6 +43,9 @@
   iconv_done(iconv_utf_to_screen);
   iconv_done(iconv_utf_to_system);
   iconv_done(iconv_system_to_utf);
+  iconv_utf_to_screen=NULL;
+  iconv_utf_to_system=NULL;
+  iconv_system_to_utf=NULL;
 }
 
 char *

=== modified file 'src/downloadlist.c'
--- src/downloadlist.c	2006-09-15 20:02:58 +0000
+++ src/downloadlist.c	2012-12-17 08:49:04 +0000
@@ -240,6 +240,7 @@
   RdstTmp = Rmalloc(RstrMaxLen);
   Rf = Rmalloc(RstrMaxLen);
   Rl = Rmalloc(RstrMaxLen);
+  *Rl = 0;
 
   RDBG("getHumanSize: getHumanSize Rsrc == "); RDBGi(Rsrc); RDBG("\n");
   if ((Rsrc/1024) > 0) 

=== modified file 'src/fnet.c'
--- src/fnet.c	2006-09-15 20:02:58 +0000
+++ src/fnet.c	2012-12-17 11:17:03 +0000
@@ -78,7 +78,7 @@
   if (sign+1-strLen > 0)
     sign = strLen;
   memcpy(str, RstrT, sign+1);
-  str[sign+1] = 0;
+  str[sign] = 0;
 }  
 
 void
@@ -736,7 +736,7 @@
     Rlen = RlB - RlS + 1;
     Rstr = Rmalloc(Rlen);
     memcpy(Rstr, RdirBig+RlS, Rlen);
-    Rstr[Rlen] = 0;
+    Rstr[Rlen-1] = 0;
 
     if (Rstr[0] == '/') 
       Rs = 1;
@@ -871,14 +871,16 @@
 Rintaddtoend(char **strp, int fmt)
 {
   char *Ri = NULL;
+  int len;
 
   asprintf(&Ri, "%i", fmt);
 
   if (Ri == NULL)
     kill(0, SIGTERM);
   Rstraddtoend(strp, Ri);
+  len = strlen(Ri)+1;
   free(Ri);
-  return(strlen(Ri)+1);
+  return(len);
 }
 
 int
@@ -920,7 +922,7 @@
     if (Rc1 == NULL)
       kill(0, SIGTERM);
     Rc2 = Rc1+Rc2start;
-    while (Rc2[0] && !Rchanged)
+    while (!Rchanged && Rc2[0])
     {
       if (Rc2[0] == '%')
         RmvwprintwAddPercent();

=== modified file 'src/smbc.c'
--- src/smbc.c	2006-09-15 20:02:58 +0000
+++ src/smbc.c	2012-12-17 09:50:51 +0000
@@ -35,6 +35,7 @@
 #include <popt.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <locale.h>
 #include "fnet.h"
 #include "smb-pack.h"
 #include "find-index-manage.h"
@@ -2552,7 +2553,7 @@
   {
     if ((Ri > 0) && (Rstr[Rt-Ri-1] == '.')) 
     {
-      memcpy(Rextm, Rstr+Rt-Ri, Ri+2);
+      memcpy(Rextm, Rstr+Rt-Ri, Ri+1);
       Rfind = 0;
     }
     Ri++;
@@ -5968,7 +5969,7 @@
       Rlen = (Rstrlen(RstrT1)+1>RmainWinX)?RmainWinX:Rstrlen(RstrT1)+1;
       RstrT2 = Rmalloc(Rlen);
       memcpy(RstrT2, RstrT1, Rlen-1);
-      RstrT2[Rlen] = 0;
+      RstrT2[Rlen-1] = 0;
 
       mvwhline(RwinStatus, 0, 0, ' ', RmainWinX);
       Rmvwprintw(RwinStatus, 0, 0, RstrT2);
@@ -6914,13 +6915,13 @@
  bindtextdomain("smbc", LOCALEDIR);
  textdomain("smbc");
 
+ RstrdupN(RsmbcLockFile, from_sys(getenv("HOME")));
+ Rstraddtoend(&RsmbcLockFile, "/.smbc/debug");
+ RinitDebug(RsmbcLockFile);
+
  RinitIconv();
  RinitStrings();
 
- RstrdupN(RsmbcLockFile, from_sys(getenv("HOME")));
- Rstraddtoend(&RsmbcLockFile, "/.smbc/debug");
- RinitDebug(RsmbcLockFile);
-
  Roptions[0].descrip = Rm300;
  Roptions[1].descrip = Rm301;
  Roptions[2].descrip = Rm302;

=== modified file 'src/static_str.c'
--- src/static_str.c	2006-09-15 20:02:58 +0000
+++ src/static_str.c	2012-12-17 11:06:41 +0000
@@ -27,14 +27,14 @@
   Rasprintf(&Rm1, _("Please change screen"));
   Rasprintf(&Rm2, _("size to minimum 80x25"));
   Rasprintf(&Rm3, _("A workgroups list is empty."));
-  Rasprintf(&Rm4, _("Founded workgroups."));
+  Rasprintf(&Rm4, _("Found workgroups."));
   Rasprintf(&Rm5, _("A hosts list in workgroup is empty."));
-  Rasprintf(&Rm6, _("Founded hosts in workgroup."));
+  Rasprintf(&Rm6, _("Found hosts in workgroup."));
   Rasprintf(&Rm7, _("A share list in host is empty."));
-  Rasprintf(&Rm8, _("Founded shares in host."));
+  Rasprintf(&Rm8, _("Found shares on host."));
   Rasprintf(&Rm9, _("Can't read files/dirs from host."));
   Rasprintf(&Rm10, _("A files/dirs list in host is empty."));
-  Rasprintf(&Rm11, _("Founded files/dirs in host."));
+  Rasprintf(&Rm11, _("Found files/dirs on host."));
 
   Rasprintf(&Rm18, _("Workgroups not found."));
   Rasprintf(&Rm19, _("Host is empty."));