Changeset 39576 for titan/plugins/tithek/tithek_global.h

Timestamp:

01/01/17 14:17:04 (6 years ago)

Author:

gost

Message:

test

File:

• titan/plugins/tithek/tithek_global.h (modified) (2 diffs)

titan/plugins/tithek/tithek_global.h

@@ -786 +786 @@
                 drawscreen(load, 0, 0);
 
-                char* titheklocalfile = ostrcat("/tmp/tithek/mainmenu.local.list", NULL, 0, 0);
-
                 if(flag == 1)
                 {
@@ -830 +828 @@
                         system(cmd);
                         free(cmd), cmd = NULL;
-//                      }
-        
-                        cmd = ostrcat("ls -1 ", path, 0, 0);
-                        cmd = ostrcat(cmd, "/*.sh", 1, 0);
-        
-                        free(path), path = NULL;
-                        tmpstr1 = command("ls -1 /mnt/parser/*.sh");
-                        tmpstr2 = command(cmd);
-                        free(cmd), cmd = NULL;
-                        tmpstr = ostrcat(tmpstr1, "\n", 0, 0);
-                        tmpstr = ostrcat(tmpstr, tmpstr2, 1, 0);
-        
-                        int count = 0, i = 0;
-                        struct splitstr* ret1 = NULL;
-                        ret1 = strsplit(tmpstr, "\n", &count);
-                
-                        int max = count;
-                        for(i = 0; i < max; i++)
+                }
+
+                cmd = ostrcat("ls -1 ", path, 0, 0);
+                cmd = ostrcat(cmd, "/*.sh", 1, 0);
+
+                free(path), path = NULL;
+                tmpstr1 = command("ls -1 /mnt/parser/*.sh");
+                tmpstr2 = command(cmd);
+                free(cmd), cmd = NULL;
+                tmpstr = ostrcat(tmpstr1, "\n", 0, 0);
+                tmpstr = ostrcat(tmpstr, tmpstr2, 1, 0);
+
+                int count = 0, i = 0;
+                struct splitstr* ret1 = NULL;
+                ret1 = strsplit(tmpstr, "\n", &count);
+        
+                int max = count;
+                for(i = 0; i < max; i++)
+                {
+                        if(file_exist(ret1[i].part) && cmpfilenameext(ret1[i].part, ".sh") == 0)
                         {
-                                if(file_exist(ret1[i].part) && cmpfilenameext(ret1[i].part, ".sh") == 0)
-                                {
-                                        cmd = ostrcat(ret1[i].part, " ", 0, 0);
-                                        cmd = ostrcat(cmd, ret1[i].part, 1, 0);
-                                        cmd = ostrcat(cmd, " init", 1, 0);
-                                        line = command(cmd);
-                                        debug(99, "add main menuentry: %s", line);
-                                        writesys(titheklocalfile, line, 3);
-                                        free(cmd), cmd = NULL;
-                                        free(line), line = NULL;
-                                }
+                                cmd = ostrcat(ret1[i].part, " ", 0, 0);
+                                cmd = ostrcat(cmd, ret1[i].part, 1, 0);
+                                cmd = ostrcat(cmd, " init", 1, 0);
+                                line = command(cmd);
+                                debug(99, "add main menuentry: %s", line);
+                                writesys(tithekfile, line, 3);
+                                free(cmd), cmd = NULL;
+                                free(line), line = NULL;
                         }
-                        free(ret1), ret1 = NULL;
-                        free(tmpstr), tmpstr = NULL;
-                        free(tmpstr1), tmpstr1 = NULL;
-                        free(tmpstr2), tmpstr2 = NULL;
-                }
-
-                line = readfiletomem(titheklocalfile, 1);
-                free(titheklocalfile), titheklocalfile = NULL;
-                writesys(tithekfile, line, 3);
-
+                }
+                free(ret1), ret1 = NULL;
+                free(tmpstr), tmpstr = NULL;
+                free(tmpstr1), tmpstr1 = NULL;
+                free(tmpstr2), tmpstr2 = NULL;
                 clearscreen(load);
         }
-
 }