Changeset 19934

Timestamp:

02/04/13 23:51:36 (11 years ago)

Author:

obi

Message:

[titan] netbrowser fix port

Location:

titan

Files:

• plugins/networkbrowser/networkbrowser.h (modified) (3 diffs)
• titan/global.h (modified) (1 diff)

titan/plugins/networkbrowser/networkbrowser.h

@@ -10 +10 @@
 #ifndef NETWORKBROWSER_H
 #define NETWORKBROWSER_H
+
+char *kill_the_nulls (char* s) 
+{ 
+    while (*s && *s == '0') 
+        s++; 
+    return s;     
+} 
 
 extern struct inetwork* inetwork;
@@ -625 +632 @@
                         free(tmpstr); tmpstr = NULL;
                         savesettings = ostrcat(savesettings, "\\:", 1, 0);
-                        savesettings = ostrcat(savesettings, node->ftpport, 1, 0);
+
+                        tmpstr = fixport(node->ftpport, 1);
+                        savesettings = ostrcat(savesettings, fixport(tmpstr, 1), 1, 0);
+                        free(tmpstr); tmpstr = NULL;
 
                         if(ostrcmp(node->sharedir, "sharedir") != 0)
@@ -1218 +1228 @@
         free(tmpstr); tmpstr = NULL;
 
+        tmpstr = fixport(node->ftpport, 0);
         changemask(skin_ftpport, "00000");
-        changeinput(skin_ftpport, node->ftpport);
+        changeinput(skin_ftpport, tmpstr);
+        free(tmpstr); tmpstr = NULL;
 
         changemask(skin_sharedir, "abcdefghijklmnopqrstuvwxyz");

titan/titan/global.h

@@ -5940 +5940 @@
 }
 
+//flag 0: convert port to 00021
+//flag 1: convert port to 21
+char* fixport(char* input, int flag)
+{
+        char* tmpstr = NULL;
+
+        if(flag == 0)
+        {
+                int plen = strlen(input);
+                if(plen < 5)
+                {
+                        int i;
+                        for(i = 0; i < 5 - plen; i++)
+                                tmpstr = ostrcat(tmpstr, "0", 1, 0);
+                }
+                tmpstr = ostrcat(tmpstr, input, 1, 0);          
+        }
+        else
+        {
+            while (*input && *input == '0') 
+                input++;
+        
+                tmpstr = ostrcat(tmpstr, input, 1, 0);          
+        }        
+        return tmpstr;
+}
+
 #endif