addfiles.c 25.3 KB
Newer Older
1
2
3
4
5
6
/* Program to add files to a Synchronet file database */

/****************************************************************************
 * @format.tab-size 4		(Plain Text/Source Code File Header)			*
 * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
 *																			*
7
 * Copyright Rob Swindell - http://www.synchro.net/copyright.html			*
8
9
10
11
12
13
14
15
16
17
18
19
20
21
 *																			*
 * This program is free software; you can redistribute it and/or			*
 * modify it under the terms of the GNU General Public License				*
 * as published by the Free Software Foundation; either version 2			*
 * of the License, or (at your option) any later version.					*
 * See the GNU General Public License for more details: gpl.txt or			*
 * http://www.fsf.org/copyleft/gpl.html										*
 *																			*
 * For Synchronet coding style and modification guidelines, see				*
 * http://www.synchro.net/source.html										*
 *																			*
 * Note: If this box doesn't appear square, then you need to fix your tabs.	*
 ****************************************************************************/

22
23
24
25
26
27
28
#include "nopen.h"
#include "str_util.h"
#include "datewrap.h"
#include "date_str.h"
#include "userdat.h"
#include "filedat.h"
#include "load_cfg.h"
29
#include <stdbool.h>
30
#include <stdarg.h>
31

32
#define ADDFILES_VER "3.04"
33
34
35
36
37
38
39

scfg_t scfg;

int cur_altpath=0;

long files=0,removed=0,mode=0;

40
char lib[LEN_GSNAME+1];
41
const char* datefmt = NULL;
42

43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
#define DEL_LIST	(1L<<0)
#define NO_EXTEND	(1L<<1)
#define FILE_DATE	(1L<<2)
#define TODAYS_DATE (1L<<3)
#define FILE_ID 	(1L<<4)
#define NO_UPDATE	(1L<<5)
#define NO_NEWDATE	(1L<<6)
#define ASCII_ONLY	(1L<<7)
#define UL_STATS	(1L<<8)
#define ULDATE_ONLY (1L<<9)
#define KEEP_DESC	(1L<<10)
#define AUTO_ADD	(1L<<11)
#define SEARCH_DIR	(1L<<12)
#define SYNC_LIST	(1L<<13)
#define KEEP_SPACE	(1L<<14)
rswindell's avatar
rswindell committed
58
#define CHECK_DATE	(1L<<15)
59
60

/****************************************************************************/
61
/* This is needed by load_cfg.c												*/
62
/****************************************************************************/
63
int lprintf(int level, const char *fmat, ...)
64
65
{
	va_list argptr;
66
	char sbuf[512];
67
68
69
70
71
	int chcount;

	va_start(argptr,fmat);
	chcount=vsprintf(sbuf,fmat,argptr);
	va_end(argptr);
72
73
	truncsp(sbuf);
	printf("%s\n",sbuf);
74
75
76
	return(chcount);
}

77
void prep_desc(char *str)
78
79
80
81
82
{
	char tmp[1024];
	int i,j;

	for(i=j=0;str[i] && j < sizeof(tmp)-1;i++) {
83
		if(j && str[i]==' ' && tmp[j-1]==' ' && (mode&KEEP_SPACE))
84
			tmp[j++]=str[i];
85
		else if(j && str[i]<=' ' && str[i] > 0&& tmp[j-1]==' ')
86
			continue;
87
		else if(i && !IS_ALPHANUMERIC(str[i]) && str[i]==str[i-1])
88
			continue;
89
		else if(str[i]>=' ' || str[i]<0)
90
91
			tmp[j++]=str[i];
		else if(str[i]==TAB || (str[i]==CR && str[i+1]==LF))
92
			tmp[j++]=' ';
93
94
95
96
97
	}
	tmp[j]=0;
	strcpy(str,tmp);
}

98
99
100
/*****************************************************************************/
/* Returns command line generated from instr with %c replacments             */
/*****************************************************************************/
101
char *mycmdstr(const char *instr, const char *fpath, const char *fspec, char *outstr)
102
103
104
105
{
    static char cmd[MAX_PATH+1];
    char str[MAX_PATH+1];
    int i,j,len;
rswindell's avatar
rswindell committed
106
107
108
#ifdef _WIN32
	char sfpath[MAX_PATH+1];
#endif
109
110
111
112
113
114
115
116

	len=strlen(instr);
	for(i=j=0;i<len && j<128;i++) {
		if(instr[i]=='%') {
			i++;
			cmd[j]=0;
			switch(toupper(instr[i])) {
				case 'F':   /* File path */
117
					SAFECAT(cmd,fpath);
118
119
120
121
122
					break;
				case '~':	/* DOS-compatible (8.3) filename */
#ifdef _WIN32
					SAFECOPY(sfpath,fpath);
					GetShortPathName(fpath,sfpath,sizeof(sfpath));
123
					SAFECAT(cmd,sfpath);
124
#else
125
                    SAFECAT(cmd,fpath);
126
#endif
127
128
					break;
				case 'G':   /* Temp directory */
129
					SAFECAT(cmd,scfg.temp_dir);
130
131
					break;
                case 'J':
132
                    SAFECAT(cmd,scfg.data_dir);
133
134
                    break;
                case 'K':
135
                    SAFECAT(cmd,scfg.ctrl_dir);
136
137
                    break;
				case 'N':   /* Node Directory (same as SBBSNODE environment var) */
138
					SAFECAT(cmd,scfg.node_dir);
139
140
					break;
				case 'S':   /* File Spec */
141
					SAFECAT(cmd,fspec);
142
143
					break;
                case 'Z':
144
                    SAFECAT(cmd,scfg.text_dir);
145
146
                    break;
				case '!':   /* EXEC Directory */
147
					SAFECAT(cmd,scfg.exec_dir);
148
					break;
149
150
                case '@':   /* EXEC Directory for DOS/OS2/Win32, blank for Unix */
#ifndef __unix__
151
                    SAFECAT(cmd,scfg.exec_dir);
152
153
#endif
                    break;
154
155
				case '#':   /* Node number (same as SBBSNNUM environment var) */
					sprintf(str,"%d",scfg.node_num);
156
					SAFECAT(cmd,str);
157
158
					break;
				case '%':   /* %% for percent sign */
159
					SAFECAT(cmd,"%");
160
161
					break;
				default:    /* unknown specification */
162
					break;
163
			}
164
			j=strlen(cmd);
165
166
		}
		else
167
			cmd[j++]=instr[i];
168
169
170
171
172
173
174
175
176
177
178
179
180
	}
	cmd[j]=0;

	return(cmd);
}

/****************************************************************************/
/* Updates dstst.dab file													*/
/****************************************************************************/
void updatestats(ulong size)
{
    char	str[MAX_PATH+1];
    int		file;
deuce's avatar
64-bit    
deuce committed
181
	uint32_t	l;
182

183
	sprintf(str,"%sdsts.dab",scfg.ctrl_dir);
184
	if((file=nopen(str,O_RDWR|O_BINARY))==-1) {
185
		printf("ERR_OPEN %s\n",str);
186
		return;
187
188
189
190
191
192
193
194
195
196
197
198
199
	}
	lseek(file,20L,SEEK_SET);	/* Skip timestamp, logons and logons today */
	read(file,&l,4);			/* Uploads today		 */
	l++;
	lseek(file,-4L,SEEK_CUR);
	write(file,&l,4);
	read(file,&l,4);			/* Upload bytes today	 */
	l+=size;
	lseek(file,-4L,SEEK_CUR);
	write(file,&l,4);
	close(file);
}

200
bool get_file_diz(file_t* f, const char* filepath, char* ext)
201
202
203
{
	int i,file;
	char tmp[MAX_PATH+1];
204
	char tmpext[513];
205
206

	for(i=0;i<scfg.total_fextrs;i++)
207
208
		if(!stricmp(scfg.fextr[i]->ext,f->name+9)
			&& chk_ar(&scfg,scfg.fextr[i]->ar,/* user: */NULL, /* client: */NULL))
209
			break;
210
211
212
213
214
215
216
217
218
219
220
221
222
223
	// If we could not find an extractor which matches our requirements, use any
	if(i >= scfg.total_fextrs) {
		for(i=0;i<scfg.total_fextrs;i++)
			if(!stricmp(scfg.fextr[i]->ext,f->name+9))
				break;
	}
	if(i >= scfg.total_fextrs)
		return false;

	SAFEPRINTF(tmp,"%sFILE_ID.DIZ",scfg.temp_dir);
	removecase(tmp);
	system(mycmdstr(scfg.fextr[i]->cmd,filepath,"FILE_ID.DIZ",NULL));
	if(!fexistcase(tmp)) {
		SAFEPRINTF(tmp,"%sDESC.SDI",scfg.temp_dir);
224
		removecase(tmp);
225
226
		system(mycmdstr(scfg.fextr[i]->cmd,filepath,"DESC.SDI",NULL));
		fexistcase(tmp);
227
	}
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243

	if((file=nopen(tmp,O_RDONLY|O_BINARY)) == -1)
		return false;

	memset(ext,0,513);
	read(file,ext,512);
	for(i=512;i;i--)
		if(ext[i-1]>' ' || ext[i-1]<0)
			break;
	ext[i]=0;
	if(mode&ASCII_ONLY)
		strip_exascii(ext, ext);
	if(!(mode&KEEP_DESC)) {
		sprintf(tmpext,"%.256s",ext);
		prep_desc(tmpext);
		for(i=0;tmpext[i];i++)
244
			if(IS_ALPHA(tmpext[i]))
245
246
247
248
249
250
251
252
				break;
		sprintf(f->desc,"%.*s",LEN_FDESC,tmpext+i);
		for(i=0;(f->desc[i]>=' ' || f->desc[i]<0) && i<LEN_FDESC;i++)
			;
		f->desc[i]=0; }
	close(file);
	f->misc|=FM_EXTDESC;
	return true;
253
254
}

255
256
void addlist(char *inpath, file_t f, uint dskip, uint sskip)
{
257
258
259
260
261
262
	char str[MAX_PATH+1];
	char tmp[MAX_PATH+1];
	char fname[MAX_PATH+1];
	char listpath[MAX_PATH+1];
	char filepath[MAX_PATH+1];
	char curline[256],nextline[256];
263
	char *p;
264
265
	char ext[1024];
	int i;
266
	long l;
267
	BOOL exist;
268
269
270
271
272
	FILE *stream;
	DIR*	dir;
	DIRENT*	dirent;

	if(mode&SEARCH_DIR) {
273
		SAFECOPY(str,cur_altpath ? scfg.altpath[cur_altpath-1] : scfg.dir[f.dir]->path);
274
275
276
277
		printf("Searching %s\n\n",str);
		dir=opendir(str);

		while(dir!=NULL && (dirent=readdir(dir))!=NULL) {
rswindell's avatar
rswindell committed
278
279
280
			sprintf(tmp,"%s%s"
				,cur_altpath ? scfg.altpath[cur_altpath-1] : scfg.dir[f.dir]->path
				,dirent->d_name);
281
282
283
284
285
			if(isdir(tmp))
				continue;
#ifdef _WIN32
			GetShortPathName(tmp, filepath, sizeof(filepath));
#else
286
			SAFECOPY(filepath,tmp);
287
#endif
288
289
			f.misc=0;
			f.desc[0]=0;
290
			memset(ext, 0, sizeof(ext));
291
			f.cdt=flength(filepath);
rswindell's avatar
rswindell committed
292
			time_t file_timestamp = fdate(filepath);
293
			padfname(getfname(filepath),f.name);
deuce's avatar
deuce committed
294
			printf("%s  %10"PRIu32"  %s\n"
rswindell's avatar
rswindell committed
295
				,f.name,f.cdt,unixtodstr(&scfg,(time32_t)file_timestamp,str));
296
297
298
299
			exist=findfile(&scfg,f.dir,f.name);
			if(exist) {
				if(mode&NO_UPDATE)
					continue;
300
301
302
303
304
305
				if(!getfileixb(&scfg,&f)) {
					fprintf(stderr, "!ERROR reading index of directory %u\n", f.dir);
					continue;
				}
				if((mode&CHECK_DATE) && file_timestamp <= f.dateuled)
					continue;
306
				if(mode&ULDATE_ONLY) {
307
					f.dateuled=time32(NULL);
308
					update_uldate(&scfg, &f);
309
310
					continue;
				}
311
312
				if(f.misc & FM_EXTDESC)
					getextdesc(&scfg, f.dir, f.datoffset, ext);
313
314
315
			}

			if(mode&TODAYS_DATE) {		/* put today's date in desc */
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
				time_t now = time(NULL);
				if(datefmt) {
					struct tm tm = {0};
					localtime_r(&now, &tm);
					strftime(f.desc, sizeof(f.desc), datefmt, &tm);
				} else
					unixtodstr(&scfg, (time32_t)now, f.desc);
				SAFECAT(f.desc,"  ");
			}
			else if(mode&FILE_DATE) {		/* get the file date and put into desc */
				if(datefmt) {
					struct tm tm = {0};
					localtime_r(&file_timestamp, &tm);
					strftime(f.desc, sizeof(f.desc), datefmt, &tm);
				} else
					unixtodstr(&scfg,(time32_t)file_timestamp,f.desc);
				SAFECAT(f.desc,"  ");
333
334
			}

335
			if(mode&FILE_ID)
336
				get_file_diz(&f, filepath, ext);
337

338
			f.dateuled=time32(NULL);
339
			f.altpath=cur_altpath;
340
			prep_desc(f.desc);
341
			if(mode&ASCII_ONLY)
342
				strip_exascii(f.desc, f.desc);
343
344
345
			if(exist) {
				putfiledat(&scfg,&f);
				if(!(mode&NO_NEWDATE))
346
					update_uldate(&scfg, &f);
347
			}
348
349
350
351
			else
				addfiledat(&scfg,&f);
			if(f.misc&FM_EXTDESC) {
				truncsp(ext);
352
				putextdesc(&scfg,f.dir,f.datoffset,ext);
353
			}
354
355
			if(mode&UL_STATS)
				updatestats(f.cdt);
356
			files++;
357
358
359
		}
		if(dir!=NULL)
			closedir(dir);
360
		return;
361
362
363
	}


364
	SAFECOPY(listpath,inpath);
365
	fexistcase(listpath);
366
	if((stream=fopen(listpath,"r"))==NULL) {
367
368
		fprintf(stderr,"Error %d (%s) opening %s\n"
			,errno,strerror(errno),listpath);
369
370
		sprintf(listpath,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
				: scfg.dir[f.dir]->path,inpath);
371
		fexistcase(listpath);
372
		if((stream=fopen(listpath,"r"))==NULL) {
373
374
			printf("Can't open: %s\n"
				   "        or: %s\n",inpath,listpath);
375
376
			return;
		}
377
	}
378
379
380
381
382

	printf("Adding %s to %s %s\n\n"
		,listpath,scfg.lib[scfg.dir[f.dir]->lib]->sname,scfg.dir[f.dir]->sname);

	fgets(nextline,255,stream);
383
	do {
384
385
		f.misc=0;
		f.desc[0]=0;
386
		memset(ext, 0, sizeof(ext));
387
		SAFECOPY(curline,nextline);
388
389
390
		nextline[0]=0;
		fgets(nextline,255,stream);
		truncsp(curline);
391
		if(curline[0]<=' ' || (mode&ASCII_ONLY && (uchar)curline[0]>=0x7e))
392
393
			continue;
		printf("%s\n",curline);
394
		SAFECOPY(fname,curline);
395

396
#if 0	/* Files without dots are valid on modern systems */
397
398
399
		p=strchr(fname,'.');
		if(!p || p==fname || p>fname+8)    /* no dot or invalid dot location */
			continue;
400
401
#endif
		p=strchr(fname,' ');
402
		if(p) *p=0;
rswindell's avatar
rswindell committed
403
#if 0 // allow import of bare filename list
404
405
		else				   /* no space after filename? */
			continue;
rswindell's avatar
rswindell committed
406
#endif
407
		if(!IS_ALPHANUMERIC(*fname)) {	// filename doesn't begin with an alpha-numeric char?
408
409
			continue;
		}
rswindell's avatar
rswindell committed
410
		SAFEPRINTF2(filepath,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
411
412
413
414
415
416
417
418
			: scfg.dir[f.dir]->path,fname);

#ifdef _WIN32
		{
			char shortpath[MAX_PATH+1];
			GetShortPathName(filepath, shortpath, sizeof(shortpath));
			SAFECOPY(fname, getfname(shortpath));
		}
rswindell's avatar
rswindell committed
419
420
421
#else
		fexistcase(filepath);
		SAFECOPY(fname, getfname(filepath));
422
423
#endif

424
425
426
427
428
		padfname(fname,f.name);
		if(strcspn(f.name,"\\/|<>+[]:=\";,")!=strlen(f.name))
			continue;

		for(i=0;i<12;i++)
429
			if(f.name[i]<' ' || (mode&ASCII_ONLY && (uchar)f.name[i]>0x7e))
430
431
432
433
				break;

		if(i<12)					/* Ctrl chars or EX-ASCII in filename? */
			continue;
rswindell's avatar
rswindell committed
434
		time_t file_timestamp = fdate(filepath);
435
436
437
438
		exist=findfile(&scfg,f.dir,f.name);
		if(exist) {
			if(mode&NO_UPDATE)
				continue;
439
440
441
442
443
444
			if(!getfileixb(&scfg,&f)) {
				fprintf(stderr, "!ERROR reading index of directory %u\n", f.dir);
				continue;
			}
			if((mode&CHECK_DATE) && file_timestamp <= f.dateuled)
				continue;
445
			if(mode&ULDATE_ONLY) {
446
				f.dateuled=time32(NULL);
447
				update_uldate(&scfg, &f);
448
449
				continue;
			}
450
451
			if (f.misc & FM_EXTDESC)
				getextdesc(&scfg, f.dir, f.datoffset, ext);
452
		}
453
454

		if(mode&TODAYS_DATE) {		/* put today's date in desc */
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
			time_t now = time(NULL);
			if(datefmt) {
				struct tm tm = {0};
				localtime_r(&now, &tm);
				strftime(f.desc, sizeof(f.desc), datefmt, &tm);
			} else
				unixtodstr(&scfg, (time32_t)now, f.desc);
			SAFECAT(f.desc,"  ");
		}
		else if(mode&FILE_DATE) {		/* get the file date and put into desc */
			if(datefmt) {
				struct tm tm = {0};
				localtime_r(&file_timestamp, &tm);
				strftime(f.desc, sizeof(f.desc), datefmt, &tm);
			} else
				unixtodstr(&scfg,(time32_t)file_timestamp,f.desc);
			SAFECAT(f.desc,"  ");
472
		}
473
474
475

		if(dskip && strlen(curline)>=dskip) p=curline+dskip;
		else {
476
477
			p = curline;
			FIND_WHITESPACE(p);
478
			SKIP_WHITESPACE(p);
479
		}
480
481
482
		SAFECOPY(tmp,p);
		prep_desc(tmp);
		sprintf(f.desc+strlen(f.desc),"%.*s",(int)(LEN_FDESC-strlen(f.desc)),tmp);
483

484
		if(nextline[0]==' ' || strlen(p)>LEN_FDESC) {	/* ext desc */
485
			if(!(mode&NO_EXTEND)) {
486
				memset(ext, 0, sizeof(ext));
487
				f.misc|=FM_EXTDESC;
488
				sprintf(ext,"%s\r\n",p);
489
			}
490

491
			if(nextline[0]==' ') {
492
				SAFECOPY(str,nextline);				   /* tack on to end of desc */
493
				p=str+dskip;
494
				while(*p>0 && *p<=' ') p++;
495
496
497
498
499
				i=LEN_FDESC-strlen(f.desc);
				if(i>1) {
					p[i-1]=0;
					truncsp(p);
					if(p[0]) {
500
501
						SAFECAT(f.desc," ");
						SAFECAT(f.desc,p);
502
503
					}
				}
504
			}
505
506

			while(!feof(stream) && !ferror(stream) && strlen(ext)<512) {
507
				if(nextline[0]!=' ')
508
509
510
511
512
513
					break;
				truncsp(nextline);
				printf("%s\n",nextline);
				if(!(mode&NO_EXTEND)) {
					f.misc|=FM_EXTDESC;
					p=nextline+dskip;
514
					while(*p==' ') p++;
515
516
					SAFECAT(ext,p);
					SAFECAT(ext,"\r\n");
517
				}
518
				nextline[0]=0;
519
520
				fgets(nextline,255,stream);
			}
521
		}
522
523


524
525
526
527
		l=flength(filepath);
		if(l<0L) {
			printf("%s not found.\n",filepath);
			continue;
528
		}
529
530
531
532
533
		if(l == 0L) {
			printf("%s is a zero length file.\n",filepath);
			continue;
		}
		if(sskip) l=atol(fname+sskip);
534

535
		if(mode&FILE_ID)
536
			get_file_diz(&f, filepath, ext);
537
538

		f.cdt=l;
539
		f.dateuled=time32(NULL);
540
		f.altpath=cur_altpath;
541
		prep_desc(f.desc);
542
		if(mode&ASCII_ONLY)
543
			strip_exascii(f.desc, f.desc);
544
545
546
		if(exist) {
			putfiledat(&scfg,&f);
			if(!(mode&NO_NEWDATE))
547
				update_uldate(&scfg, &f);
548
		}
549
550
551
552
		else
			addfiledat(&scfg,&f);
		if(f.misc&FM_EXTDESC) {
			truncsp(ext);
553
			putextdesc(&scfg,f.dir,f.datoffset,ext);
554
		}
555
556
557

		if(mode&UL_STATS)
			updatestats(l);
558
		files++;
559
	} while(!feof(stream) && !ferror(stream));
560
561
562
	fclose(stream);
	if(mode&DEL_LIST && !(mode&SYNC_LIST)) {
		printf("\nDeleting %s\n",listpath);
563
		remove(listpath);
564
	}
565
566
567
568
569

}

void synclist(char *inpath, int dirnum)
{
570
	char	str[1024];
571
572
573
	char	fname[MAX_PATH+1];
	char	listpath[MAX_PATH+1];
	uchar*	ixbbuf;
574
	char*	p;
575
576
577
578
	int		i,file,found;
	long	l,m,length;
	FILE*	stream;
	file_t	f;
579

580
	sprintf(str,"%s%s.ixb",scfg.dir[dirnum]->data_dir,scfg.dir[dirnum]->code);
581
	if((file=nopen(str,O_RDONLY|O_BINARY))==-1) {
582
		printf("ERR_OPEN %s\n",str);
583
		return;
584
	}
585
586
587
	length=filelength(file);
	if(length%F_IXBSIZE) {
		close(file);
rswindell's avatar
rswindell committed
588
		printf("ERR_LEN (%ld) of %s\n",length,str);
589
		return;
590
	}
deuce's avatar
deuce committed
591
	if((ixbbuf=(uchar *)malloc(length))==NULL) {
592
593
		close(file);
		printf("ERR_ALLOC %s\n",str);
594
		return;
595
	}
596
	if(read(file,ixbbuf,length)!=length) {
597
		close(file);
deuce's avatar
deuce committed
598
		free((char *)ixbbuf);
599
		printf("ERR_READ %s\n",str);
600
		return;
601
	}
602
603
	close(file);

604
	SAFECOPY(listpath,inpath);
605
	if((stream=fopen(listpath,"r"))==NULL) {
606
607
		sprintf(listpath,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
				: scfg.dir[dirnum]->path,inpath);
608
		if((stream=fopen(listpath,"r"))==NULL) {
609
610
			printf("Can't open: %s\n"
				   "        or: %s\n",inpath,listpath);
611
612
			return;
		}
613
	}
614
615
616
617
618
619
620
621

	printf("\nSynchronizing %s with %s %s\n\n"
		,listpath,scfg.lib[scfg.dir[dirnum]->lib]->sname,scfg.dir[dirnum]->sname);

	for(l=0;l<length;l+=F_IXBSIZE) {
		m=l;
		for(i=0;i<12 && l<length;i++)
			if(i==8)
622
				str[i]=ixbbuf[m]>' ' ? '.' : ' ';
623
624
625
626
627
628
629
630
631
632
			else
				str[i]=ixbbuf[m++]; 	/* Turns FILENAMEEXT into FILENAME.EXT */
		str[i]=0;
		unpadfname(str,fname);
		rewind(stream);
		found=0;
		while(!found) {
			if(!fgets(str,1000,stream))
				break;
			truncsp(str);
633
			p=strchr(str,' ');
634
635
			if(p) *p=0;
			if(!stricmp(str,fname))
636
				found=1;
637
		}
638
639
640
641
642
643
		if(found)
			continue;
		padfname(fname,f.name);
		printf("%s not found in list - ",f.name);
		f.dir=dirnum;
		f.datoffset=ixbbuf[m]|((long)ixbbuf[m+1]<<8)|((long)ixbbuf[m+2]<<16);
644
645
646
647
		if(!getfiledat(&scfg,&f)) {
			fprintf(stderr, "!ERROR reading index of directory %u\n", f.dir);
			continue;
		}
648
649
		if(f.opencount) {
			printf("currently OPEN by %u users\n",f.opencount);
650
			continue;
651
		}
652
		removefiledat(&scfg,&f);
653
		if(remove(getfilepath(&scfg,&f,str)))
654
655
			printf("Error removing %s\n",str);
		removed++;
656
		printf("Removed from database\n");
657
	}
658
659
660

	if(mode&DEL_LIST) {
		printf("\nDeleting %s\n",listpath);
661
		remove(listpath);
662
	}
663
664
}

665
char *usage="\nusage: addfiles code [.alt_path] [-opts] +list "
666
			 "[desc_off] [size_off]"
667
	"\n   or: addfiles code [.alt_path] [-opts] file "
668
669
		"\"description\"\n"
	"\navailable opts:"
670
671
672
673
674
675
	"\n      -a         import ASCII only (no extended ASCII)"
	"\n      -b         synchronize database with file list (use with caution)"
	"\n      -c         do not remove extra spaces from file description"
	"\n      -d         delete list after import"
	"\n      -e         do not import extended descriptions"
	"\n      -f         include file date in descriptions"
676
	"\n      -F <fmt>   include file date in descriptions, using strftime format"
677
678
679
680
	"\n      -t         include today's date in descriptions"
	"\n      -i         include added files in upload statistics"
	"\n      -n         do not update information for existing files"
	"\n      -o         update upload date only for existing files"
rswindell's avatar
rswindell committed
681
	"\n      -p         compare file date with upload date for existing files"
682
683
684
685
686
687
	"\n      -u         do not update upload date for existing files"
	"\n      -z         check for and import FILE_ID.DIZ and DESC.SDI"
	"\n      -k         keep original short description (not DIZ)"
	"\n      -s         search directory for files (no file list)"
	"\n      -l <lib>   specify library (short name) to Auto-ADD"
	"\n      -x <name>  specify uploader's user name (may require quotes)"
688
	"\n"
689
690
	"\nAuto-ADD:   use - in place of code for Auto-ADD of FILES.BBS"
	"\n            use -filename to Auto-ADD a different filename"
691
	"\n            use -l \"libname\" to only Auto-ADD files to a specific library"
692
693
694
695
696
697
698
699
	;

/*********************/
/* Entry point (duh) */
/*********************/
int main(int argc, char **argv)
{
	char error[512];
700
	char revision[16];
701
702
	char str[MAX_PATH+1];
	char tmp[MAX_PATH+1];
703
704
	char *p;
	char exist,listgiven=0,namegiven=0,ext[513]
705
		,auto_name[MAX_PATH+1]="FILES.BBS";
706
	int i,j;
707
	uint desc_offset=0, size_offset=0;
708
709
710
	long l;
	file_t	f;

Rob Swindell's avatar
Rob Swindell committed
711
	sscanf("$Revision: 1.63 $", "%*s %s", revision);
712

713
	fprintf(stderr,"\nADDFILES v%s-%s (rev %s) - Adds Files to Synchronet "
714
715
716
		"Filebase\n"
		,ADDFILES_VER
		,PLATFORM_DESC
717
		,revision
718
719
720
		);

	if(argc<2) {
721
		puts(usage);
722
		return(1);
723
	}
724

725
	p = get_ctrl_dir(/* warn: */true);
726

727
728
	memset(&scfg,0,sizeof(scfg));
	scfg.size=sizeof(scfg);
729
	SAFECOPY(scfg.ctrl_dir,p);
730
731
732
733
734

	if(chdir(scfg.ctrl_dir)!=0)
		fprintf(stderr,"!ERROR changing directory to: %s", scfg.ctrl_dir);

	printf("\nLoading configuration files from %s\n",scfg.ctrl_dir);
735
736
737
738
	if(!load_cfg(&scfg,NULL,TRUE,error)) {
		fprintf(stderr,"!ERROR loading configuration files: %s\n",error);
		exit(1);
	}
rswindell's avatar
rswindell committed
739
740
	SAFECOPY(scfg.temp_dir,"../temp");
	prep_dir(scfg.ctrl_dir, scfg.temp_dir, sizeof(scfg.temp_dir));
741

742
743
	if(argv[1][0]=='*' || argv[1][0]=='-') {
		if(argv[1][1]=='?') {
744
			puts(usage);
745
746
			exit(0);
		}
747
		if(argv[1][1])
748
			SAFECOPY(auto_name,argv[1]+1);
749
		mode|=AUTO_ADD;
750
		i=0;
751
	} else {
752
		if(!IS_ALPHANUMERIC(argv[1][0]) && argc==2) {
753
			puts(usage);
754
			return(1);
755
756
		}

757
		for(i=0;i<scfg.total_dirs;i++)
758
			if(!stricmp(scfg.dir[i]->code,argv[1])) /* use matchmatchi() instead? */
759
760
761
762
				break;

		if(i>=scfg.total_dirs) {
			printf("Directory code '%s' not found.\n",argv[1]);
763
764
			exit(1);
		}
765
	}
766
767
768

	memset(&f,0,sizeof(file_t));
	f.dir=i;
769
	SAFECOPY(f.uler,"-> ADDFILES <-");
770
771

	for(j=2;j<argc;j++) {
772
773
		if(argv[j][0]=='*')     /* set the uploader name (legacy) */
			SAFECOPY(f.uler,argv[j]+1);
774
		else
775
776
777
			if(argv[j][0]=='-'
			|| argv[j][0]=='/'
			) {      /* options */
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
			for(i=1;argv[j][i];i++)
				switch(toupper(argv[j][i])) {
					case 'A':
						mode|=ASCII_ONLY;
						break;
					case 'B':
						mode|=(SYNC_LIST|NO_UPDATE);
						break;
					case 'C':
						mode|=KEEP_SPACE;
						break;
					case 'D':
						mode|=DEL_LIST;
						break;
					case 'E':
						mode|=NO_EXTEND;
						break;
					case 'I':
						mode|=UL_STATS;
						break;
798
799
800
					case 'L':
						j++;
						if(argv[j]==NULL) {
801
							puts(usage);
802
803
804
805
806
							return(-1);
						}
						SAFECOPY(lib,argv[j]);
						i=strlen(argv[j])-1;
						break;
807
808
809
					case 'X':
						j++;
						if(argv[j]==NULL) {
810
							puts(usage);
811
812
813
814
815
							return(-1);
						}
						SAFECOPY(f.uler,argv[j]);
						i=strlen(argv[j])-1;
						break;
816
817
818
819
820
821
822
823
824
825
826
827
					case 'Z':
						mode|=FILE_ID;
						break;
					case 'K':
						mode|=KEEP_DESC;	 /* Don't use DIZ for short desc */
						break;
					case 'N':
						mode|=NO_UPDATE;
						break;
					case 'O':
						mode|=ULDATE_ONLY;
						break;
rswindell's avatar
rswindell committed
828
829
830
					case 'P':
						mode|=CHECK_DATE;
						break;
831
832
833
834
835
					case 'U':
						mode|=NO_NEWDATE;
						break;
					case 'F':
						mode|=FILE_DATE;
836
837
838
839
840
841
842
843
844
845
						if(argv[j][i] == 'F') {
							j++;
							if(argv[j]==NULL) {
								puts(usage);
								return(-1);
							}
							datefmt = argv[j];
							i=strlen(argv[j]) - 1;
							break;
						}
846
847
848
849
850
851
852
853
						break;
					case 'T':
						mode|=TODAYS_DATE;
						break;
					case 'S':
						mode|=SEARCH_DIR;
						break;
					default:
854
						puts(usage);
855
856
						return(1);
			}
857
		}
858
		else if(IS_DIGIT(argv[j][0])) {
859
860
861
862
863
864
			if(desc_offset==0)
				desc_offset=atoi(argv[j]);
			else
				size_offset=atoi(argv[j]);
			continue;
		}
865
866
		else if(argv[j][0]=='+') {      /* filelist - FILES.BBS */
			listgiven=1;
rswindell's avatar
rswindell committed
867
			if(argc > j+1
868
				&& IS_DIGIT(argv[j+1][0])) { /* skip x characters before description */
rswindell's avatar
rswindell committed
869
				if(argc > j+2
870
					&& IS_DIGIT(argv[j+2][0])) { /* skip x characters before size */
871
					addlist(argv[j]+1,f,atoi(argv[j+1]),atoi(argv[j+2]));
872
					j+=2;
873
				}
874
875
				else {
					addlist(argv[j]+1,f,atoi(argv[j+1]),0);
876
877
					j++;
				}
878
			}
879
880
881
			else
				addlist(argv[j]+1,f,0,0);
			if(mode&SYNC_LIST)
882
				synclist(argv[j]+1,f.dir);
883
		}
884
885
886
887
		else if(argv[j][0]=='.') {      /* alternate file path */
			cur_altpath=atoi(argv[j]+1);
			if(cur_altpath>scfg.altpaths) {
				printf("Invalid alternate path.\n");
888
889
				exit(1);
			}
890
		}
891
892
893
894
		else {
			namegiven=1;
			padfname(argv[j],f.name);
			f.desc[0]=0;
895
			memset(ext, 0, sizeof(ext));
896
#if 0
897
			strupr(f.name);
898
#endif
899
900
			if(j+1==argc) {
				printf("%s no description given.\n",f.name);
901
				continue;
902
			}
903
904
			sprintf(str,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
				: scfg.dir[f.dir]->path,argv[j]);
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
			if(mode&TODAYS_DATE) {
				time_t now = time(NULL);
				if(datefmt) {
					struct tm tm = {0};
					localtime_r(&now, &tm);
					strftime(f.desc, sizeof(f.desc), datefmt, &tm);
				} else
					SAFECOPY(f.desc, unixtodstr(&scfg, (time32_t)now, tmp));
				SAFECAT(f.desc, "  ");
			}
			else if(mode&FILE_DATE) {
				time_t file_timestamp = fdate(str);
				if(datefmt) {
					struct tm tm = {0};
					localtime_r(&file_timestamp, &tm);
					strftime(f.desc, sizeof(f.desc), datefmt, &tm);
				} else
					SAFECOPY(f.desc, unixtodstr(&scfg,(time32_t)file_timestamp,tmp));
				SAFECAT(f.desc, "  ");
			}
			j++;
			SAFECAT(f.desc, argv[j]);
927
928
929
			l=flength(str);
			if(l==-1) {
				printf("%s not found.\n",str);
930
				continue;
931
			}
932
933
934
935
			exist=findfile(&scfg,f.dir,f.name);
			if(exist) {
				if(mode&NO_UPDATE)
					continue;
936
937
938
939
940
941
				if(!getfileixb(&scfg,&f)) {
					fprintf(stderr, "!ERROR reading index of directory %u\n", f.dir);
					continue;
				}
				if((mode&CHECK_DATE) && fdate(str) <= f.dateuled)
					continue;
942
				if(mode&ULDATE_ONLY) {
943
					f.dateuled=time32(NULL);
944
					update_uldate(&scfg, &f);
945
946
					continue;
				}
947
948
				if (f.misc & FM_EXTDESC)
					getextdesc(&scfg, f.dir, f.datoffset, ext);
949
			}
950
			f.cdt=l;
951
			f.dateuled=time32(NULL);
952
			f.altpath=cur_altpath;
953
			prep_desc(f.desc);
954
			if(mode&ASCII_ONLY)
955
				strip_exascii(f.desc, f.desc);
deuce's avatar
deuce committed
956
			printf("%s %7"PRIu32" %s\n",f.name,f.cdt,f.desc);
957
			if(mode&FILE_ID)
958
				get_file_diz(&f, str, ext);
959

960
961
962
			if(exist) {
				putfiledat(&scfg,&f);
				if(!(mod