diff --git a/programs/bcc32/examples/color_dlg/color_dlg.cpp b/programs/bcc32/examples/color_dlg/color_dlg.cpp index 8540dc6235..17b2f6d52a 100644 --- a/programs/bcc32/examples/color_dlg/color_dlg.cpp +++ b/programs/bcc32/examples/color_dlg/color_dlg.cpp @@ -47,7 +47,7 @@ bool KolibriOnStart(TStartData &kos_start, TThreadData /*th*/) cold.procinfo = procinfo; cold.com_area_name = "FFFFFFFF_color_dialog"; cold.com_area = 0; - cold.start_path = "/rd/1/colrdial"; + cold.start_path = "/sys/colrdial"; cold.draw_window = DrawWindow; cold.status = 0; cold.x_size = 420; diff --git a/programs/bcc32/examples/open_dlg/open_dlg.cpp b/programs/bcc32/examples/open_dlg/open_dlg.cpp index ede148b2d0..01d05e3df2 100644 --- a/programs/bcc32/examples/open_dlg/open_dlg.cpp +++ b/programs/bcc32/examples/open_dlg/open_dlg.cpp @@ -48,8 +48,8 @@ bool KolibriOnStart(TStartData &kos_start, TThreadData /*th*/) ofd.com_area_name = "FFFFFFFF_open_dialog"; ofd.com_area = 0; ofd.opendir_path = plugin_path; - ofd.dir_default_path = "/rd/1"; - ofd.start_path = "/rd/1/File managers/opendial"; + ofd.dir_default_path = "/sys"; + ofd.start_path = "/sys/File managers/opendial"; ofd.draw_window = DrawWindow; ofd.status = 0; ofd.openfile_path = openfile_path; diff --git a/programs/bcc32/games/blocks/blocks.cpp b/programs/bcc32/games/blocks/blocks.cpp index 9f89157ed7..122649e4eb 100644 --- a/programs/bcc32/games/blocks/blocks.cpp +++ b/programs/bcc32/games/blocks/blocks.cpp @@ -444,8 +444,8 @@ bool KolibriOnStart(TStartData &kos_start, TThreadData /*th*/) ofd.com_area_name = "FFFFFFFF_open_dialog"; ofd.com_area = 0; ofd.opendir_path = plugin_path; - ofd.dir_default_path = "/rd/1"; - ofd.start_path = "/rd/1/File managers/opendial"; + ofd.dir_default_path = "/sys"; + ofd.start_path = "/sys/File managers/opendial"; ofd.draw_window = DrawWindow; ofd.status = 0; ofd.openfile_path = openfile_path; @@ -611,4 +611,4 @@ bool KolibriOnClose(TThreadData /*th*/) if(f_data) delete f_data; if(model_list) delete model_list; return true; -} \ No newline at end of file +} diff --git a/programs/cmm/app_plus/app_plus.c b/programs/cmm/app_plus/app_plus.c index 2b3e72be1a..5238805ccc 100644 --- a/programs/cmm/app_plus/app_plus.c +++ b/programs/cmm/app_plus/app_plus.c @@ -19,7 +19,7 @@ #define SCRX WINW-180 #define SCRY 20 -char default_dir[] = "/rd/1"; +char default_dir[] = "/sys"; od_filter filter2; #define BTN_MANUAL_SEARCH 10 diff --git a/programs/cmm/appearance/const.h b/programs/cmm/appearance/const.h index 99d835323d..15151cc0df 100644 --- a/programs/cmm/appearance/const.h +++ b/programs/cmm/appearance/const.h @@ -63,7 +63,7 @@ enum { _ini ini = { "/sys/settings/system.ini" }; -char default_dir[] = "/rd/1"; +char default_dir[] = "/sys"; od_filter filter2 = { 8, "TXT\0\0" }; _tabs tabs = { -sizeof(t_skins)-sizeof(t_wallpapers)-sizeof(t_screensaver) @@ -103,4 +103,4 @@ dword get_real_kolibrios_path() void SelectList_LineChanged() { EventApply(); -} \ No newline at end of file +} diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 7904c772a7..b444853719 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -76,7 +76,7 @@ dword http_get_type=PAGE; dword render_start_time; int menu_id=NULL; -char default_dir[] = "/rd/1"; +char default_dir[] = "/sys"; od_filter filter2 = { 22, "TXT\0HTM\0HTML\0DOCX\0\0" }; char editURL[URL_SIZE+1]; @@ -461,10 +461,10 @@ void EventAllTabsClick(dword _n) void EventEditSource() { if (check_is_the_adress_local(history.current())) { - RunProgram("/rd/1/develop/cedit", history.current()); + RunProgram("/sys/develop/cedit", history.current()); } else { CreateFile(WB1.bufsize, WB1.bufpointer, "/tmp0/1/WebView_tmp.htm"); - if (!EAX) RunProgram("/rd/1/develop/cedit", "/tmp0/1/WebView_tmp.htm"); + if (!EAX) RunProgram("/sys/develop/cedit", "/tmp0/1/WebView_tmp.htm"); } } @@ -1002,4 +1002,4 @@ dword GetImg(bool _new) DrawStatusBar(NULL); } -stop: \ No newline at end of file +stop: diff --git a/programs/cmm/diff/diff_gui.h b/programs/cmm/diff/diff_gui.h index 54a89ed4e2..4d86582a3a 100644 --- a/programs/cmm/diff/diff_gui.h +++ b/programs/cmm/diff/diff_gui.h @@ -18,7 +18,7 @@ //proc_info Form; #define WIN_W 450 -char default_dir[] = "/rd/1"; +char default_dir[] = "/sys"; od_filter filter2 = {0,0}; char src_path[4096]; @@ -156,4 +156,4 @@ void EventInsert() { if ( src_box.flags & ed_focus ) EventOpenDialogFirst(); if ( dst_box.flags & ed_focus ) EventOpenDialogSecond(); -} \ No newline at end of file +} diff --git a/programs/cmm/imgedit/imgedit.c b/programs/cmm/imgedit/imgedit.c index 9fed23e488..0d308e0ee2 100644 --- a/programs/cmm/imgedit/imgedit.c +++ b/programs/cmm/imgedit/imgedit.c @@ -35,7 +35,7 @@ proc_info Form; dword semi_white; bool bg_dark=false; -char default_dir[4096] = "/rd/1"; +char default_dir[4096] = "/sys"; od_filter filter2 = { 69, "BMP\0GIF\0ICO\0CUR\0JPEG\0JPG\0PNG\0PNM\0TGA\0TIFF\0TIF\0WBMP\0XBM\0XCF\Z80\0\0" }; libimg_image icons18; diff --git a/programs/cmm/misc/acpi_install.c b/programs/cmm/misc/acpi_install.c index 01f3be0033..b4247cea90 100644 --- a/programs/cmm/misc/acpi_install.c +++ b/programs/cmm/misc/acpi_install.c @@ -8,15 +8,15 @@ void main() RunProgram("/kolibrios/drivers/acpi/acpi", NULL); pause(300); - if (file_exists("/rd/1/drivers/devices.dat")) { + if (file_exists("/sys/drivers/devices.dat")) { if (GetSystemLanguage()==4) { - notify("'ACPI/APIC\n/rd/1/drivers/devices.dat был успешно сгенерирован.\nУстановка ещё не закончена. Следуйте указаниям в Readme!' -tdO"); + notify("'ACPI/APIC\n/sys/drivers/devices.dat был успешно сгенерирован.\nУстановка ещё не закончена. Следуйте указаниям в Readme!' -tdO"); } else { - notify("'ACPI/APIC\n/rd/1/drivers/devices.dat was succesfully generated.\nInstallation is not completed.\nFor the next steps please check Readme!' -tdO"); + notify("'ACPI/APIC\n/sys/drivers/devices.dat was succesfully generated.\nInstallation is not completed.\nFor the next steps please check Readme!' -tdO"); } RunProgram("/sys/@open", "/kolibrios/drivers/acpi/readme.txt"); } else { - notify("'Error generating /rd/1/drivers/devices.dat' -E"); + notify("'Error generating /sys/drivers/devices.dat' -E"); } ExitProcess(); diff --git a/programs/cmm/pixie2/pixie.c b/programs/cmm/pixie2/pixie.c index 3260fb324f..e6f8287c2e 100644 --- a/programs/cmm/pixie2/pixie.c +++ b/programs/cmm/pixie2/pixie.c @@ -26,7 +26,7 @@ //===================================================// //simple open dialog data -char default_dir[] = "/rd/1"; +char default_dir[] = "/sys"; od_filter filter2 = { 15, "MP3\0WAV\0XM\0\0" }; #define ABOUT_MESSAGE " v2.94 Final @@ -600,4 +600,4 @@ void EventShowTagInfo() stop: -char menu_stak[4096]; \ No newline at end of file +char menu_stak[4096]; diff --git a/programs/cmm/quark/data.h b/programs/cmm/quark/data.h index 06cabb7a27..92dba66ec0 100644 --- a/programs/cmm/quark/data.h +++ b/programs/cmm/quark/data.h @@ -84,7 +84,7 @@ struct THEME dword bg, text, cursor, found; } theme; -char default_dir[] = "/rd/1"; +char default_dir[] = "/sys"; od_filter filter2 = { 0, "" }; CANVAS canvas; diff --git a/programs/cmm/tmpdisk/tmpdisk.c b/programs/cmm/tmpdisk/tmpdisk.c index 3a53289682..e548c7248f 100644 --- a/programs/cmm/tmpdisk/tmpdisk.c +++ b/programs/cmm/tmpdisk/tmpdisk.c @@ -50,7 +50,7 @@ void main() { if (! driver_handle = LoadDriver("tmpdisk")) { - notify("'TmpDisk\nError: /rd/1/drivers/tmpdisk.obj driver loading failed\nVirtual disk wouldn't be added' -tE"); + notify("'TmpDisk\nError: /sys/drivers/tmpdisk.obj driver loading failed\nVirtual disk wouldn't be added' -tE"); ExitProcess(); } diff --git a/programs/demos/3dcube2/trunk/ascgl.inc b/programs/demos/3dcube2/trunk/ascgl.inc index 632a5a3087..c48154605f 100644 --- a/programs/demos/3dcube2/trunk/ascgl.inc +++ b/programs/demos/3dcube2/trunk/ascgl.inc @@ -435,7 +435,7 @@ end_bmp: ; LOADBMP - Load bmp image from file ; (SYNTAX) LOADBMP 'file_path',temp_area(rb 0x10000),load_area,dd soi -; (SAMPLE) LOADBMP '/rd/1/menuet.bmp',temp_area,I_END,tsoi +; (SAMPLE) LOADBMP '/sys/menuet.bmp',temp_area,I_END,tsoi ; ( NOTE ) Macros create on Base of ; Picture browser by lisovin@26.ru & Ivan Poddubny ; SOI - Start of image diff --git a/programs/demos/3detx60b/trunk/ascl.inc b/programs/demos/3detx60b/trunk/ascl.inc index b4a749d5a8..13c2ad3a99 100644 --- a/programs/demos/3detx60b/trunk/ascl.inc +++ b/programs/demos/3detx60b/trunk/ascl.inc @@ -30,7 +30,7 @@ lang equ ru ; ru en fr ge fi ; LOADFILE ; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area -; (SAMPLE) LOADFILE '/rd/1/clock.bmp',load_area,temp_area +; (SAMPLE) LOADFILE '/sys/clock.bmp',load_area,temp_area macro loadfile file_name,file_load_area,file_temp_area { diff --git a/programs/demos/life/trunk/ascl.inc b/programs/demos/life/trunk/ascl.inc index f5a3cf2db3..2ecfb96d69 100644 --- a/programs/demos/life/trunk/ascl.inc +++ b/programs/demos/life/trunk/ascl.inc @@ -30,7 +30,7 @@ lang equ ru ; ru en fr ge fi ; LOADFILE ; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area -; (SAMPLE) LOADFILE '/rd/1/clock.bmp',load_area,temp_area +; (SAMPLE) LOADFILE '/sys/clock.bmp',load_area,temp_area macro loadfile file_name,file_load_area,file_temp_area { @@ -324,7 +324,7 @@ run_fileinfo: dd 0 dd procinfo ; 0x10000 ;run_filepath - db '/RD/1/SYSXTREE',0 + db '/SYS/SYSXTREE',0 procinfo: times 256 db 0 @@ -535,7 +535,7 @@ run_fileinfo: dd 0 dd procinfo run_filepath: - db '/RD/1/SYSXTREE',0 + db '/SYS/SYSXTREE',0 procinfo: times 256 db 0 diff --git a/programs/demos/life2/life2.cpp b/programs/demos/life2/life2.cpp index 3b545b03af..2a180b39c9 100644 --- a/programs/demos/life2/life2.cpp +++ b/programs/demos/life2/life2.cpp @@ -1705,8 +1705,8 @@ bool KolibriOnStart(TStartData &me_start, TThreadData th) ofd.com_area_name = "FFFFFFFF_open_dialog"; ofd.com_area = 0; ofd.opendir_path = plugin_path; - ofd.dir_default_path = "/rd/1"; - ofd.start_path = "/rd/1/File managers/opendial"; + ofd.dir_default_path = "/sys"; + ofd.start_path = "/sys/File managers/opendial"; ofd.draw_window = DrawWindow; ofd.status = 0; ofd.openfile_path = CommandLine; diff --git a/programs/demos/trantest/trunk/ascl.inc b/programs/demos/trantest/trunk/ascl.inc index b4a749d5a8..13c2ad3a99 100644 --- a/programs/demos/trantest/trunk/ascl.inc +++ b/programs/demos/trantest/trunk/ascl.inc @@ -30,7 +30,7 @@ lang equ ru ; ru en fr ge fi ; LOADFILE ; (SYNTAX) LOADFILE 'full_path_to_file',file_load_area,file_temp_area -; (SAMPLE) LOADFILE '/rd/1/clock.bmp',load_area,temp_area +; (SAMPLE) LOADFILE '/sys/clock.bmp',load_area,temp_area macro loadfile file_name,file_load_area,file_temp_area { diff --git a/programs/demos/view3ds/data.inc b/programs/demos/view3ds/data.inc index 1b26b62565..4feac6fdb6 100644 --- a/programs/demos/view3ds/data.inc +++ b/programs/demos/view3ds/data.inc @@ -384,7 +384,7 @@ base_vector: ; fsize dd 0 ;180000 ; sizeof(workarea) ; fptr dd 0 ;workarea ; file_name: -; db '/rd/1/3d/house.3ds',0 +; db '/sys/3d/house.3ds',0 ; ; db '/tmp0/1/ant.3ds',0 ; ; rb 256 @@ -512,7 +512,7 @@ end if fsize dd 0 ;180000 ; sizeof(workarea) fptr dd 0 ;workarea file_name: - db '/rd/1/3d/house.3ds',0 + db '/sys/3d/house.3ds',0 ; db '/tmp0/1/sc.3ds',0 rb 256 diff --git a/programs/develop/cmm/main.cpp b/programs/develop/cmm/main.cpp index ffcb7804cc..0d2fb61348 100644 --- a/programs/develop/cmm/main.cpp +++ b/programs/develop/cmm/main.cpp @@ -1140,8 +1140,8 @@ char m1[256]; if (inih = fopen(m1,"rb")) {_loadIni(inih);return;} } - //for KolibriOS: load /rd/0/settings/c--.ini - inih = fopen("/rd/1/settings/c--.ini","rb"); + //for KolibriOS: load /sys/settings/c--.ini + inih = fopen("/sys/settings/c--.ini","rb"); for(;;){ if(fgets(m1,255,inih)==NULL)break; if(SelectComand(m1,0)==c_end)BadCommandLine(m1);