Changeset 38874

Timestamp:

09/18/16 13:38:52 (7 years ago)

Author:

Stephan

Message:

let error be translated

File:

• titan/plugins/multiimage/MultiImage.c (modified) (29 diffs)

titan/plugins/multiimage/MultiImage.c

@@ -56 +56 @@
                 system(cmd);
                 free(cmd); cmd = NULL;
-                
+
         }
         else
@@ -78 +78 @@
         char* mdev = NULL;
         char* path = NULL;
-        
+
         char* pos = NULL;
         FILE* fd = NULL;
@@ -118 +118 @@
         }
         free(fileline);
-        fclose(fd);     
+        fclose(fd);
 
         return mdev;
@@ -131 +131 @@
         char* cmd = NULL;
         struct skin* tmp = NULL;
-        int ret = 0;    
-        int rcret = 0;  
+        int ret = 0;
+        int rcret = 0;
         int ren = 0;
-         
+
         struct skin* multipart = getscreen("multipart");
         struct skin* listbox = getscreennode(multipart, "listbox");
         struct skin* device = getscreennode(multipart, "device");
         struct skin* text2 = getscreennode(multipart, "textbox2");
-                        
+
         char* pos = NULL;
         FILE* fd = NULL;
@@ -170 +170 @@
         }
         free(fileline);
-        fclose(fd);     
+        fclose(fd);
         if(mdev == NULL)
         {
@@ -180 +180 @@
         path = ostrcat(path, "/", 0, 0);
         path = ostrcat(path, mdev, 1, 0);
-        
+
         dirall = get_dir(path);
         free(path); path = NULL;
-        
+
         changetext(text2, dirall);
         free(dirall); dirall = NULL;
-        
+
         free(mdev); mdev=NULL;
-        
+
         drawscreen(multipart, 0, 0);
         addscreenrc(multipart, listbox);
@@ -196 +196 @@
                 addscreenrc(multipart, tmp);
                 rcret = waitrc(multipart, 2000, 0);
-                tmp = listbox->select; 
+                tmp = listbox->select;
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
-                
+
                 if((rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL)) && listbox->select != NULL && ostrcmp(listbox->select->name, "device") == 0)
                 {
@@ -227 +227 @@
                         path = ostrcat(path, "/", 0, 0);
                         path = ostrcat(path, mdev, 1, 0);
-                        
+
                         cmd = ostrcat("mount | grep ", mdev, 0, 0);
                         cmd = ostrcat(cmd, " | grep ext[2,3,4]", 1, 0);
@@ -242 +242 @@
                         else
                         {
-                                textbox("ERROR", _("No Linux partition found on this device."), _("OK"), getrcconfigint("rcok", NULL),NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
+                                textbox(_("ERROR"), _("No Linux partition found on this device."), _("OK"), getrcconfigint("rcok", NULL),NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
                                 ren = 0;
                         }
@@ -249 +249 @@
                         if(ren == 1)
                                 break;
-                } 
+                }
                 drawscreen(multipart, 0, 0);
         }
         delownerrc(multipart);
         clearscreen(multipart);
-        
+
         if(mdev == NULL)
-                return 1;       
-        
+                return 1;
+
         if(ren != 1)
-        { 
+        {
                 if(textbox("MultiImage", _("All data on this device will be deleted!\nOK?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 650, 200, 0, 0) == 2)
                 {
@@ -290 +290 @@
                 free(mdev); mdev = NULL;
                 system ("echo MultiImage > /dev/vfd");
-        }       
-        
+        }
+
         return 0;
 }
-        
+
 // type 1 = install image
 // type 2 = rename image
@@ -324 +324 @@
                 changeinput(imagename, imagefile);
         }
-        
+
         path = getconfig("mountpath", NULL);
         path = ostrcat(path, "/", 0, 0);
@@ -331 +331 @@
         path2 = ostrcat(path, "/", 0, 0);
         path2 = ostrcat(path2,"titan_multi", 1, 0);
-                
+
         changetext(text1, imagefile);
-        
-        
+
+
         drawscreen(multiinstall, 0, 0);
         addscreenrc(multiinstall, listbox);
@@ -342 +342 @@
                 addscreenrc(multiinstall, tmp);
                 rcret = waitrc(multiinstall, 2000, 0);
-                tmp = listbox->select; 
+                tmp = listbox->select;
                 if(rcret == getrcconfigint("rcexit", NULL))
                         break;
@@ -404 +404 @@
         }
 
-        free(path); path=NULL;  
-        free(path2); path2=NULL;        
-        free(path3); path3=NULL;        
+        free(path); path=NULL;
+        free(path2); path2=NULL;
+        free(path3); path3=NULL;
         return rc;
 }
@@ -415 +415 @@
         char* path = NULL;
         char* cmd = NULL;
-        char* tmpstr = NULL; 
+        char* tmpstr = NULL;
         char* selimage = NULL;
-        struct dirent* dirzeiger;       
+        struct dirent* dirzeiger;
         DIR *dir = NULL;
-        int rcret = 0;  
+        int rcret = 0;
         int rc = 0;
         int test = 0;
         int test2 = 0;
-        
+
         struct skin* multiimage = getscreen("multiimage");
         struct skin* listbox = getscreennode(multiimage, "listbox");
         struct skin* images = getscreennode(multiimage, "images");
         struct skin* chnode1 = NULL;
-        
+
         path = getconfig("mountpath", NULL);
         path = ostrcat(path, "/", 0, 0);
@@ -434 +434 @@
         path = ostrcat(path, "/", 1, 0);
         path = ostrcat(path,"titan_multi", 1, 0);
-        
+
         delmarkedscreennodes(multiimage, 1);
         listbox->aktpage = -1;
         listbox->aktline = 1;
-        
+
         tmpstr = ostrcat(path, "/", 0, 0);
         tmpstr = ostrcat(tmpstr, ".multi_image", 1, 0);
         selimage = readsys(tmpstr, 1);
         free(tmpstr); tmpstr=NULL;
-        
+
         test2 = 0;
         dir = opendir(path);
@@ -466 +466 @@
                                         if(selimage != NULL && ostrcmp(selimage, dirzeiger->d_name) == 0)
                                         {
-                                                tmpstr = ostrcat(dirzeiger->d_name, "  (selected)", 0, 0);      
+                                                tmpstr = ostrcat(dirzeiger->d_name, "  (selected)", 0, 0);
                                                 changetext(chnode1, tmpstr);
                                                 free(tmpstr); tmpstr=NULL;
                                                 test2 = 1;
                                         }
-                                        else            
+                                        else
                                                 changetext(chnode1, dirzeiger->d_name);
                                 }
@@ -480 +480 @@
                 if(test == 0)
                         images->hidden = NO;
-                else 
+                else
                 {
                         images->hidden = YES;
@@ -508 +508 @@
                 addscreenrc(multiimage, tmp);
                 rcret = waitrc(multiimage, 2000, 0);
-                tmp = listbox->select; 
+                tmp = listbox->select;
                 if(rcret == getrcconfigint("rcok", NULL))
                 {
                         if(listbox->select != NULL)
-                        {       
+                        {
                                 rc = 1;
                                 tmpstr = ostrcat(path, "/", 0, 0);
@@ -529 +529 @@
                 {
                         if(listbox->select != NULL)
-                        {       
+                        {
                                 rc = 1;
                                 cmd = ostrcat(_("Sure to delete Image?\n"), listbox->select->name, 0, 0);
@@ -558 +558 @@
                 {
                         rc = 1;
-                        selimage = ostrcat(listbox->select->name, NULL, 0, 0); 
+                        selimage = ostrcat(listbox->select->name, NULL, 0, 0);
                         break;
                 }
@@ -585 +585 @@
         char* imagefile = NULL;
         int ret = 0;
-                
+
         mdev = find_multiimage_dev();
-        
+
         while (mdev == NULL)
         {
@@ -593 +593 @@
                         return;
                 if(no_mdev() != 0)
-                        return;         
+                        return;
                 mdev = find_multiimage_dev();
         }
@@ -599 +599 @@
         {
                 ret = multiimage_screen(mdev);
-                
+
                 if(ret == 0)
                         break;
@@ -606 +606 @@
                 if(ret == 2)
                 {
-                        textbox(_("Message"), _("The install process will look in /tmp for an image zip file.\nPlease copy the image to /tmp.\nThe filename must not contain blanks."), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 800, 200, 0, 0);                                      
+                        textbox(_("Message"), _("The install process will look in /tmp for an image zip file.\nPlease copy the image to /tmp.\nThe filename must not contain blanks."), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 800, 200, 0, 0);
                         imagefile = screendir("/tmp", "*.zip", NULL, NULL, NULL, NULL, 0, "SELECT", 0, NULL, 0, NULL, 0, 1200, 0, 600, 0, 0);
                         if(imagefile != NULL)
@@ -622 +622 @@
                 {
                         if(no_mdev() != 0)
-                                continue;               
+                                continue;
                         free(mdev); mdev=NULL;
                         mdev = find_multiimage_dev();
@@ -634 +634 @@
         free(mdev); mdev=NULL;
 }
-        
-        
-                
+
+
+
 //wird beim laden ausgefuehrt
 void init(void)
@@ -642 +642 @@
         char* tmpstr = NULL;
         pluginaktiv = 1;
-        
+
         tmpstr = createpluginpath("/multiimage/skin.xml", 0);
         readscreen(tmpstr, 122, 1);