X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffilename.c;h=3b25b99c9e768452916412083f05b65643fc5c86;hb=5a33cc6d78fe87ff5e9bd32ea4af3f895e4ad2fc;hp=f666674b31886e76c2e3496437146a8686ab4e6e;hpb=74a57f26f1458b28a0fddbb9f46004ac8f4d9c30;p=pspp-builds.git

diff --git a/src/filename.c b/src/filename.c
index f666674b..3b25b99c 100644
--- a/src/filename.c
+++ b/src/filename.c
@@ -14,11 +14,11 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, 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)
@@ -502,7 +502,7 @@ fn_dirname (const char *filename)
   if (len == 1 && filename[0] == '/')
     p = filename + 1;
   else if (len && filename[len - 1] == DIR_SEPARATOR)
-    p = mm_find_reverse (filename, len - 1, filename + len - 1, 1);
+    p = buf_find_reverse (filename, len - 1, filename + len - 1, 1);
   else
     p = strrchr (filename, DIR_SEPARATOR);
   if (p == NULL)
@@ -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. */