X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilename.c;h=a07b7d18f9033a9de8ae3f263e1c1b8bd55827f2;hb=02ef5fef5288b80a4822e1006f6cb2b1369a55bd;hp=c9f0b62ecc9247455631e1b45014ee3132c9ddd2;hpb=7b98b3a4f58f6dc5a8e9cbc188b627966d5e652d;p=pspp-builds.git

diff --git a/src/filename.c b/src/filename.c
index c9f0b62e..a07b7d18 100644
--- a/src/filename.c
+++ b/src/filename.c
@@ -18,7 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include "filename.h"
 #include <stdlib.h>
 #include <ctype.h>
@@ -75,20 +75,20 @@ fn_interp_vars (const char *input, const char *(*getenv) (const char *))
   if (NULL == strchr (input, '$'))
     return xstrdup (input);
 
-  ds_init (NULL, &output, strlen (input));
+  ds_init (&output, strlen (input));
 
   for (;;)
     switch (*input)
       {
       case '\0':
-	return ds_value (&output);
+	return ds_c_str (&output);
 	
       case '$':
 	input++;
 
 	if (*input == '$')
 	  {
-	    ds_putchar (&output, '$');
+	    ds_putc (&output, '$');
 	    input++;
 	  }
 	else
@@ -114,18 +114,18 @@ fn_interp_vars (const char *input, const char *(*getenv) (const char *))
 
 	    while (*input && *input != stop
 		   && (stop || isalpha ((unsigned char) *input)))
-	      ds_putchar (&output, *input++);
+	      ds_putc (&output, *input++);
 	    
-	    value = getenv (ds_value (&output) + start);
+	    value = getenv (ds_c_str (&output) + start);
 	    ds_truncate (&output, start);
-	    ds_concat (&output, value);
+	    ds_puts (&output, value);
 
 	    if (stop && *input == stop)
 	      input++;
 	  }
 
       default:
-	ds_putchar (&output, *input++);
+	ds_putc (&output, *input++);
       }
 }
 
@@ -140,13 +140,13 @@ fn_tilde_expand (const char *input)
 
   if (NULL == strchr (input, '~'))
     return xstrdup (input);
-  ds_init (NULL, &output, strlen (input));
+  ds_init (&output, strlen (input));
 
   ip = input;
 
   for (ip = input; *ip; )
     if (*ip != '~' || (ip != input && ip[-1] != PATH_DELIMITER))
-      ds_putchar (&output, *ip++);
+      ds_putc (&output, *ip++);
     else
       {
 	static const char stop_set[3] = {DIR_SEPARATOR, PATH_DELIMITER, 0};
@@ -166,27 +166,27 @@ fn_tilde_expand (const char *input)
 	    pwd = getpwnam (username);
 
 	    if (!pwd || !pwd->pw_dir)
-	      ds_putchar (&output, *ip++);
+	      ds_putc (&output, *ip++);
 	    else
-	      ds_concat (&output, pwd->pw_dir);
+	      ds_puts (&output, pwd->pw_dir);
 	  }
 	else
 	  {
 	    const char *home = fn_getenv ("HOME");
 	    if (!home)
-	      ds_putchar (&output, *ip++);
+	      ds_putc (&output, *ip++);
 	    else
-	      ds_concat (&output, home);
+	      ds_puts (&output, home);
 	  }
 
 	ip = cp;
       }
 
-  return ds_value (&output);
+  return ds_c_str (&output);
 }
 #else /* !unix */
 char *
-fn_tilde_expand (char *input)
+fn_tilde_expand (const char *input)
 {
   return xstrdup (input);
 }
@@ -219,7 +219,7 @@ fn_search_path (const char *basename, const char *path, const char *prepend)
   }
 
   msg (VM (4), _("Searching for `%s'..."), basename);
-  ds_init (NULL, &filename, 64);
+  ds_init (&filename, 64);
 
   for (;;)
     {
@@ -239,21 +239,21 @@ fn_search_path (const char *basename, const char *path, const char *prepend)
       ds_clear (&filename);
       if (prepend && !fn_absolute_p (bp))
 	{
-	  ds_concat (&filename, prepend);
-	  ds_putchar (&filename, DIR_SEPARATOR);
+	  ds_puts (&filename, prepend);
+	  ds_putc (&filename, DIR_SEPARATOR);
 	}
-      ds_concat_buffer (&filename, bp, ep - bp);
+      ds_concat (&filename, bp, ep - bp);
       if (ep - bp
-	  && ds_value (&filename)[ds_length (&filename) - 1] != DIR_SEPARATOR)
-	ds_putchar (&filename, DIR_SEPARATOR);
-      ds_concat (&filename, basename);
+	  && ds_c_str (&filename)[ds_length (&filename) - 1] != DIR_SEPARATOR)
+	ds_putc (&filename, DIR_SEPARATOR);
+      ds_puts (&filename, basename);
       
-      msg (VM (5), " - %s", ds_value (&filename));
-      if (fn_exists_p (ds_value (&filename)))
+      msg (VM (5), " - %s", ds_c_str (&filename));
+      if (fn_exists_p (ds_c_str (&filename)))
 	{
-	  msg (VM (4), _("Found `%s'."), ds_value (&filename));
+	  msg (VM (4), _("Found `%s'."), ds_c_str (&filename));
 	  free (subst_path);
-	  return ds_value (&filename);
+	  return ds_c_str (&filename);
 	}
 
       if (0 == *ep)
@@ -525,6 +525,7 @@ fn_basename (const char *filename)
 }
 #endif
 
+#if unix
 /* Returns the current working directory, as a malloc()'d string.
    From libc.info. */
 char *
@@ -544,6 +545,22 @@ fn_get_cwd (void)
       buffer = xmalloc (size);
     }
 }
+#else
+char *
+fn_get_cwd (void)
+{
+  int size = 2;
+  char *buffer = xmalloc (size);
+  if ( buffer) 
+  {
+    buffer[0]='.';
+    buffer[1]='\0';
+  }
+
+  return buffer;
+     
+}
+#endif
 
 /* Find out information about files. */
 
@@ -695,7 +712,7 @@ fn_open (const char *fn, const char *mode)
 #ifdef unix
   if (fn[0] == '|')
     {
-      if (set_safer)
+      if (safer_mode())
 	return safety_violation (fn);
 
       return popen (&fn[1], mode);
@@ -705,7 +722,7 @@ fn_open (const char *fn, const char *mode)
       char *s;
       FILE *f;
 
-      if (set_safer)
+      if (safer_mode())
 	return safety_violation (fn);
       
       s = local_alloc (strlen (fn));
@@ -854,3 +871,93 @@ fn_close_ext (struct file_ext *f)
     }
   return 1;
 }
+
+#ifdef unix
+/* A file's identity. */
+struct file_identity 
+  {
+    dev_t device;               /* Device number. */
+    ino_t inode;                /* Inode number. */
+  };
+
+/* 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 *filename) 
+{
+  struct stat s;
+
+  if (stat (filename, &s) == 0) 
+    {
+      struct file_identity *identity = xmalloc (sizeof *identity);
+      identity->device = s.st_dev;
+      identity->inode = s.st_ino;
+      return identity;
+    }
+  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;
+}
+#else /* not unix */
+/* A file's identity. */
+struct file_identity 
+  {
+    char *normalized_filename;  /* 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 *filename) 
+{
+  struct file_identity *identity = xmalloc (sizeof *identity);
+  identity->normalized_filename = fn_normalize (filename);
+  return identity;
+}
+
+/* Frees IDENTITY obtained from fn_get_identity(). */
+void
+fn_free_identity (struct file_identity *identity) 
+{
+  if (identity != NULL) 
+    {
+      free (identity->normalized_filename);
+      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) 
+{
+  return strcmp (a->normalized_filename, b->normalized_filename);
+}
+#endif /* not unix */