addfiles.c 25.9 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
#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
63
#define CHECK_DATE	(1L<<15)
64
65

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

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

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

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

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

	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;
154
155
156
157
158
                case '@':   /* EXEC Directory for DOS/OS2/Win32, blank for Unix */
#ifndef __unix__
                    strcat(cmd,scfg.exec_dir);
#endif
                    break;
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
				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
186
	uint32_t	l;
187

188
	sprintf(str,"%sdsts.dab",scfg.ctrl_dir);
189
	if((file=nopen(str,O_RDWR|O_BINARY))==-1) {
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
		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)
{
207
208
209
210
211
212
	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];
213
	char *p;
214
	char ext[1024],tmpext[513];
215
216
	int i,file;
	long l;
217
	BOOL exist;
218
219
220
221
222
	FILE *stream;
	DIR*	dir;
	DIRENT*	dirent;

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

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

			if(mode&FILE_DATE) {		/* get the file date and put into desc */
rswindell's avatar
rswindell committed
263
				unixtodstr(&scfg,(time32_t)file_timestamp,f.desc);
264
265
266
267
				strcat(f.desc,"  "); 
			}

			if(mode&TODAYS_DATE) {		/* put today's date in desc */
268
				unixtodstr(&scfg,time32(NULL),f.desc);
269
270
271
272
273
				strcat(f.desc,"  "); 
			}

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

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


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

	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);
356
	do {
357
358
		f.misc=0;
		f.desc[0]=0;
359
		SAFECOPY(curline,nextline);
360
361
362
		nextline[0]=0;
		fgets(nextline,255,stream);
		truncsp(curline);
363
		if(curline[0]<=' ' || (mode&ASCII_ONLY && (uchar)curline[0]>=0x7e))
364
365
			continue;
		printf("%s\n",curline);
366
		SAFECOPY(fname,curline);
367

368
#if 0	/* Files without dots are valid on modern systems */
369
370
371
		p=strchr(fname,'.');
		if(!p || p==fname || p>fname+8)    /* no dot or invalid dot location */
			continue;
372
373
#endif
		p=strchr(fname,' ');
374
375
376
		if(p) *p=0;
		else				   /* no space after filename? */
			continue;
377
#if 0
378
		strupr(fname);
379
#endif
380
		SAFECOPY(fname,unpadfname(fname,tmp));
381

382
383
384
385
386
387
388
389
390
391
392
		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

393
394
395
396
397
		padfname(fname,f.name);
		if(strcspn(f.name,"\\/|<>+[]:=\";,")!=strlen(f.name))
			continue;

		for(i=0;i<12;i++)
398
			if(f.name[i]<' ' || (mode&ASCII_ONLY && (uchar)f.name[i]>0x7e))
399
400
401
402
				break;

		if(i<12)					/* Ctrl chars or EX-ASCII in filename? */
			continue;
rswindell's avatar
rswindell committed
403
		time_t file_timestamp = fdate(filepath);
404
405
406
407
		exist=findfile(&scfg,f.dir,f.name);
		if(exist) {
			if(mode&NO_UPDATE)
				continue;
408
409
410
411
412
413
			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;
414
			if(mode&ULDATE_ONLY) {
415
				f.dateuled=time32(NULL);
416
				update_uldate(&scfg, &f);
417
418
419
				continue; 
			} 
		}
420
421

		if(mode&FILE_DATE) {		/* get the file date and put into desc */
rswindell's avatar
rswindell committed
422
			unixtodstr(&scfg,(time32_t)file_timestamp,f.desc);
423
424
			strcat(f.desc,"  "); 
		}
425
426

		if(mode&TODAYS_DATE) {		/* put today's date in desc */
427
			l=time32(NULL);
428
			unixtodstr(&scfg,l,f.desc);
429
430
			strcat(f.desc,"  "); 
		}
431
432
433

		if(dskip && strlen(curline)>=dskip) p=curline+dskip;
		else {
434
435
436
			p = curline;
			FIND_WHITESPACE(p);
			SKIP_WHITESPACE(p); 
437
		}
438
439
440
		SAFECOPY(tmp,p);
		prep_desc(tmp);
		sprintf(f.desc+strlen(f.desc),"%.*s",(int)(LEN_FDESC-strlen(f.desc)),tmp);
441

442
		if(nextline[0]==' ' || strlen(p)>LEN_FDESC) {	/* ext desc */
443
444
445
			if(!(mode&NO_EXTEND)) {
				memset(ext,0,513);
				f.misc|=FM_EXTDESC;
446
447
				sprintf(ext,"%s\r\n",p); 
			}
448

449
			if(nextline[0]==' ') {
450
				SAFECOPY(str,nextline);				   /* tack on to end of desc */
451
				p=str+dskip;
452
				while(*p>0 && *p<=' ') p++;
453
454
455
456
457
458
				i=LEN_FDESC-strlen(f.desc);
				if(i>1) {
					p[i-1]=0;
					truncsp(p);
					if(p[0]) {
						strcat(f.desc," ");
459
460
461
462
						strcat(f.desc,p); 
					} 
				} 
			}
463
464

			while(!feof(stream) && !ferror(stream) && strlen(ext)<512) {
465
				if(nextline[0]!=' ')
466
467
468
469
470
471
					break;
				truncsp(nextline);
				printf("%s\n",nextline);
				if(!(mode&NO_EXTEND)) {
					f.misc|=FM_EXTDESC;
					p=nextline+dskip;
472
					while(*p==' ') p++;
473
					strcat(ext,p);
474
475
					strcat(ext,"\r\n"); 
				}
476
				nextline[0]=0;
477
478
479
				fgets(nextline,255,stream); 
			} 
		}
480
481
482
483
484


		if(sskip) l=atol(fname+sskip);
		else {
			l=flength(filepath);
485
			if(l<0L) {
486
				printf("%s not found.\n",filepath);
487
488
				continue; 
			} 
489
490
491
492
			if(l == 0L) {
				printf("%s is a zero-0length file.\n",filepath);
				continue; 
			} 
493
		}
494
495
496

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

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

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

}

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

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

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

	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)
619
				str[i]=ixbbuf[m]>' ' ? '.' : ' ';
620
621
622
623
624
625
626
627
628
629
			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);
630
			p=strchr(str,' ');
631
632
			if(p) *p=0;
			if(!stricmp(str,fname))
633
634
				found=1; 
		}
635
636
637
638
639
640
		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);
641
642
643
644
		if(!getfiledat(&scfg,&f)) {
			fprintf(stderr, "!ERROR reading index of directory %u\n", f.dir);
			continue;
		}
645
646
		if(f.opencount) {
			printf("currently OPEN by %u users\n",f.opencount);
647
648
			continue; 
		}
649
		removefiledat(&scfg,&f);
650
		if(remove(getfilepath(&scfg,&f,str)))
651
652
			printf("Error removing %s\n",str);
		removed++;
653
654
		printf("Removed from database\n"); 
	}
655
656
657

	if(mode&DEL_LIST) {
		printf("\nDeleting %s\n",listpath);
658
659
		remove(listpath); 
	}
660
661
}

662
char *usage="\nusage: addfiles code [.alt_path] [-opts] +list "
663
			 "[desc_off] [size_off]"
664
	"\n   or: addfiles code [.alt_path] [-opts] file "
665
666
		"\"description\"\n"
	"\navailable opts:"
667
668
669
670
671
672
673
674
675
676
	"\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"
rswindell's avatar
rswindell committed
677
	"\n      -p         compare file date with upload date for existing files"
678
679
680
681
682
683
	"\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)"
684
	"\n"
685
686
	"\nAuto-ADD:   use - in place of code for Auto-ADD of FILES.BBS"
	"\n            use -filename to Auto-ADD a different filename"
687
	"\n            use -l \"libname\" to only Auto-ADD files to a specific library"
688
689
690
691
692
693
694
695
	;

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

707
	sscanf("$Revision$", "%*s %s", revision);
708

709
	fprintf(stderr,"\nADDFILES v%s-%s (rev %s) - Adds Files to Synchronet "
710
711
712
		"Filebase\n"
		,ADDFILES_VER
		,PLATFORM_DESC
713
		,revision
714
715
716
		);

	if(argc<2) {
717
		puts(usage);
718
719
		return(1); 
	}
720
721
722
723
724
725
726
727

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

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

	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);
736
737
738
739
	if(!load_cfg(&scfg,NULL,TRUE,error)) {
		fprintf(stderr,"!ERROR loading configuration files: %s\n",error);
		exit(1);
	}
rswindell's avatar
rswindell committed
740
741
	SAFECOPY(scfg.temp_dir,"../temp");
	prep_dir(scfg.ctrl_dir, scfg.temp_dir, sizeof(scfg.temp_dir));
742

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

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

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

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

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

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

			if(mode&UL_STATS)
				updatestats(l);
970
971
972
			files++; 
		} 
	}
973
974
975

	if(mode&AUTO_ADD) {
		for(i=0;i<scfg.total_dirs;i++) {
976
977
			if(lib[0] && stricmp(scfg.lib[scfg.dir[i]->lib]->sname,lib))
				continue;
978
979
980
981
			if(scfg.dir[i]->misc&DIR_NOAUTO)
				continue;
			f.dir=i;
			if(mode&SEARCH_DIR) {
982
				addlist("",f,desc_offset,size_offset);
983
984
				continue; 
			}
985
			sprintf(str,"%s%s.lst",scfg.dir[f.dir]->path,scfg.dir[f.dir]->code);
986
			if(fexistcase(str) && flength(str)>0L) {
987
				printf("Auto-adding %s\n",str);
988
				addlist(str,f,desc_offset,size_offset);
989
990
				if(mode&SYNC_LIST)
					synclist(str,i);
991
992
				continue; 
			}
993
			sprintf(str,"%s%s",scfg.dir[f.dir]->path,auto_name);
994
			if(fexistcase(str) && flength(str)>0L) {
995
				printf("Auto-adding %s\n",str);
996
				addlist(str,f,desc_offset,size_offset);
997
998
				if(mode&SYNC_LIST)
					synclist(str,i);
999
1000
1001
1002
				continue; 
			} 
		} 
	}
1003
1004
1005

	else {
		if(!listgiven && !namegiven) {
1006
			sprintf(str,"%s%s.lst",scfg.dir[f.dir]->path, scfg.dir[f.dir]->code);
1007
			if(!fexistcase(str) || flength(str)<=0L)
1008
				sprintf(str,"%s%s",scfg.dir[f.dir]->path, auto_name);
1009
			addlist(str,f,desc_offset,size_offset);
1010
			if(mode&SYNC_LIST)
1011
1012
1013
				synclist(str,f.dir); 
		} 
	}
1014
1015
1016
1017
1018
1019
1020
1021

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