WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 7516 → Rev 7515

/programs/cmm/txtread/txtread.c
126,7 → 126,6
{
InitDlls();
OpenDialog_init stdcall (#o_dialog);
if (param) strcpy(#openfile_path, #param);
LoadIniSettings();
EventSetColorScheme(curcol_scheme);
kfont.init(DEFAULT_FONT);

/programs/games/rforces/trunk/cmp.bat
4,5 → 4,4
@link /nologo /manifest:no /entry:crtStartUp /subsystem:native /base:0 /fixed /align:16 /nodefaultlib rforces.obj kosFile.obj kosSyst.obj mcsmemm.obj
@pe2kos rforces.exe rforces
@del rforces.exe
@del *.obj
pause

 /programs/other/table/hello.cpp
 ,13 → 6,8
 #include "calc.h"
 #include "use_library.h"
-#ifdef AUTOBUILD
-extern char params[1024];
-#endif
-char params[1024];
+#define TABLE_VERSION "0.99"
-#define TABLE_VERSION "0.99.1"
 // strings
 const char *sFileSign = "KolibriTable File\n";
 const char sFilename[] = "Filename:";
 ,22 → 1043,6
         }
 }
-void EventLoadFile()
-{
-        stop_edit();
-        int r = LoadFile(fname);
-        char *result;
-        if (r > 0) {
-                calculate_values();
-                sel_moved = 0;
-                draw_grid();
-                result = (char*)msg_load;
-        }
-        else if (r == -1) result = (char*)er_file_not_found;
-        else if (r == -2) result = (char*)er_format;
-        kos_AppRun("/sys/@notify", result);
-}
 void process_button()
 {
         Dword button;
 ,7 → 1063,18
                 break;
         case LOAD_BUTTON:
-                EventLoadFile();
+                stop_edit();
+                int r = LoadFile(fname);
+                char *result;
+                if (r > 0) {
+                        calculate_values();
+                        sel_moved = 0;
+                        draw_grid();
+                        result = (char*)msg_load;
+                }
+                else if (r == -1) result = (char*)er_file_not_found;
+                else if (r == -2) result = (char*)er_format;
+                kos_AppRun("/sys/@notify", result);
                 break;
         }
         if (button >= COL_HEAD_BUTTON    &&    button < ROW_HEAD_BUTTON)
 ,11 → 1102,6
         kos_InitHeap();
         load_edit_box();
         init();
-        if (params[0]) {
-                strcpy(fname, params);
-                file_box.size = file_box.pos = strlen(fname);
-                EventLoadFile();
-        }
         kos_SetMaskForEvents(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
         for (;;)
         {

 /programs/other/table/kosSyst.cpp
 ,7 → 9,6
 #ifdef AUTOBUILD
 char kosExePath[1024];
 char exeStack[16384];
-extern char params[1024];
 // must be alphabetically first in the image
 #pragma data_seg(".1seg")
 extern "C" struct
 ,7 → 28,7
 ,      // filled by doexe2.asm
 ,      // filled by doexe2.asm
         exeStack + sizeof(exeStack),
-        params,
+        NULL,
         kosExePath
 };
 #pragma data_seg()

 /programs/other/table/calc.cpp
 ,31 → 588,6
         return r;
 }
-char GetCsvSeparator(char *fname)
-{
-        char buffer[512];
-        kosFileInfo fileInfo;
-        rtlDebugOutString("hi");
-        rtlDebugOutString(fname);
-        strcpy(fileInfo.fileURL, fname);
-        fileInfo.OffsetLow = 0;
-        fileInfo.OffsetHigh = 0;
-        fileInfo.dataCount = 512;
-        fileInfo.rwMode = 0;
-        fileInfo.bufferPtr = (Byte *)buffer;
-        if (kos_FileSystemAccess(&fileInfo) == 0) {
-                int separ_coma = chrnum(buffer, ',');
-                int separ_semicolon = chrnum(buffer, ';');
-                //kos_DebugValue(",", separ_coma);
-                //kos_DebugValue(";", separ_semicolon);
-                if (separ_semicolon>separ_coma) return ';';
-        }
-        return ',';
-}
 int LoadCSV(char *fname)
 {
         // clear the table
 ,8 → 598,6
         fileInfo.OffsetLow = 0;
         fileInfo.OffsetHigh = 0;
-        char separator = GetCsvSeparator(fileInfo.fileURL);
         char *line;
         int col = 1, row = 1;
 ,7 → 626,7
                         {
                                 char c = line[i];
                                 if (!c)
-                                        c = separator;
+                                        c = ';';
                                 int yes_semicolon = 0;
                                 switch (inPar)
 ,7 → 638,7
                                                 }
                                                 else
                                                 {
-                                                        if (c == separator)
+                                                        if (c == ';')
                                                                 yes_semicolon = 1;
                                                 }
                                                 break;
 ,7 → 652,7
                                                 }
                                                 /*else
                                                 {
-                                                        if (c == separator)
+                                                        if (c == ';')
                                                                 yes_semicolon = 1;
                                                 }*/
 ,7 → 660,7
                                 }
                                 if (yes_semicolon)
                                 {
-                                        // èòàê, line[i] = separator
+                                        // èòàê, line[i] = ';'
                                         int tmp = line[start] == '"' ? 1 : 0;
                                         int sz = i - start - tmp * 2;
                                         if (sz > 0)

 /programs/other/table/build.bat
 ,8 → 2,8
 @cl /c /O2 /nologo /GS- /GR- /fp:fast *.cpp
 @link /nologo /manifest:no /entry:crtStartUp /subsystem:native /base:0 /fixed /align:16 /nodefaultlib hello.obj *.obj
-@del table
-@pe2kos hello.exe table
+@del *.kex
+@pe2kos hello.exe hello.kex
 @del hello.exe
 @del *.obj
 pause

 /programs/other/table/parser.cpp
 ,15 → 928,3
         return 0;       // search command/function name
 }
-unsigned int chrnum(char* text, char symbol)
-{
-        int num = 0;
-        int i = 0;
-        while(text[i])
-        {
-                if (text[i] == symbol) num++;
-                i++;
-        }
-        return num;
-}

 /programs/other/table/parser.h
 ,8 → 57,6
 bool strcmp(char *s1, char *s2);
 bool strncmp(char *s1, char *s2, int n);
-unsigned int chrnum(char* text, char symbol);
 extern double epsilon;

/programs/other/graph/hello.cpp
1,5 → 1,6
#include "func.h"
#include "parser.h"
#include "kolibri.h"
#include "use_library.h"

const char header[] = "Graph";

 /programs/other/graph/hello.dsp
 ,6 → 76,10
 # End Source File
 # Begin Source File
+SOURCE=.\kolibri.cpp
+# End Source File
+# Begin Source File
 SOURCE=.\KosFile.cpp
 # End Source File
 # Begin Source File
 ,6 → 112,10
 # End Source File
 # Begin Source File
+SOURCE=.\kolibri.h
+# End Source File
+# Begin Source File
 SOURCE=.\KosFile.h
 # End Source File
 # Begin Source File

/programs/other/graph/kolibri.cpp
0,0 → 1,0

/programs/other/graph/kolibri.h
--- data/common/settings/assoc.ini (revision 7516)
+++ data/common/settings/assoc.ini (revision 7515)
@@ -139,8 +139,6 @@

rtf=/sys/rtfread

-csv=/sys/table
-
grf=/sys/graph

com=$DosBox
@@ -178,3 +176,4 @@

vox=/kolibrios/3D/voxel_editor/VOXEL_EDITOR

+

/data/common/File Managers/kfar.ini
60,7 → 60,6
min=/kolibrios/emul/pokemini
nc=/kolibrios/utils/cnc_editor/cnc_editor
kf=/sys/KF_VIEW
csv=/sys/table

[Menu]
AsmMenu1=&Edit,/sys/TinyPad

 /data/common/File Managers/kfm.ini
 ,10 → 179,9
 rtf /sys/rtfread
 ds /sys/3d/view3ds
 asc /sys/3d/view3ds
+lif /kolibrios/demos/life2
 skn /sys/skincfg
 kf /sys/KF_VIEW
-csv /sys/table
-lif /kolibrios/demos/life2
 pdf /kolibrios/media/updf
 avi /kolibrios/media/fplay_run
 mpg /kolibrios/media/fplay_run

/data/common/File Managers/icons.ini
165,7 → 165,6
java=27
pas=27
fb2=29
csv=21

[icons32]
<dir>=45
220,4 → 219,3
rft=85
mobi=85
djvu=85
csv=28

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7516 → Rev 7515