From cddd55baa5bcc295d4bfda9387c02a66dde53a3d Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 18 Sep 2017 10:41:04 +0000 Subject: [PATCH] Eolite: fix opening '/' (bug found by 0CodErr) git-svn-id: svn://kolibrios.org@6990 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 5 +---- programs/cmm/eolite/include/translations.h | 4 ++-- programs/cmm/lib/file_system.h | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 96f24fba2d..f14f673454 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -112,8 +112,6 @@ byte cmd_free=0; #include "include\translations.h" #include "include\fs.h" -char *fd_path_eolite_ini_path; - #include "include\settings.h" #include "include\progress_dialog.h" #include "..\lib\copyf.h" @@ -140,14 +138,13 @@ void main() load_dll(libini, #lib_init,1); eolite_ini_path = abspath("Eolite.ini"); - fd_path_eolite_ini_path = "/fd/1/File Managers/Eolite.ini"; LoadIniSettings(); SystemDiscs.Get(); SetAppColors(); if (param) { - if (param[strlen(#param)-1]=='/') param[strlen(#param)-1]=NULL; //no "/" in the end + if (strlen(#param)>1) && (param[strlen(#param)-1]=='/') param[strlen(#param)-1]=NULL; //no "/" in the end if (dir_exists(#param)==true) { diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h index 03e690a371..1686340378 100644 --- a/programs/cmm/eolite/include/translations.h +++ b/programs/cmm/eolite/include/translations.h @@ -1,5 +1,5 @@ -#define TITLE "Eolite File Manager v3.78" -#define ABOUT_TITLE "EOLITE 3.78" +#define TITLE "Eolite File Manager v3.79" +#define ABOUT_TITLE "EOLITE 3.79" #ifdef LANG_RUS ?define T_FILE "” ©«" diff --git a/programs/cmm/lib/file_system.h b/programs/cmm/lib/file_system.h index fb10918e12..20ab9d334d 100644 --- a/programs/cmm/lib/file_system.h +++ b/programs/cmm/lib/file_system.h @@ -299,9 +299,6 @@ enum } :dword ConvertSize64(dword bytes_lo, bytes_hi) { - debugval("bytes_lo", bytes_lo); - debugval("bytes_hi", bytes_hi); - if (bytes_hi > 0) { if (bytes_lo>=1073741824) bytes_lo >>= 30; else bytes_lo = 0; sprintf(#ConvertSize_size_prefix,"%d Gb",bytes_hi<<2 + bytes_lo);