diff palmtoss/FidoLib.cpp palmtoss_lnx/FidoLib.cpp
1,2c1,2
< #include "StdAfx.h"
< #include "fidolib.h"
---
> #include "stdafx.h"
> #include "FidoLib.h"
4,5c4,9
< #include "string.h"
< #include "iostream.h"
---
> #include <string.h>
> #include <iostream>
> 
> #ifdef __LINUX__
> #include "lnxadapt.h"
> #endif
diff palmtoss/FidoLib.h palmtoss_lnx/FidoLib.h
161c161
< };
\ No newline at end of file
---
> };
Only in palmtoss_lnx: Makefile
diff palmtoss/libPalmDB.cpp palmtoss_lnx/libPalmDB.cpp
1,5c1,5
< #include "StdAfx.h"
< #include "libpalmdb.h"
< #include "string.h"
< #include "time.h"
< #include "iostream.h"
---
> #include "stdafx.h"
> #include "libPalmDB.h"
> #include <string.h>
> #include <time.h>
> #include <iostream>
Only in palmtoss_lnx: lnxadapt.cpp
Only in palmtoss_lnx: lnxadapt.h
Only in palmtoss_lnx: palmtoss.conf
diff palmtoss/palmtoss.cpp palmtoss_lnx/palmtoss.cpp
8c8
< #include "libPalmDb.h"
---
> #include "libPalmDB.h"
11a12
> #include <string.h>
13c14,20
< char  config_ini[256],
---
> #ifdef __LINUX__
> #include <sys/types.h>
> #include <dirent.h>
> #include "lnxadapt.h"
> #endif
> 
> static char   config_ini[256],
17c24,25
<               buf[256];
---
>               buf[256],
>               pktfname[256];
19c27
< long buflen;
---
> static long buflen;
21,22c29,30
< char bbuf[65536];
< long bbuflen;
---
> static char bbuf[65536];
> static long bbuflen;
24,25c32,33
< char areaname[1024][128];
< long areacount=0;
---
> static char areaname[1024][128];
> static long areacount=0;
27c35
< long log_enabled,pkt_deleted,pkt_count,ipkt_count;
---
> static long log_enabled, pkt_deleted, pkt_count, ipkt_count;
29c37
< void load_area_list(char* cfg)
---
> static void load_area_list(char* cfg)
58a67,69
> #ifdef __LINUX__
> int main(int argc, char *argv[])
> #else
59a71
> #endif
65a78
> #ifndef __LINUX__
69d81
< 
87a100,102
> #else
>       strcpy(config_ini, CONFIG_FILE);
> #endif
90a106
> #ifndef __LINUX__
91a108,110
> #else
>               printf("Error. File:\n%s\nnot found.\n",config_ini);
> #endif
99c118
<               printf("Error. Can`t read inbound parametr in ini file.\n",config_ini);
---
>               printf("%s: Error. Can`t read inbound parametr in ini file.\n",config_ini);
110c129
<               printf("Error. Can`t read tossed_pdb parametr in ini file.\n",config_ini);
---
>               printf("%s: Error. Can`t read tossed_pdb parametr in ini file.\n",config_ini);
116c135
<               printf("The 'inbound' dir is absent.\n");
---
>               printf("%s: The 'inbound' dir is absent.\n", pkt_inbound);
126c145
<               printf("The 'tossed_pdb' dir is absent.\n");
---
>               printf("%s: The 'tossed_pdb' dir is absent.\n", pkt_pdb);
139c158
<               printf("Error. Can`t read log_file_name parametr in ini file. Loging disabled.\n",config_ini);
---
>               printf("%s: Error. Can`t read log_file_name parametr in ini file. Loging disabled.\n",config_ini);
143a163
> #ifndef __LINUX__
145a166,168
> #else
>               strcpy(logfilename, buf);
> #endif
159a183
> #ifndef __LINUX__
173a198,217
>                               strcpy(pktfname, finddata.cFileName);
> #else
>       DIR *dir;
>       dir = opendir(pkt_inbound);
>       if (dir)
>       {
>               sprintf(buf,"fido_%lx_base",time(NULL));
>               cpdb.CreatePDB(buf,0x0008,1,"fido","GaUs");
> 
>               do
>               {
>                       struct dirent *de;
>                       de = readdir(dir);
>                       if (de == NULL)
>                               break;
>                       if (IsPktName(de->d_name))
>                       {
>                               strcpy(pktfname, de->d_name);
> #endif
> 
176c220
<                                       sprintf(buf,"обрабатываем пакет %s",finddata.cFileName);
---
>                                       sprintf(buf,"обрабатываем пакет %s",pktfname);
180c224
<                               printf("tossing packet: %s\n",finddata.cFileName);
---
>                               printf("tossing packet: %s\n",pktfname);
184c228
<                               strcat(buf,finddata.cFileName);
---
>                               strcat(buf,pktfname);
216,221c260,265
<                       };
<                       if(pkt_deleted)
<                       {
<                               sprintf(bbuf,"удаляем пакет %s",finddata.cFileName);
<                               add_to_log(logfilename,bbuf);
<                               DeleteFile(buf);
---
>                               if(pkt_deleted)
>                               {
>                                       sprintf(bbuf,"удаляем пакет %s",pktfname);
>                                       add_to_log(logfilename,bbuf);
>                                       DeleteFile(buf);
>                               };
223a268
> #ifndef __LINUX__
224a270,272
> #else
>               while (true);
> #endif
228c276
<                       sprintf(buf,"всего обработано пакетов %d, сообщений: %d",ipkt_count,pkt_count);
---
>                       sprintf(buf,"всего обработано пакетов %ld, сообщений: %ld",ipkt_count,pkt_count);
235c283
<                       sprintf(buf,"fido%x.pdb",(UInt32)time(NULL));
---
>                       sprintf(buf,"fido%lx.pdb",(unsigned long)time(NULL));
Only in palmtoss: palmtoss.vcproj
diff palmtoss/stdafx.cpp palmtoss_lnx/stdafx.cpp
6a7,11
> #ifdef __LINUX__
> #include <sys/types.h>
> #include <dirent.h>
> #endif
> 
23c28
<       if(path[lndir-1]!='\\')
---
>       if(path[lndir-1]!=SLASH_CHR)
25c30
<               path[lndir]='\\';
---
>               path[lndir]=SLASH_CHR;
47a53
> #ifndef __LINUX__
56a63,71
> #else
>       DIR *d;
>       d = opendir(dir);
>       if (d) {
>               closedir(d);
>               return true;
>       }
>       return false;
> #endif
65a81
> #ifndef __LINUX__
69a86,92
> #else
>               char tb[128];
>               time_t t;
>               t = time(NULL);
>               strftime(tb, 128, "%e/%m/%y %T", localtime(&t));
>               fprintf(fl, "%s %s\n", tb, message);
> #endif
71c94,96
<       };
---
>       }
>       else
>               perror(lfn);
diff palmtoss/stdafx.h palmtoss_lnx/stdafx.h
9a10,12
> #include <time.h>
> 
> #ifndef __LINUX__
12c15,21
< #include <time.h>
---
> #endif
> 
> #ifndef __LINUX__
> #define SLASH_CHR '\\'
> #else
> #define SLASH_CHR '/'
> #endif
Only in palmtoss: toss_cfg.ini