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

/* $Id$ */

/****************************************************************************
 * @format.tab-size 4		(Plain Text/Source Code File Header)			*
 * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
 *																			*
9
 * Copyright Rob Swindell - http://www.synchro.net/copyright.html			*
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
 *																			*
 * 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										*
 *																			*
 * Anonymous FTP access to the most recent released source is available at	*
 * ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net	*
 *																			*
 * Anonymous CVS access to the development source and modification history	*
 * is available at cvs.synchro.net:/cvsroot/sbbs, example:					*
 * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login			*
 *     (just hit return, no password is necessary)							*
 * cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src		*
 *																			*
 * For Synchronet coding style and modification guidelines, see				*
 * http://www.synchro.net/source.html										*
 *																			*
 * You are encouraged to submit any modifications (preferably in Unix diff	*
 * format) via e-mail to mods@synchro.net									*
 *																			*
 * Note: If this box doesn't appear square, then you need to fix your tabs.	*
 ****************************************************************************/

#include "sbbs.h"

38
#define ADDFILES_VER "3.03"
39
40
41
42
43
44
45

scfg_t scfg;

int cur_altpath=0;

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

46
47
char lib[LEN_GSNAME+1];

48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
#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)

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

	va_start(argptr,fmat);
	chcount=vsprintf(sbuf,fmat,argptr);
	va_end(argptr);
76
77
	truncsp(sbuf);
	printf("%s\n",sbuf);
78
79
80
	return(chcount);
}

81
void prep_desc(char *str)
82
83
84
85
86
{
	char tmp[1024];
	int i,j;

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

102
103
104
/*****************************************************************************/
/* Returns command line generated from instr with %c replacments             */
/*****************************************************************************/
105
char *mycmdstr(char *instr, char *fpath, char *fspec, char *outstr)
106
107
108
109
{
    static char cmd[MAX_PATH+1];
    char str[MAX_PATH+1];
    int i,j,len;
rswindell's avatar
rswindell committed
110
111
112
#ifdef _WIN32
	char sfpath[MAX_PATH+1];
#endif
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

	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 */
					strcat(cmd,fpath);
					break;
				case '~':	/* DOS-compatible (8.3) filename */
#ifdef _WIN32
					SAFECOPY(sfpath,fpath);
					GetShortPathName(fpath,sfpath,sizeof(sfpath));
					strcat(cmd,sfpath);
#else
                    strcat(cmd,fpath);
#endif			
					break;
				case 'G':   /* Temp directory */
					strcat(cmd,scfg.temp_dir);
					break;
                case 'J':
                    strcat(cmd,scfg.data_dir);
                    break;
                case 'K':
                    strcat(cmd,scfg.ctrl_dir);
                    break;
				case 'N':   /* Node Directory (same as SBBSNODE environment var) */
					strcat(cmd,scfg.node_dir);
					break;
				case 'S':   /* File Spec */
					strcat(cmd,fspec);
					break;
                case 'Z':
                    strcat(cmd,scfg.text_dir);
                    break;
				case '!':   /* EXEC Directory */
					strcat(cmd,scfg.exec_dir);
					break;
153
154
155
156
157
                case '@':   /* EXEC Directory for DOS/OS2/Win32, blank for Unix */
#ifndef __unix__
                    strcat(cmd,scfg.exec_dir);
#endif
                    break;
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
				case '#':   /* Node number (same as SBBSNNUM environment var) */
					sprintf(str,"%d",scfg.node_num);
					strcat(cmd,str);
					break;
				case '%':   /* %% for percent sign */
					strcat(cmd,"%");
					break;
				default:    /* unknown specification */
					break; 
			}
			j=strlen(cmd); 
		}
		else
			cmd[j++]=instr[i]; 
	}
	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
185
	uint32_t	l;
186

187
	sprintf(str,"%sdsts.dab",scfg.ctrl_dir);
188
	if((file=nopen(str,O_RDWR|O_BINARY))==-1) {
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
		printf("ERR_OPEN %s\n",str);
		return; 
	}
	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);
}

void addlist(char *inpath, file_t f, uint dskip, uint sskip)
{
206
207
208
209
210
211
	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];
212
	char *p;
213
	char ext[1024],tmpext[513];
214
215
	int i,file;
	long l;
216
	BOOL exist;
217
218
219
220
221
222
223
224
225
226
	FILE *stream;
	DIR*	dir;
	DIRENT*	dirent;

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

		while(dir!=NULL && (dirent=readdir(dir))!=NULL) {
rswindell's avatar
rswindell committed
227
228
229
			sprintf(tmp,"%s%s"
				,cur_altpath ? scfg.altpath[cur_altpath-1] : scfg.dir[f.dir]->path
				,dirent->d_name);
230
231
232
233
234
235
236
			if(isdir(tmp))
				continue;
#ifdef _WIN32
			GetShortPathName(tmp, filepath, sizeof(filepath));
#else
			strcpy(filepath,tmp);
#endif
237
238
239
			f.misc=0;
			f.desc[0]=0;
			f.cdt=flength(filepath);
240
			padfname(getfname(filepath),f.name);
deuce's avatar
deuce committed
241
			printf("%s  %10"PRIu32"  %s\n"
242
				,f.name,f.cdt,unixtodstr(&scfg,(time32_t)fdate(filepath),str));
243
244
245
246
247
248
			exist=findfile(&scfg,f.dir,f.name);
			if(exist) {
				if(mode&NO_UPDATE)
					continue;
				getfileixb(&scfg,&f);
				if(mode&ULDATE_ONLY) {
249
					f.dateuled=time32(NULL);
250
251
252
253
254
255
					update_uldate(&scfg, &f);
					continue; 
				} 
			}

			if(mode&FILE_DATE) {		/* get the file date and put into desc */
256
				unixtodstr(&scfg,(time32_t)fdate(filepath),f.desc);
257
258
259
260
				strcat(f.desc,"  "); 
			}

			if(mode&TODAYS_DATE) {		/* put today's date in desc */
261
				unixtodstr(&scfg,time32(NULL),f.desc);
262
263
264
265
266
				strcat(f.desc,"  "); 
			}

			if(mode&FILE_ID) {
				for(i=0;i<scfg.total_fextrs;i++)
rswindell's avatar
rswindell committed
267
					if(!stricmp(scfg.fextr[i]->ext,f.name+9) && chk_ar(&scfg,scfg.fextr[i]->ar,/* user: */NULL, /* client: */NULL))
268
269
270
						break;
				if(i<scfg.total_fextrs) {
					sprintf(tmp,"%sFILE_ID.DIZ",scfg.temp_dir);
271
					removecase(tmp);
272
					system(mycmdstr(scfg.fextr[i]->cmd,filepath,"FILE_ID.DIZ",NULL));
273
274
					if(!fexistcase(tmp)) {
						sprintf(tmp,"%sDESC.SDI",scfg.temp_dir);
275
						removecase(tmp);
276
						system(mycmdstr(scfg.fextr[i]->cmd,filepath,"DESC.SDI",NULL)); 
277
278
						fexistcase(tmp);
					}
279
					if((file=nopen(tmp,O_RDONLY|O_BINARY))!=-1) {
280
281
282
						memset(ext,0,513);
						read(file,ext,512);
						for(i=512;i;i--)
283
							if(ext[i-1]>' ' || ext[i-1]<0)
284
285
286
								break;
						ext[i]=0;
						if(mode&ASCII_ONLY)
287
							strip_exascii(ext, ext);
288
289
						if(!(mode&KEEP_DESC)) {
							sprintf(tmpext,"%.256s",ext);
290
							prep_desc(tmpext);
291
							for(i=0;tmpext[i];i++)
292
								if(isalpha((uchar)tmpext[i]))
293
294
									break;
							sprintf(f.desc,"%.*s",LEN_FDESC,tmpext+i);
295
							for(i=0;(f.desc[i]>=' ' || f.desc[i]<0) && i<LEN_FDESC;i++)
296
297
298
299
300
301
302
303
								;
							f.desc[i]=0; }
						close(file);
						f.misc|=FM_EXTDESC; 
					} 
				} 
			}

304
			f.dateuled=time32(NULL);
305
			f.altpath=cur_altpath;
306
			prep_desc(f.desc);
307
			if(mode&ASCII_ONLY)
308
				strip_exascii(f.desc, f.desc);
309
310
311
			if(exist) {
				putfiledat(&scfg,&f);
				if(!(mode&NO_NEWDATE))
312
313
					update_uldate(&scfg, &f); 
			}
314
315
316
317
			else
				addfiledat(&scfg,&f);
			if(f.misc&FM_EXTDESC) {
				truncsp(ext);
318
319
				putextdesc(&scfg,f.dir,f.datoffset,ext); 
			}
320
321
322
323
324
325
326
327
328
329
330
			if(mode&UL_STATS)
				updatestats(f.cdt);
			files++; 
		}
		if(dir!=NULL)
			closedir(dir);
		return; 
	}


	strcpy(listpath,inpath);
331
	fexistcase(listpath);
332
	if((stream=fopen(listpath,"r"))==NULL) {
333
334
		fprintf(stderr,"Error %d (%s) opening %s\n"
			,errno,strerror(errno),listpath);
335
336
		sprintf(listpath,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
				: scfg.dir[f.dir]->path,inpath);
337
		fexistcase(listpath);
338
		if((stream=fopen(listpath,"r"))==NULL) {
339
340
			printf("Can't open: %s\n"
				   "        or: %s\n",inpath,listpath);
341
342
343
			return; 
		} 
	}
344
345
346
347
348

	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);
349
	do {
350
351
352
353
354
355
		f.misc=0;
		f.desc[0]=0;
		strcpy(curline,nextline);
		nextline[0]=0;
		fgets(nextline,255,stream);
		truncsp(curline);
356
		if(curline[0]<=' ' || (mode&ASCII_ONLY && (uchar)curline[0]>=0x7e))
357
358
359
360
			continue;
		printf("%s\n",curline);
		strcpy(fname,curline);

361
#if 0	/* Files without dots are valid on modern systems */
362
363
364
		p=strchr(fname,'.');
		if(!p || p==fname || p>fname+8)    /* no dot or invalid dot location */
			continue;
365
366
#endif
		p=strchr(fname,' ');
367
368
369
		if(p) *p=0;
		else				   /* no space after filename? */
			continue;
370
#if 0
371
		strupr(fname);
372
#endif
373
374
		strcpy(fname,unpadfname(fname,tmp));

375
376
377
378
379
380
381
382
383
384
385
		sprintf(filepath,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
			: scfg.dir[f.dir]->path,fname);

#ifdef _WIN32
		{
			char shortpath[MAX_PATH+1];
			GetShortPathName(filepath, shortpath, sizeof(shortpath));
			SAFECOPY(fname, getfname(shortpath));
		}
#endif

386
387
388
389
390
		padfname(fname,f.name);
		if(strcspn(f.name,"\\/|<>+[]:=\";,")!=strlen(f.name))
			continue;

		for(i=0;i<12;i++)
391
			if(f.name[i]<' ' || (mode&ASCII_ONLY && (uchar)f.name[i]>0x7e))
392
393
394
395
396
397
398
399
400
401
				break;

		if(i<12)					/* Ctrl chars or EX-ASCII in filename? */
			continue;
		exist=findfile(&scfg,f.dir,f.name);
		if(exist) {
			if(mode&NO_UPDATE)
				continue;
			getfileixb(&scfg,&f);
			if(mode&ULDATE_ONLY) {
402
				f.dateuled=time32(NULL);
403
				update_uldate(&scfg, &f);
404
405
406
				continue; 
			} 
		}
407
408

		if(mode&FILE_DATE) {		/* get the file date and put into desc */
409
			l=(time32_t)fdate(filepath);
410
			unixtodstr(&scfg,l,f.desc);
411
412
			strcat(f.desc,"  "); 
		}
413
414

		if(mode&TODAYS_DATE) {		/* put today's date in desc */
415
			l=time32(NULL);
416
			unixtodstr(&scfg,l,f.desc);
417
418
			strcat(f.desc,"  "); 
		}
419
420
421
422

		if(dskip && strlen(curline)>=dskip) p=curline+dskip;
		else {
			p++;
423
			while(*p==' ') p++; 
424
		}
425
426
427
		SAFECOPY(tmp,p);
		prep_desc(tmp);
		sprintf(f.desc+strlen(f.desc),"%.*s",(int)(LEN_FDESC-strlen(f.desc)),tmp);
428

429
		if(nextline[0]==' ' || strlen(p)>LEN_FDESC) {	/* ext desc */
430
431
432
			if(!(mode&NO_EXTEND)) {
				memset(ext,0,513);
				f.misc|=FM_EXTDESC;
433
434
				sprintf(ext,"%s\r\n",p); 
			}
435

436
			if(nextline[0]==' ') {
437
438
				strcpy(str,nextline);				   /* tack on to end of desc */
				p=str+dskip;
439
				while(*p>0 && *p<=' ') p++;
440
441
442
443
444
445
				i=LEN_FDESC-strlen(f.desc);
				if(i>1) {
					p[i-1]=0;
					truncsp(p);
					if(p[0]) {
						strcat(f.desc," ");
446
447
448
449
						strcat(f.desc,p); 
					} 
				} 
			}
450
451

			while(!feof(stream) && !ferror(stream) && strlen(ext)<512) {
452
				if(nextline[0]!=' ')
453
454
455
456
457
458
					break;
				truncsp(nextline);
				printf("%s\n",nextline);
				if(!(mode&NO_EXTEND)) {
					f.misc|=FM_EXTDESC;
					p=nextline+dskip;
459
					while(*p==' ') p++;
460
					strcat(ext,p);
461
462
					strcat(ext,"\r\n"); 
				}
463
				nextline[0]=0;
464
465
466
				fgets(nextline,255,stream); 
			} 
		}
467
468
469
470
471


		if(sskip) l=atol(fname+sskip);
		else {
			l=flength(filepath);
472
			if(l<0L) {
473
				printf("%s not found.\n",filepath);
474
475
				continue; 
			} 
476
477
478
479
			if(l == 0L) {
				printf("%s is a zero-0length file.\n",filepath);
				continue; 
			} 
480
		}
481
482
483

		if(mode&FILE_ID) {
			for(i=0;i<scfg.total_fextrs;i++)
rswindell's avatar
rswindell committed
484
				if(!stricmp(scfg.fextr[i]->ext,f.name+9) && chk_ar(&scfg,scfg.fextr[i]->ar,/* user: */NULL, /* client: */NULL))
485
486
487
					break;
			if(i<scfg.total_fextrs) {
				sprintf(tmp,"%sFILE_ID.DIZ",scfg.temp_dir);
488
				removecase(tmp);
489
				system(mycmdstr(scfg.fextr[i]->cmd,filepath,"FILE_ID.DIZ",NULL));
490
491
				if(!fexistcase(tmp)) {
					sprintf(tmp,"%sDESC.SDI",scfg.temp_dir);
492
					removecase(tmp);
493
					system(mycmdstr(scfg.fextr[i]->cmd,filepath,"DESC.SDI",NULL)); 
494
495
					fexistcase(tmp);
				}
496
				if((file=nopen(tmp,O_RDONLY|O_BINARY))!=-1) {
497
498
499
					memset(ext,0,513);
					read(file,ext,512);
					for(i=512;i;i--)
500
						if(ext[i-1]>' ' || ext[i-1]<0)
501
502
503
							break;
					ext[i]=0;
					if(mode&ASCII_ONLY)
504
						strip_exascii(ext, ext);
505
506
					if(!(mode&KEEP_DESC)) {
						sprintf(tmpext,"%.256s",ext);
507
						prep_desc(tmpext);
508
						for(i=0;tmpext[i];i++)
509
							if(isalpha((uchar)tmpext[i]))
510
511
								break;
						sprintf(f.desc,"%.*s",LEN_FDESC,tmpext+i);
512
						for(i=0;(f.desc[i]>=' ' || f.desc[i]<0) && i<LEN_FDESC;i++)
513
							;
514
515
						f.desc[i]=0; 
					}
516
517
518
519
520
521
522
					close(file);
					f.misc|=FM_EXTDESC; 
				} 
			} 
		}

		f.cdt=l;
523
		f.dateuled=time32(NULL);
524
		f.altpath=cur_altpath;
525
		prep_desc(f.desc);
526
		if(mode&ASCII_ONLY)
527
			strip_exascii(f.desc, f.desc);
528
529
530
		if(exist) {
			putfiledat(&scfg,&f);
			if(!(mode&NO_NEWDATE))
531
532
				update_uldate(&scfg, &f); 
		}
533
534
535
536
		else
			addfiledat(&scfg,&f);
		if(f.misc&FM_EXTDESC) {
			truncsp(ext);
537
538
			putextdesc(&scfg,f.dir,f.datoffset,ext); 
		}
539
540
541

		if(mode&UL_STATS)
			updatestats(l);
542
		files++; 
543
	} while(!feof(stream) && !ferror(stream));
544
545
546
	fclose(stream);
	if(mode&DEL_LIST && !(mode&SYNC_LIST)) {
		printf("\nDeleting %s\n",listpath);
547
548
		remove(listpath); 
	}
549
550
551
552
553

}

void synclist(char *inpath, int dirnum)
{
554
	char	str[1024];
555
556
557
	char	fname[MAX_PATH+1];
	char	listpath[MAX_PATH+1];
	uchar*	ixbbuf;
558
	char*	p;
559
560
561
562
	int		i,file,found;
	long	l,m,length;
	FILE*	stream;
	file_t	f;
563

564
	sprintf(str,"%s%s.ixb",scfg.dir[dirnum]->data_dir,scfg.dir[dirnum]->code);
565
	if((file=nopen(str,O_RDONLY|O_BINARY))==-1) {
566
		printf("ERR_OPEN %s\n",str);
567
568
		return; 
	}
569
570
571
	length=filelength(file);
	if(length%F_IXBSIZE) {
		close(file);
rswindell's avatar
rswindell committed
572
		printf("ERR_LEN (%ld) of %s\n",length,str);
573
574
		return; 
	}
deuce's avatar
deuce committed
575
	if((ixbbuf=(uchar *)malloc(length))==NULL) {
576
577
		close(file);
		printf("ERR_ALLOC %s\n",str);
578
579
		return; 
	}
580
581
	if(lread(file,ixbbuf,length)!=length) {
		close(file);
deuce's avatar
deuce committed
582
		free((char *)ixbbuf);
583
		printf("ERR_READ %s\n",str);
584
585
		return; 
	}
586
587
588
	close(file);

	strcpy(listpath,inpath);
589
	if((stream=fopen(listpath,"r"))==NULL) {
590
591
		sprintf(listpath,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
				: scfg.dir[dirnum]->path,inpath);
592
		if((stream=fopen(listpath,"r"))==NULL) {
593
594
			printf("Can't open: %s\n"
				   "        or: %s\n",inpath,listpath);
595
596
597
			return; 
		} 
	}
598
599
600
601
602
603
604
605

	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)
606
				str[i]=ixbbuf[m]>' ' ? '.' : ' ';
607
608
609
610
611
612
613
614
615
616
			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);
617
			p=strchr(str,' ');
618
619
			if(p) *p=0;
			if(!stricmp(str,fname))
620
621
				found=1; 
		}
622
623
624
625
626
627
628
629
630
		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);
		getfiledat(&scfg,&f);
		if(f.opencount) {
			printf("currently OPEN by %u users\n",f.opencount);
631
632
			continue; 
		}
633
		removefiledat(&scfg,&f);
634
		if(remove(getfilepath(&scfg,&f,str)))
635
636
			printf("Error removing %s\n",str);
		removed++;
637
638
		printf("Removed from database\n"); 
	}
639
640
641

	if(mode&DEL_LIST) {
		printf("\nDeleting %s\n",listpath);
642
643
		remove(listpath); 
	}
644
645
}

646
char *usage="\nusage: addfiles code [.alt_path] [-opts] +list "
647
			 "[desc_off] [size_off]"
648
	"\n   or: addfiles code [.alt_path] [-opts] file "
649
650
		"\"description\"\n"
	"\navailable opts:"
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
	"\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"
	"\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"
	"\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)"
667
	"\n"
668
669
	"\nAuto-ADD:   use - in place of code for Auto-ADD of FILES.BBS"
	"\n            use -filename to Auto-ADD a different filename"
670
	"\n            use -l \"libname\" to only Auto-ADD files to a specific library"
671
672
673
674
675
676
677
678
	;

/*********************/
/* Entry point (duh) */
/*********************/
int main(int argc, char **argv)
{
	char error[512];
679
	char revision[16];
680
681
	char str[MAX_PATH+1];
	char tmp[MAX_PATH+1];
682
683
	char *p;
	char exist,listgiven=0,namegiven=0,ext[513]
684
		,auto_name[MAX_PATH+1]="FILES.BBS";
685
	int i,j,file;
686
	uint desc_offset=0, size_offset=0;
687
688
689
	long l;
	file_t	f;

690
	sscanf("$Revision$", "%*s %s", revision);
691

692
	fprintf(stderr,"\nADDFILES v%s-%s (rev %s) - Adds Files to Synchronet "
693
694
695
		"Filebase\n"
		,ADDFILES_VER
		,PLATFORM_DESC
696
		,revision
697
698
699
		);

	if(argc<2) {
700
		puts(usage);
701
702
		return(1); 
	}
703
704
705
706
707
708
709
710

	p=getenv("SBBSCTRL");
	if(p==NULL) {
		printf("\nSBBSCTRL environment variable not set.\n");
		printf("\nExample: SET SBBSCTRL=/sbbs/ctrl\n");
		exit(1); 
	}

711
712
	memset(&scfg,0,sizeof(scfg));
	scfg.size=sizeof(scfg);
713
	SAFECOPY(scfg.ctrl_dir,p);
714
715
716
717
718

	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);
719
720
721
722
	if(!load_cfg(&scfg,NULL,TRUE,error)) {
		fprintf(stderr,"!ERROR loading configuration files: %s\n",error);
		exit(1);
	}
rswindell's avatar
rswindell committed
723
724
	SAFECOPY(scfg.temp_dir,"../temp");
	prep_dir(scfg.ctrl_dir, scfg.temp_dir, sizeof(scfg.temp_dir));
725

726
727
	if(argv[1][0]=='*' || argv[1][0]=='-') {
		if(argv[1][1]=='?') {
728
			puts(usage);
729
730
			exit(0);
		}
731
		if(argv[1][1])
732
			SAFECOPY(auto_name,argv[1]+1);
733
		mode|=AUTO_ADD;
734
735
		i=0; 
	} else {
736
		if(!isalnum((uchar)argv[1][0]) && argc==2) {
737
			puts(usage);
738
739
740
			return(1); 
		}

741
		for(i=0;i<scfg.total_dirs;i++)
742
			if(!stricmp(scfg.dir[i]->code,argv[1])) /* use matchmatchi() instead? */
743
744
745
746
				break;

		if(i>=scfg.total_dirs) {
			printf("Directory code '%s' not found.\n",argv[1]);
747
748
749
			exit(1); 
		} 
	}
750
751
752
753
754
755

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

	for(j=2;j<argc;j++) {
756
757
		if(argv[j][0]=='*')     /* set the uploader name (legacy) */
			SAFECOPY(f.uler,argv[j]+1);
758
759
760
761
		else 
			if(argv[j][0]=='-'
			|| argv[j][0]=='/'
			) {      /* options */
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
			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;
782
783
784
					case 'L':
						j++;
						if(argv[j]==NULL) {
785
							puts(usage);
786
787
788
789
790
							return(-1);
						}
						SAFECOPY(lib,argv[j]);
						i=strlen(argv[j])-1;
						break;
791
792
793
					case 'X':
						j++;
						if(argv[j]==NULL) {
794
							puts(usage);
795
796
797
798
799
							return(-1);
						}
						SAFECOPY(f.uler,argv[j]);
						i=strlen(argv[j])-1;
						break;
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
					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;
					case 'U':
						mode|=NO_NEWDATE;
						break;
					case 'F':
						mode|=FILE_DATE;
						break;
					case 'T':
						mode|=TODAYS_DATE;
						break;
					case 'S':
						mode|=SEARCH_DIR;
						break;
					default:
825
						puts(usage);
826
827
828
						return(1); 
			} 
		}
829
		else if(isdigit((uchar)argv[j][0])) {
830
831
832
833
834
835
			if(desc_offset==0)
				desc_offset=atoi(argv[j]);
			else
				size_offset=atoi(argv[j]);
			continue;
		}
836
837
		else if(argv[j][0]=='+') {      /* filelist - FILES.BBS */
			listgiven=1;
rswindell's avatar
rswindell committed
838
			if(argc > j+1
839
				&& isdigit((uchar)argv[j+1][0])) { /* skip x characters before description */
rswindell's avatar
rswindell committed
840
				if(argc > j+2
841
					&& isdigit((uchar)argv[j+2][0])) { /* skip x characters before size */
842
					addlist(argv[j]+1,f,atoi(argv[j+1]),atoi(argv[j+2]));
843
844
					j+=2; 
				}
845
846
				else {
					addlist(argv[j]+1,f,atoi(argv[j+1]),0);
847
848
849
					j++; 
				} 
			}
850
851
852
			else
				addlist(argv[j]+1,f,0,0);
			if(mode&SYNC_LIST)
853
854
				synclist(argv[j]+1,f.dir); 
		}
855
856
857
858
		else if(argv[j][0]=='.') {      /* alternate file path */
			cur_altpath=atoi(argv[j]+1);
			if(cur_altpath>scfg.altpaths) {
				printf("Invalid alternate path.\n");
859
860
861
				exit(1); 
			} 
		}
862
863
864
865
		else {
			namegiven=1;
			padfname(argv[j],f.name);
			f.desc[0]=0;
866
#if 0
867
			strupr(f.name);
868
#endif
869
870
			if(j+1==argc) {
				printf("%s no description given.\n",f.name);
871
872
				continue; 
			}
873
874
875
			sprintf(str,"%s%s",cur_altpath ? scfg.altpath[cur_altpath-1]
				: scfg.dir[f.dir]->path,argv[j]);
			if(mode&FILE_DATE)
876
				sprintf(f.desc,"%s  ",unixtodstr(&scfg,(time32_t)fdate(str),tmp));
877
			if(mode&TODAYS_DATE)
878
				sprintf(f.desc,"%s  ",unixtodstr(&scfg,time32(NULL),tmp));
rswindell's avatar
rswindell committed
879
			sprintf(tmp,"%.*s",(int)(LEN_FDESC-strlen(f.desc)),argv[++j]);
880
881
882
883
			strcpy(f.desc,tmp);
			l=flength(str);
			if(l==-1) {
				printf("%s not found.\n",str);
884
885
				continue; 
			}
886
887
888
889
890
891
			exist=findfile(&scfg,f.dir,f.name);
			if(exist) {
				if(mode&NO_UPDATE)
					continue;
				getfileixb(&scfg,&f);
				if(mode&ULDATE_ONLY) {
892
					f.dateuled=time32(NULL);
893
					update_uldate(&scfg, &f);
894
895
896
					continue; 
				} 
			}
897
			f.cdt=l;
898
			f.dateuled=time32(NULL);
899
			f.altpath=cur_altpath;
900
			prep_desc(f.desc);
901
			if(mode&ASCII_ONLY)
902
				strip_exascii(f.desc, f.desc);
deuce's avatar
deuce committed
903
			printf("%s %7"PRIu32" %s\n",f.name,f.cdt,f.desc);
904
905
			if(mode&FILE_ID) {
				for(i=0;i<scfg.total_fextrs;i++)
rswindell's avatar
rswindell committed
906
					if(!stricmp(scfg.fextr[i]->ext,f.name+9) && chk_ar(&scfg,scfg.fextr[i]->ar,/* user: */NULL, /* client: */NULL))
907
908
909
						break;
				if(i<scfg.total_fextrs) {
					sprintf(tmp,"%sFILE_ID.DIZ",scfg.temp_dir);
910
					removecase(tmp);
911
					system(mycmdstr(scfg.fextr[i]->cmd,str,"FILE_ID.DIZ",NULL));
912
					if(!fexistcase(tmp)) {
913
						sprintf(tmp,"%sDESC.SDI",scfg.temp_dir);
914
						removecase(tmp);
915
						system(mycmdstr(scfg.fextr[i]->cmd,str,"DESC.SDI",NULL)); 
916
917
						fexistcase(tmp);
					}
918
					if((file=nopen(tmp,O_RDONLY|O_BINARY))!=-1) {
919
920
921
922
						memset(ext,0,513);
						read(file,ext,512);
						if(!(mode&KEEP_DESC)) {
							sprintf(f.desc,"%.*s",LEN_FDESC,ext);
923
							for(i=0;(f.desc[i]>=' ' || f.desc[i]<0) && i<LEN_FDESC;i++)
924
								;
925
926
							f.desc[i]=0; 
						}
927
						close(file);
928
929
930
931
						f.misc|=FM_EXTDESC; 
					} 
				} 
			}
932
933
934
			if(exist) {
				putfiledat(&scfg,&f);
				if(!(mode&NO_NEWDATE))
935
936
					update_uldate(&scfg, &f); 
			}
937
938
939
940
941
942
943
944
			else
				addfiledat(&scfg,&f);

			if(f.misc&FM_EXTDESC)
				putextdesc(&scfg,f.dir,f.datoffset,ext);

			if(mode&UL_STATS)
				updatestats(l);
945
946
947
			files++; 
		} 
	}
948
949
950

	if(mode&AUTO_ADD) {
		for(i=0;i<scfg.total_dirs;i++) {
951
952
			if(lib[0] && stricmp(scfg.lib[scfg.dir[i]->lib]->sname,lib))
				continue;
953
954
955
956
			if(scfg.dir[i]->misc&DIR_NOAUTO)
				continue;
			f.dir=i;
			if(mode&SEARCH_DIR) {
957
				addlist("",f,desc_offset,size_offset);
958
959
				continue; 
			}
960
			sprintf(str,"%s%s.lst",scfg.dir[f.dir]->path,scfg.dir[f.dir]->code);
961
			if(fexistcase(str) && flength(str)>0L) {
962
				printf("Auto-adding %s\n",str);
963
				addlist(str,f,desc_offset,size_offset);
964
965
				if(mode&SYNC_LIST)
					synclist(str,i);
966
967
				continue; 
			}
968
			sprintf(str,"%s%s",scfg.dir[f.dir]->path,auto_name);
969
			if(fexistcase(str) && flength(str)>0L) {
970
				printf("Auto-adding %s\n",str);
971
				addlist(str,f,desc_offset,size_offset);
972
973
				if(mode&SYNC_LIST)
					synclist(str,i);
974
975
976
977
				continue; 
			} 
		} 
	}
978
979
980

	else {
		if(!listgiven && !namegiven) {
981
			sprintf(str,"%s%s.lst",scfg.dir[f.dir]->path, scfg.dir[f.dir]->code);
982
			if(!fexistcase(str) || flength(str)<=0L)
983
				sprintf(str,"%s%s",scfg.dir[f.dir]->path, auto_name);
984
			addlist(str,f,desc_offset,size_offset);
985
			if(mode&SYNC_LIST)
986
987
988
				synclist(str,f.dir); 
		} 
	}
989
990
991
992
993
994
995
996

	printf("\n%lu file(s) added.",files);
	if(removed)
		printf("\n%lu files(s) removed.",removed);
	printf("\n");
	return(0);
}