--- sbbs/src/xpdev/dirwrap.c	2018/04/24 16:41:24	1.1.1.1
+++ sbbs/src/xpdev/dirwrap.c	2018/04/24 16:45:33	1.1.1.2
@@ -2,13 +2,13 @@
 
 /* Directory-related system-call wrappers */
 
-/* $Id: dirwrap.c,v 1.1.1.1 2018/04/24 16:41:24 root Exp $ */
+/* $Id: dirwrap.c,v 1.1.1.2 2018/04/24 16:45:33 root Exp $ */
 
 /****************************************************************************
  * @format.tab-size 4		(Plain Text/Source Code File Header)			*
  * @format.use-tabs true	(see http://www.synchro.net/ptsc_hdr.html)		*
  *																			*
- * Copyright 2006 Rob Swindell - http://www.synchro.net/copyright.html		*
+ * Copyright 2011 Rob Swindell - http://www.synchro.net/copyright.html		*
  *																			*
  * This library is free software; you can redistribute it and/or			*
  * modify it under the terms of the GNU Lesser General Public License		*
@@ -175,7 +175,7 @@ int	DLLCALL	glob(const char *pattern, in
 		glob->gl_pathv=NULL;
 	}
 
-	if(_dos_findfirst((char*)pattern,_A_NORMAL,&ff)!=0)
+	if(_dos_findfirst((char*)pattern,(flags&GLOB_PERIOD) ? _A_HIDDEN : _A_NORMAL,&ff)!=0)
 		return(GLOB_NOMATCH);
 
 	do {
@@ -236,7 +236,7 @@ int	DLLCALL	glob(const char *pattern, in
 
 	ff_handle=_findfirst((char*)pattern,&ff);
 	while(ff_handle!=-1) {
-		if((flags&GLOB_PERIOD || ff.name[0]!='.') &&
+		if((flags&GLOB_PERIOD || (ff.name[0]!='.' && !(ff.attrib&_A_HIDDEN))) &&
 			(!(flags&GLOB_ONLYDIR) || ff.attrib&_A_SUBDIR)) {
 			if((new_pathv=(char**)realloc(glob->gl_pathv
 				,(glob->gl_pathc+1)*sizeof(char*)))==NULL) {
@@ -300,6 +300,36 @@ void DLLCALL globfree(glob_t* glob)
 
 #endif /* !defined(__unix__) */
 
+long DLLCALL getdirsize(const char* path, BOOL include_subdirs, BOOL subdir_only)
+{
+	char		match[MAX_PATH+1];
+	glob_t		g;
+	unsigned	gi;
+	long		count=0;
+
+	if(!isdir(path))
+		return -1;
+
+	SAFECOPY(match,path);
+	backslash(match);
+	strcat(match,ALLFILES);
+	glob(match,GLOB_MARK,NULL,&g);
+	if(include_subdirs && !subdir_only)
+		count=g.gl_pathc;
+	else
+		for(gi=0;gi<g.gl_pathc;gi++) {
+			if(*lastchar(g.gl_pathv[gi])=='/') {
+				if(!include_subdirs)
+					continue;
+			} else
+				if(subdir_only)
+					continue;
+			count++;
+		}
+	globfree(&g);
+	return(count);
+}
+
 /****************************************************************************/
 /* POSIX directory operations using Microsoft _findfirst/next API.			*/
 /****************************************************************************/
@@ -388,8 +418,9 @@ int DLLCALL setfdate(const char* filenam
 
 /****************************************************************************/
 /* Returns the length of the file in 'filename'                             */
+/* or -1 if the file doesn't exist											*/
 /****************************************************************************/
-long DLLCALL flength(const char *filename)
+off_t DLLCALL flength(const char *filename)
 {
 #if defined(__BORLANDC__) && !defined(__unix__)	/* stat() doesn't work right */
 
@@ -397,7 +428,7 @@ long DLLCALL flength(const char *filenam
 	struct _finddata_t f;
 
 	if(access((char*)filename,0)==-1)
-		return(-1L);
+		return(-1);
 
 	if((handle=_findfirst((char*)filename,&f))==-1)
 		return(-1);
@@ -411,10 +442,10 @@ long DLLCALL flength(const char *filenam
 	struct stat st;
 
 	if(access(filename,0)==-1)
-		return(-1L);
+		return(-1);
 
 	if(stat(filename, &st)!=0)
-		return(-1L);
+		return(-1);
 
 	return(st.st_size);
 
@@ -447,19 +478,23 @@ BOOL DLLCALL fexist(const char *filespec
 
 	long	handle;
 	struct _finddata_t f;
+	BOOL	found;
 
 	if(!strchr(filespec,'*') && !strchr(filespec,'?'))
 		return(fnameexist(filespec));
 
 	if((handle=_findfirst((char*)filespec,&f))==-1)
 		return(FALSE);
+	found=TRUE;
+	while(f.attrib&_A_SUBDIR)
+		if(_findnext(handle,&f)!=0) {
+			found=FALSE;
+			break;
+		}
 
  	_findclose(handle);
 
- 	if(f.attrib&_A_SUBDIR)
-		return(FALSE);
-
-	return(TRUE);
+	return(found);
 
 #else /* Unix or OS/2 */
 	
@@ -531,6 +566,9 @@ BOOL DLLCALL fexistcase(char *path)
 	int  i;
 	glob_t	glb;
 	
+	if(path[0]==0)		/* work around glibc bug 574274 */
+		return FALSE;
+
 	if(!strchr(path,'*') && !strchr(path,'?') && fnameexist(path))
 		return(TRUE);
 
@@ -634,7 +672,7 @@ int DLLCALL getfattr(const char* filenam
 }
 
 #ifdef __unix__
-int removecase(char *path)
+int removecase(const char *path)
 {
 	char inpath[MAX_PATH+1];
 	char fname[MAX_PATH*4+1];
@@ -663,7 +701,7 @@ int removecase(char *path)
 /****************************************************************************/
 /* Deletes all files in dir 'path' that match file spec 'spec'              */
 /****************************************************************************/
-ulong DLLCALL delfiles(char *inpath, char *spec)
+ulong DLLCALL delfiles(const char *inpath, const char *spec)
 {
 	char	path[MAX_PATH+1];
 	char	lastch;
@@ -939,10 +977,12 @@ BOOL DLLCALL isfullpath(const char* file
 /* Matches file name against filespec										*/
 /* Optionally not allowing * to match PATH_DELIM (for paths)				*/
 /****************************************************************************/
+
 BOOL DLLCALL wildmatch(const char *fname, const char *spec, BOOL path)
 {
 	char *specp;
 	char *fnamep;
+	char *wildend;
 
 	specp=(char *)spec;
 	fnamep=(char *)fname;
@@ -959,10 +999,21 @@ BOOL DLLCALL wildmatch(const char *fname
 			case '*':
 				while(*specp=='*')
 					specp++;
-				for(;*fnamep!=*specp && *fnamep;fnamep++) {
-					if(path && IS_PATH_DELIM(*fnamep))
-						return(FALSE);
+				if(path) {
+					for(wildend=fnamep; *wildend; wildend++) {
+						if(IS_PATH_DELIM(*wildend)) {
+							wildend--;
+							break;
+						}
+					}
+				}
+				else
+					wildend=strchr(fnamep, 0);
+				for(;wildend >= fnamep;wildend--) {
+					if(wildmatch(wildend, specp, path))
+						return(TRUE);
 				}
+				return(FALSE);
 			default:
 				if(*specp != *fnamep)
 					return(FALSE);
@@ -1003,7 +1054,7 @@ BOOL DLLCALL wildmatchi(const char *fnam
 /****************************************************************************/
 /* Creates all the necessary directories in the specified path				*/
 /****************************************************************************/
-int DLLCALL mkdirs(const char* path)
+int DLLCALL mkpath(const char* path)
 {
 	const char*	p=path;
 	const char*	tp;