cpp/openttd-patchpack/source Changeset - r6240:4287f97ef59f

Changeset - r6240:4287f97ef59f

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 17 years ago 2007-03-06 22:37:04
rubidium@openttd.org

(svn r9043) -Fix [FS#652]: the personal (.openttd) directories were hidden in the load/save directory listings (stepancheg).

4 files changed with 20 insertions and 7 deletions:

src/fios.cpp

src/os2.cpp

src/unix.cpp

src/win32.cpp

0 comments (0 inline, 0 general)

src/fios.cpp

➞

Show inline comments

@@ @@ -33,6 +33,7 @@ static int _fios_count, _fios_alloc; @@
 /* OS-specific functions are taken from their respective files (win32/unix/os2 .c) */
 extern bool FiosIsRoot(const char *path);
 extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
 extern bool FiosIsHiddenFile(const struct dirent *ent);
 extern void FiosGetDrives(void);
 extern bool FiosGetDiskFreeSpace(const char *path, uint32 *tot);
@@ @@ -227,7 +228,8 @@ static FiosItem *FiosGetFileList(int mod @@
 			/* found file must be directory, but not '.' or '..' */
 			if (FiosIsValidFile(_fios_path, dirent, &sb) && (sb.st_mode & S_IFDIR) &&
 				strcmp(d_name, ".") != 0 && strcmp(d_name, "..") != 0) {
 					(!FiosIsHiddenFile(dirent) || strncasecmp(d_name, PERSONAL_DIR, strlen(d_name)) == 0) &&
 					strcmp(d_name, ".") != 0 && strcmp(d_name, "..") != 0) {
 				fios = FiosAlloc();
 				fios->type = FIOS_TYPE_DIR;
 				fios->mtime = 0;
@@ @@ -258,7 +260,7 @@ static FiosItem *FiosGetFileList(int mod @@
 			char *t;
 			ttd_strlcpy(d_name, FS2OTTD(dirent->d_name), sizeof(d_name));
 			if (!FiosIsValidFile(_fios_path, dirent, &sb) || !(sb.st_mode & S_IFREG)) continue;
+			if (!FiosIsValidFile(_fios_path, dirent, &sb) || !(sb.st_mode & S_IFREG) || FiosIsHiddenFile(dirent)) continue;
 			/* File has no extension, skip it */
 			if ((t = strrchr(d_name, '.')) == NULL) continue;

src/os2.cpp

➞

Show inline comments

@@ @@ -114,11 +114,15 @@ bool FiosIsValidFile(const char *path, c @@
 	char filename[MAX_PATH];
 	snprintf(filename, lengthof(filename), "%s" PATHSEP "%s", path, ent->d_name);
 	if (stat(filename, sb) != 0) return false;
 	return stat(filename, sb) == 0;
+}
 	return (ent->d_name[0] != '.'); // hidden file
 bool FiosIsHiddenFile(const struct dirent *ent)
+{
 	return ent->d_name[0] == '.';
+}
 static void ChangeWorkingDirectory(char *exe)
+{
 	char *s = strrchr(exe, PATHSEPCHAR);

src/unix.cpp

➞

Show inline comments

@@ @@ -92,9 +92,12 @@ bool FiosIsValidFile(const char *path, c @@
 #endif
 	snprintf(filename, lengthof(filename), "%s" PATHSEP "%s", path, ent->d_name);
 	if (stat(filename, sb) != 0) return false;
 	return stat(filename, sb) == 0;
+}
 	return (ent->d_name[0] != '.'); // hidden file
 bool FiosIsHiddenFile(const struct dirent *ent)
+{
 	return ent->d_name[0] == '.';
+}
 #if defined(__BEOS__) || defined(__linux__)

src/win32.cpp

➞

Show inline comments

@@ @@ -749,7 +749,6 @@ bool FiosIsValidFile(const char *path, c @@
 	// hectonanoseconds between Windows and POSIX epoch
 	static const int64 posix_epoch_hns = 0x019DB1DED53E8000LL;
 	const WIN32_FIND_DATAW *fd = &ent->dir->fd;
 	if (fd->dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) return false;
 	sb->st_size  = ((uint64) fd->nFileSizeHigh << 32) + fd->nFileSizeLow;
 	/* UTC FILETIME to seconds-since-1970 UTC
@@ @@ -763,6 +762,11 @@ bool FiosIsValidFile(const char *path, c @@
 	return true;
+}
 bool FiosIsHiddenFile(const struct dirent *ent)
+{
 	return (ent->dir->fd.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
+}
 bool FiosGetDiskFreeSpace(const char *path, uint32 *tot)
+{
 	UINT sem = SetErrorMode(SEM_FAILCRITICALERRORS);  // disable 'no-disk' message box

0 comments (0 inline, 0 general)