Reworked settings so as to use one large struct instead of lots of static

[pspp-builds.git] / src / data / file-name.c

diff --git a/src/data/file-name.c b/src/data/file-name.c
index f8ad11d07a342f22fd5bf4cfa026d9a93a412ce0..c6f91b56a961c1567cf7b9a4822f8c4d5899088d 100644 (file)
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -28,14 +28,17 @@
 #include "intprops.h"
 #include "minmax.h"
 #include "dirname.h"
+#include "xmalloca.h"
 
-#include <libpspp/alloc.h>
-#include <libpspp/message.h>
 #include <data/settings.h>
+#include <libpspp/hash.h>
+#include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <libpspp/verbose-msg.h>
 #include <libpspp/version.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -266,7 +269,7 @@ fn_open (const char *fn, const char *mode)
 #if HAVE_POPEN
   if (fn[0] == '|')
     {
-      if (get_safer_mode ())
+      if (settings_get_safer_mode ())
        return safety_violation (fn);
 
       return popen (&fn[1], mode[0] == 'r' ? "r" : "w");
@@ -276,16 +279,16 @@ fn_open (const char *fn, const char *mode)
       char *s;
       FILE *f;
 
-      if (get_safer_mode ())
+      if (settings_get_safer_mode ())
        return safety_violation (fn);
 
-      s = local_alloc (strlen (fn));
+      s = xmalloca (strlen (fn));
       memcpy (s, fn, strlen (fn) - 1);
       s[strlen (fn) - 1] = 0;
 
       f = popen (s, mode[0] == 'r' ? "r" : "w");
 
-      local_free (s);
+      freea (s);
 
       return f;
     }
@@ -346,12 +349,24 @@ create_stream (const char *fn, const char *mode, mode_t permissions)
   return stream;
 }
 
-#if !(defined _WIN32 || defined __WIN32__)
-/* A file's identity. */
+/* A file's identity:
+
+   - For a file that exists, this is its device and inode.
+
+   - For a file that does not exist, but which has a directory
+     name that exists, this is the device and inode of the
+     directory, plus the file's base name.
+
+   - For a file that does not exist and has a nonexistent
+     directory, this is the file name.
+
+   Windows doesn't have inode numbers, so we just use the name
+   there. */
 struct file_identity
 {
   dev_t device;               /* Device number. */
   ino_t inode;                /* Inode number. */
+  char *name;                 /* File name, where needed, otherwise NULL. */
 };
 
 /* Returns a pointer to a dynamically allocated structure whose
@@ -363,61 +378,41 @@ struct file_identity
 struct file_identity *
 fn_get_identity (const char *file_name)
 {
-  struct stat s;
+  struct file_identity *identity = xmalloc (sizeof *identity);
 
-  if (stat (file_name, &s) == 0)
+#if !(defined _WIN32 || defined __WIN32__)
+  struct stat s;
+  if (lstat (file_name, &s) == 0)
     {
-      struct file_identity *identity = xmalloc (sizeof *identity);
       identity->device = s.st_dev;
       identity->inode = s.st_ino;
-      return identity;
+      identity->name = NULL;
     }
   else
-    return NULL;
-}
-
-/* Frees IDENTITY obtained from fn_get_identity(). */
-void
-fn_free_identity (struct file_identity *identity)
-{
-  free (identity);
-}
-
-/* Compares A and B, returning a strcmp()-type result. */
-int
-fn_compare_file_identities (const struct file_identity *a,
-                            const struct file_identity *b)
-{
-  assert (a != NULL);
-  assert (b != NULL);
-  if (a->device != b->device)
-    return a->device < b->device ? -1 : 1;
-  else
-    return a->inode < b->inode ? -1 : a->inode > b->inode;
-}
+    {
+      char *dir = dir_name (file_name);
+      if (last_component (file_name) != NULL && stat (dir, &s) == 0)
+        {
+          identity->device = s.st_dev;
+          identity->inode = s.st_ino;
+          identity->name = base_name (file_name);
+        }
+      else
+        {
+          identity->device = 0;
+          identity->inode = 0;
+          identity->name = xstrdup (file_name);
+        }
+      free (dir);
+    }
 #else /* Windows */
-/* A file's identity. */
-struct file_identity
-{
-  char *normalized_file_name;  /* File's normalized name. */
-};
-
-/* Returns a pointer to a dynamically allocated structure whose
-   value can be used to tell whether two files are actually the
-   same file.  Returns a null pointer if no information about the
-   file is available, perhaps because it does not exist.  The
-   caller is responsible for freeing the structure with
-   fn_free_identity() when finished. */
-struct file_identity *
-fn_get_identity (const char *file_name)
-{
-  struct file_identity *identity = xmalloc (sizeof *identity);
   char cname[PATH_MAX];
-
-  if (GetFullPathName (file_name, sizeof cname, cname, NULL))
-    identity->normalized_file_name = xstrdup (cname);
-  else
-    identity->normalized_file_name = xstrdup (file_name);
+  int ok = GetFullPathName (file_name, sizeof cname, cname, NULL);
+  identity->device = 0;
+  identity->inode = 0;
+  identity->name = xstrdup (ok ? cname : file_name);
+  str_lowercase (identity->file_name);
+#endif /* Windows */
 
   return identity;
 }
@@ -428,7 +423,7 @@ fn_free_identity (struct file_identity *identity)
 {
   if (identity != NULL)
     {
-      free (identity->normalized_file_name);
+      free (identity->name);
       free (identity);
     }
 }
@@ -438,6 +433,22 @@ int
 fn_compare_file_identities (const struct file_identity *a,
                             const struct file_identity *b)
 {
-  return strcasecmp (a->normalized_file_name, b->normalized_file_name);
+  if (a->device != b->device)
+    return a->device < b->device ? -1 : 1;
+  else if (a->inode != b->inode)
+    return a->inode < b->inode ? -1 : 1;
+  else if (a->name != NULL)
+    return b->name != NULL ? strcmp (a->name, b->name) : 1;
+  else
+    return b->name != NULL ? -1 : 0;
+}
+
+/* Returns a hash value for IDENTITY. */
+unsigned int
+fn_hash_identity (const struct file_identity *identity)
+{
+  unsigned int hash = identity->device ^ identity->inode;
+  if (identity->name != NULL)
+    hash ^= hsh_hash_string (identity->name);
+  return hash;
 }
-#endif /* Windows */