Changeset 127

Timestamp:

05/11/07 20:18:29 (2 years ago)

Author:

takkaria

Message:

• Add directory-scanning code. (z-file.c)
  
• Make the SDL port use that code rather than fontlist.txt. (main-sdl.c, closes #95)
  
• Nuke fake usleep() function; POSIX specifies it, so we should be safe without it.
  

Files:

• trunk/configure.ac (modified) (2 diffs)
• trunk/src/Makefile.src (modified) (2 props)
• trunk/src/Makefile.std (modified) (2 props)
• trunk/src/autoconf.h.in (modified) (1 diff)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/h-config.h (modified) (4 diffs)
• trunk/src/main-sdl.c (modified) (3 diffs)
• trunk/src/util.c (modified) (1 diff)
• trunk/src/wizard1.c (modified) (1 diff)
• trunk/src/z-file.c (modified) (1 diff)
• trunk/src/z-file.h (modified) (1 diff)

trunk/configure.ac

@@ -172 +172 @@
-dnl AC_HEADER_STDBOOL -- not yet
-AC_HEADER_TIME
-
+dirent.h 
-
-dnl Check for types.
@@ -187 +187 @@
-AC_FUNC_STAT
-AC_FUNC_SELECT_ARGTYPES
-usleep 
+
-
-dnl XXX: Work around some autoconf bugs.

trunk/src/autoconf.h.in

@@ -6 +6 @@
-/* Define to 1 if you have the `can_change_color' function. */
-#undef HAVE_CAN_CHANGE_COLOR
+
+/* Define to 1 if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */

trunk/src/externs.h

@@ -791 +791 @@
-
-#ifdef SET_UID
-# ifndef HAVE_USLEEP
-/* util.c */
-extern int usleep(unsigned long usecs);
-# endif /* HAVE_USLEEP */
-extern void user_name(char *buf, size_t len, int id);
-#endif /* SET_UID */

trunk/src/h-config.h

@@ -67 +67 @@
- */
-#if !defined(MACH_O_CARBON) && !defined(WINDOWS) && \
-
-
+
-# define SET_UID
-#endif
@@ -105 +104 @@
-# define FILE_TYPE(X) (_ftype = (X))
-
-
-/* Mac OS X has usleep(). */
-#ifndef HAVE_USLEEP
-# define HAVE_USLEEP
-#endif
-
-#else
-
@@ -117 +110 @@
-#endif
-
+
-/*
-
-
-
-
+
- */
-defined(SET_UID) && !defined(HAVE_CONFIG_H
- define HAVE_USLEEP
+!defined(HAVE_CONFIG_H) && !defined(WINDOWS) && !defined(RISCOS
+define HAVE_DIRENT_H
-#endif
-
-
-
@@ -132 +122 @@
-
-
+

trunk/src/main-sdl.c

@@ -3446 +3446 @@
-        char buf[1024];
-        FILE *fff;
+        ang_dir *dir;
-        
-        /* Build the gfx path */
@@ -3453 +3454 @@
-        /* Build the "font" path */
-        path_build(path, sizeof(path), ANGBAND_DIR_XTRA, "font");
-        
-        /* Allocate the path */
-        ANGBAND_DIR_XTRA_FONT = string_make(path);
-        
@@ -3464 +3463 @@
-        
-        for (i = 0; i < MAX_FONTS; i++)
-        {
-                FontList[i] = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (num_fonts == MAX_FONTS) break;
-        }
-
-
+
+
+
-}
-

trunk/src/util.c

@@ -11 +11 @@
-#include "angband.h"
-#include "randname.h"
-
-
-#ifdef SET_UID
-
-# ifndef HAVE_USLEEP
-
-/*
- * struct timeval (used below) requires sys/time.h.
- *
- * Unix systems that neither have usleep nor sys/time.h are screwed, since
- * they have no way of delaying.
- */
-#include <sys/time.h>
-
-/*
- * For those systems that don't have "usleep()" but need it.
- *
- * Fake "usleep()" function grabbed from the inl netrek server -cba
- */
-int usleep(unsigned long usecs)
-{
-        struct timeval      Timer;
-
-        /* Paranoia -- No excessive sleeping */
-        if (usecs > 4000000L) quit("Illegal usleep() call");
-
-        /* Wait for it */
-        Timer.tv_sec = (usecs / 1000000L);
-        Timer.tv_usec = (usecs % 1000000L);
-
-        /* Wait for it */
-        if (select(0, NULL, NULL, NULL, &Timer) < 0)
-        {
-                /* Hack -- ignore interrupts */
-                if (errno != EINTR) return -1;
-        }
-
-        /* Success */
-        return 0;
-}
-
-# endif /* HAVE_USLEEP */
-#endif /* SET_UID */
-
-
-

trunk/src/wizard1.c

@@ -10 +10 @@
-
-#include "angband.h"
+#include "z-file.h"
-
-

trunk/src/z-file.c

@@ -760 +760 @@
-#endif /* RISCOS */
-
+/*** Directory scanning code ***/
+
+/*
+ * This code was originally written for the SDL port so it could scan for fonts
+ * without needing a fontlist text file.
+ */
+
+
+/*
+ * Opens a directory handle.
+ * 
+ * `dirname` must be a system-specific pathname to the directory
+ * you want scanned.
+ *
+ * Returns a valid directory handle on success, NULL otherwise.
+ */
+ang_dir *my_dopen(const char *dirname);
+
+
+/*
+ * Reads a directory entry.
+ *
+ * `dir` must point to a directory handle previously returned by my_dopen().
+ * `fname` must be a pointer to a writeable chunk of memory `len` long.
+ *
+ * Returns TRUE on successful reading, FALSE otherwise.
+ * (FALSE generally indicates that there are no more files to be read.)
+ */
+bool my_dread(ang_dir *dir, char *fname, size_t len);
+
+
+/*
+ * Close a directory handle.
+ */
+void my_dclose(ang_dir *dir);
+
+
+
+#ifdef WINDOWS
+
+/* Paranoia */
+# ifdef HAVE_DIRENT_H
+#  undef HAVE_DIRENT_H
+# endif
+
+/* Include Windows header */
+#include <windows.h>
+
+/* System-specific struct */
+struct ang_dir
+{
+        HANDLE h;
+        const char *first_file;
+};
+
+/* Specified above */
+ang_dir *my_dopen(const char *dirname)
+{
+        WIN32_FIND_DATA fd;
+        ang_dir *dir;
+
+        dir = ralloc(sizeof dir);
+        if (!dir) return NULL;
+
+        /* Try to open it */
+        dir->h = FindFirstFile(format("%s\\*", dirname), &fd);
+
+        /* Abort */
+        if (dir->h == INVALID_HANDLE_VALUE)
+        {
+                FREE(dir);
+                return NULL;
+        }
+
+        /* Remember this one */
+        dir->first_file = string_make(fd.cFileName);
+
+        /* Success */
+        return dir;
+}
+
+/* Specified above */
+bool my_dread(ang_dir *dir, char *fname, size_t len)
+{
+        WIN32_FIND_DATA fd;
+        BOOL ok;
+        bool next = TRUE;
+
+        /* Try the first file */
+        if (dir->first_file)
+        {
+                /* Copy the string across, then free it */
+                my_strcpy(fname, dir->first_file, len);
+                string_free(dir->first_file);
+                dir->first_file = NULL;
+
+                /* Wild success */
+                return TRUE;
+        }
+
+        /* Try the next file */
+        while (next)
+        {
+                ok = FindNextFile(dir->h, &fd);
+                if (!ok) return FALSE;
+
+                /* Skip directories */
+                if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ||
+                    strcmp(fd.cFileName, ".") == 0 ||
+                    strcmp(fd.cFileName, "..") == 0)
+                        continue;
+
+                /* Take this one */
+                my_strcpy(fname, fd.cFileName, len);
+                next = FALSE;
+        }
+
+        return TRUE;
+}
+
+void my_dclose(ang_dir *dir)
+{
+        /* Close directory */
+        if (dir->h)
+                FindClose(dir->h);
+
+        /* Free memory */
+        FREE(dir);
+}
+
+#endif /* WINDOWS */
+
+
+#ifdef HAVE_DIRENT_H
+
+/* Include relevant types */
+#include <sys/types.h>
+#include <dirent.h>
+
+/* Define our ang_dir type */
+struct ang_dir
+{
+        DIR *d;
+};
+
+/* Specified above */
+ang_dir *my_dopen(const char *dirname)
+{
+        ang_dir *dir;
+
+        dir = ralloc(sizeof dir);
+        if (!dir) return NULL;
+
+        /* Try to open the directory */
+        dir->d = opendir(dirname);
+        if (!dir->d)
+        {
+                FREE(dir);
+                return NULL;
+        }
+
+        /* Success */
+        return dir;
+}
+
+/* Specified above */
+bool my_dread(ang_dir *dir, char *fname, size_t len)
+{
+        struct dirent *entry;
+        struct stat filedata;
+
+        assert(dir != NULL);
+
+        /* Try reading another entry */
+        entry = readdir(dir->d);
+        if (!entry) return FALSE;
+
+        /* Copy the filename */
+        /* XXX ignore overflow */
+        my_strcpy(fname, entry->d_name, len);
+
+        return TRUE;
+}
+
+void my_dclose(ang_dir *dir)
+{
+        /* Close directory */
+        if (dir->d)
+                closedir(dir->d);
+
+        /* Free memory */
+        FREE(dir);
+}
+
+#endif /* HAVE_DIRENT_H */
+

trunk/src/z-file.h

@@ -73 +73 @@
-
-
+typedef struct ang_dir ang_dir;
+
+ang_dir *my_dopen(const char *dirname);
+bool my_dread(ang_dir *dir, char *fname, size_t len);
+void my_dclose(ang_dir *dir);
+
+
-#endif