1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
|
#DPATCHLEVEL=1
--- ppmd-9.1.orig/PPMdType.h
+++ ppmd-9.1/PPMdType.h
@@ -10,9 +10,9 @@
#include <stdio.h>
-#define _WIN32_ENVIRONMENT_
+//#define _WIN32_ENVIRONMENT_
//#define _DOS32_ENVIRONMENT_
-//#define _POSIX_ENVIRONMENT_
+#define _POSIX_ENVIRONMENT_
//#define _UNKNOWN_ENVIRONMENT_
#if defined(_WIN32_ENVIRONMENT_)+defined(_DOS32_ENVIRONMENT_)+defined(_POSIX_ENVIRONMENT_)+defined(_UNKNOWN_ENVIRONMENT_) != 1
#error Only one environment must be defined
--- ppmd-9.1.orig/PPMd.cpp
+++ ppmd-9.1/PPMd.cpp
@@ -5,6 +5,9 @@
* Contents: main routine *
* Comments: system & compiler dependent file *
****************************************************************************/
+#include <string>
+#include <stdio.h>
+#include <stdarg.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
@@ -13,15 +16,29 @@
#define BACKSLASH '\\'
#define USAGE_STR "Usage: PPMd <e|d> [switches] <FileName[s] | Wildcard[s]>\n"
+
+using namespace std;
static const char* pFName;
static DWORD StartFilePosition;
static BOOL EncodeFlag;
+bool silent=false;
static clock_t StartClock;
static struct ARC_INFO { // FileLength & CRC? Hmm, maybe in another times...
DWORD signature,attrib;
WORD info,FNLen,time,date;
} _PACK_ATTR ai;
+extern "C" void printsilent(const char *fmt, ...)
+{
+ va_list argp;
+ if(silent == false)
+ {
+ va_start(argp, fmt);
+ vprintf(fmt, argp);
+ va_end(argp);
+ }
+}
+
#if defined(_WIN32_ENVIRONMENT_)
#include <conio.h>
@@ -99,7 +116,6 @@
};
#elif defined(_POSIX_ENVIRONMENT_)
-#define _POSIX_SOURCE
#undef BACKSLASH
#define BACKSLASH '/'
#include <sys/stat.h>
@@ -126,7 +142,9 @@
struct ENV_FIND_RESULT {
dirent de;
struct stat st;
+ char* fullpath;
const char* getFName() const { return de.d_name; }
+ const char* getFullPath() const {return fullpath;}
void copyDateTimeAttr() const {
ai.attrib=st.st_mode;
ai.time=st.st_mtime & 0xFFFF; ai.date=st.st_mtime >> 16;
@@ -140,16 +158,39 @@
ENV_FIND_RESULT getResult() {
ENV_FIND_RESULT Rslt;
Rslt.de=*de; Rslt.st=st;
+ string fullpath = getDir(string(pPattern))+"/"+de->d_name;
+ Rslt.fullpath= (char*) malloc(fullpath.size()+1);
+ strcpy(Rslt.fullpath,fullpath.c_str());
return Rslt;
}
+ string getName(string FullPath)
+ {
+ int i = FullPath.length()-2;
+ while(i > 0 && FullPath[i] != '/') i--;
+
+ if(i<=0 || i+1>= FullPath.length()-1) return FullPath;
+ else return FullPath.substr(i+1,FullPath.length()-1);
+ }
+ string getDir(string FullPath)
+ {
+ string name = getName(FullPath);
+ if(FullPath.size() == name.size())
+ return string(".");
+ else
+ return FullPath.substr(0,FullPath.size()-1-name.size());
+ }
+
BOOL isFileValid() {
- return (fnmatch(pPattern,de->d_name,FNM_NOESCAPE) == 0 &&
- stat(de->d_name,&st) == 0 && (st.st_mode & S_IRUSR) != 0 &&
- st.st_nlink == 1);
+ string name = getName(string(pPattern));
+
+ return (fnmatch(name.c_str(),de->d_name,FNM_NOESCAPE) == 0 &&
+ stat((getDir(string(pPattern)) + "/" + de->d_name).c_str(),&st) == 0 && (st.st_mode & S_IRUSR) != 0 &&
+ st.st_nlink == 1);
}
+
BOOL findFirst(const char* Pattern) {
pPattern=Pattern;
- return ((dir=opendir(".")) && (de=readdir(dir)) != NULL);
+ return ((dir=opendir(getDir(string(pPattern)).c_str())) && (de=readdir(dir)) != NULL);
}
BOOL findNext() { return ((de=readdir(dir)) != NULL); }
void findStop() { closedir(dir); }
@@ -191,7 +232,9 @@
"User break\n", "unknown command: %s\n", "unknown switch: %s\n",
"designed and written by Dmitry Shkarin <dmitry.shkarin@mtu-net.ru>\n"
USAGE_STR
- "Switches (for encoding only):\n"
+ "Switches \n"
+ "\t-s - be silent\n\n"
+ "(for encoding only):\n"
"\t-d - delete file[s] after processing, default: disabled\n"
"\t-fName - set output file name to Name\n"
"\t-mN - use N MB memory - [1,256], default: %d\n"
@@ -215,7 +258,7 @@
UINT n1=(8U*NEnc)/NDec;
UINT n2=(100U*(8U*NEnc-NDec*n1)+NDec/2U)/NDec;
if (n2 == 100) { n1++; n2=0; }
- int RunTime=((clock()-StartClock) << 10)/int(CLK_TCK);
+ int RunTime=((clock()-StartClock) << 10)/int(CLOCKS_PER_SEC);
UINT Speed=NDec/(RunTime+(RunTime == 0));
UINT UsedMemory=GetUsedMemory() >> 10;
UINT m1=UsedMemory >> 10;
@@ -223,8 +266,8 @@
if (m2 == 10) { m1++; m2=0; }
if ( !EncodeFlag ) SWAP(NDec,NEnc);
sprintf(WrkStr,"%14s:%7d >%7d, %1d.%02d bpb, used:%3d.%1dMB, speed: %d KB/sec",
- pFName,NDec,NEnc,n1,n2,m1,m2,Speed);
- printf("%-79.79s\r",WrkStr);
+ pFName,NDec,NEnc,n1,n2,m1,m2,Speed);
+ printsilent("%-79.79s\r",WrkStr);
}
static char* _STDCALL ChangeExtRare(const char* In,char* Out,const char* Ext)
{
@@ -246,7 +289,7 @@
FILE* fp=fopen(FName,"rb");
if ( !fp ) return TRUE;
fclose(fp);
- if ( YesToAll ) return RemoveFile(FName);
+ if ( YesToAll || silent == true) return RemoveFile(FName);
printf("%s already exists, overwrite?: <Y>es, <N>o, <A>ll, <Q>uit?",FName);
for ( ; ; )
switch ( toupper(EnvGetCh()) ) {
@@ -259,13 +302,13 @@
inline FILE* FOpen(const char* FName,const char* mode)
{
FILE* fp=fopen(FName,mode);
- if ( !fp ) { printf(MTxt[0],FName); exit(-1); }
+ if ( !fp ) { printsilent(MTxt[0],FName); exit(-1); }
setvbuf(fp,NULL,_IOFBF,64*1024); return fp;
}
inline void PrepareCoding(int SASize,FILE* fp)
{
if ( !StartSubAllocator(SASize) ) {
- printf(MTxt[2]); exit(-1);
+ printsilent(MTxt[2]); exit(-1);
}
StartClock=clock(); StartFilePosition=ftell(fp);
}
@@ -275,7 +318,8 @@
strcpy(WrkStr,ArcName);
if (!WrkStr[0] && !TestAccessRare(ChangeExtRare(efr.getFName(),WrkStr,"pmd")))
return;
- FILE* fpIn = FOpen(efr.getFName(),"rb"), * fpOut = FOpen(WrkStr,"a+b");
+ printsilent("opening in: -%s-, out: -%s-",efr.getFName(),WrkStr);
+ FILE* fpIn = FOpen(efr.getFullPath(),"rb"), * fpOut = FOpen(WrkStr,"a+b");
pFName=strrchr(efr.getFName(),BACKSLASH);
pFName=( pFName )?(pFName+1):(efr.getFName());
efr.copyDateTimeAttr();
@@ -285,7 +329,7 @@
PrepareCoding(SASize,fpOut); EncodeFile(fpOut,fpIn,MaxOrder,MRMethod);
putchar('\n');
if (ferror(fpOut) || ferror(fpIn)) {
- printf(MTxt[1],efr.getFName(),WrkStr);
+ printsilent(MTxt[1],efr.getFName(),WrkStr);
exit(-1);
}
fclose(fpIn); fclose(fpOut);
@@ -304,12 +348,12 @@
MaxOrder=(ai.info & 0x0F)+1; SASize=((ai.info >> 4) & 0xFF)+1;
DWORD Variant=(ai.info >> 12)+'A';
if (ai.signature != PPMdSignature || Variant != ::Variant) {
- printf(MTxt[0],WrkStr); exit(-1);
+ printsilent(MTxt[0],WrkStr); exit(-1);
}
PrepareCoding(SASize,fpIn); DecodeFile(fpOut,fpIn,MaxOrder,MRMethod);
putchar('\n');
if (ferror(fpOut) || ferror(fpIn) || feof(fpIn)) {
- printf(MTxt[1],WrkStr,WrkStr); exit(-1);
+ printsilent(MTxt[1],WrkStr,WrkStr); exit(-1);
}
fclose(fpOut); EnvSetDateTimeAttr(WrkStr);
return TRUE;
@@ -333,7 +377,8 @@
if ( fp ) {
if (!fread(&ai,sizeof(ai),1,fp) || ai.signature != PPMdSignature ||
(ai.info >> 12)+'A' != ::Variant) {
- printf(MTxt[0],ArcName); exit(-1);
+ printsilent(MTxt[0],ArcName);
+ exit(-1);
}
fclose(fp);
}
@@ -349,20 +394,24 @@
*PrevNode=next; delete this;
}
};
+
int main(int argc, char *argv[])
{
char ArcName[260];
BOOL DeleteFile=FALSE;
int i, MaxOrder=4, SASize=10;
MR_METHOD MRMethod=MRM_RESTART;
- printf("Fast PPMII compressor for textual data, variant %c, "__DATE__"\n",char(Variant));
- if (argc < 3) { printf(MTxt[6],SASize,MAX_O,MaxOrder); return -1; }
+ if (argc < 3) { printsilent(MTxt[6],SASize,MAX_O,MaxOrder); return -1; }
switch ( toupper(argv[1][0]) ) {
case 'E': EncodeFlag=TRUE; break;
case 'D': EncodeFlag=FALSE; break;
- default : printf(MTxt[4],argv[1]); return -1;
+ default : printsilent(MTxt[4],argv[1]); return -1;
}
- for (ArcName[0]=0,i=2;i < argc && (argv[i][0] == '-' || argv[i][0] == '/');i++)
+ for (ArcName[0]=0,i=2;i < argc && (argv[i][0] == '-'
+#ifndef _POSIX_ENVIRONMENT_
+|| argv[i][0] == '/'
+#endif
+);i++)
switch ( toupper(argv[i][1]) ) {
case 'D': DeleteFile=TRUE; break;
case 'F': TestArchive(ArcName,argv[i]+2); break;
@@ -370,8 +419,12 @@
case 'O': MaxOrder=CLAMP(atoi(argv[i]+2),2,MAX_O); break;
case 'R': MRMethod=MR_METHOD(CLAMP(atoi(argv[i]+2),0,2));
break;
- default : printf(MTxt[5],argv[i]); return -1;
+ case 'S': silent = true; break;
+ default : printsilent(MTxt[5],argv[i]); return -1;
}
+
+ printsilent("Fast PPMII compressor for textual data, variant %c, "__DATE__"\n",char(Variant));
+
FILE_LIST_NODE* pNode, * pFirstNode=NULL, ** ppNode=&pFirstNode;
for (ENV_FILE_FINDER eff;i < argc;i++) {
if ( eff.findFirst(argv[i]) )
@@ -379,7 +432,7 @@
if ( eff.isFileValid() ) {
pNode = new FILE_LIST_NODE(eff.getResult(),ppNode);
if ( !pNode ) {
- printf(MTxt[2]); return -1;
+ printsilent(MTxt[2]); return -1;
}
ppNode=&(pNode->next);
}
|
