Fixed bug in fn_interp_vars

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 669836c6d729fc51ee47867cccea300bccdf15e6..35a8ed1e3227cc7dab65df8ffbcbefb0042a4d29 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr  4 15:28:40 WST 2006 John Darrington <john@darrington.wattle.id.au>
+
+       * filename.ch (fn_interp_vars): Fixed small buglet.
+
 Tue Mar 28 13:47:16 WST 2006 John Darrington <john@darrington.wattle.id.au>
        
        * filename.[ch] (fn_interp_vars): Changed the signature and semantics

diff --git a/src/data/filename.c b/src/data/filename.c
index 728585df11d93ab6b810e75a6990c7b833965fab..323a78c54ec32a67f9dac784ca5d25a18d212dad 100644 (file)
--- a/src/data/filename.c
+++ b/src/data/filename.c
@@ -78,12 +78,15 @@ fn_init (void)
 */
 void 
 fn_interp_vars (struct string *target, 
-                  const char *(*getenv) (const char *))
+               const char *(*getenv) (const char *))
 {
+  char *input ;
+  char *s ;
+
   assert (target);
 
-  char *input = xmalloc(ds_length(target) + 1);
-  char *s = input;
+  input = xmalloc(ds_length(target) + 1);
+  s = input;
 
   strcpy(input, ds_c_str(target));
 
@@ -141,6 +144,7 @@ fn_interp_vars (struct string *target,
              if (stop && *s == stop)
                s++;
            }
+         break;
 
        default:
          ds_putc (target, *s++);
@@ -592,10 +596,10 @@ fn_get_cwd (void)
   int size = 2;
   char *buffer = xmalloc (size);
   if ( buffer) 
-  {
-    buffer[0]='.';
-    buffer[1]='\0';
-  }
+    {
+      buffer[0]='.';
+      buffer[1]='\0';
+    }
 
   return buffer;
      
@@ -889,10 +893,10 @@ fn_close_ext (struct file_ext *f)
 #ifdef unix
 /* A file's identity. */
 struct file_identity 
-  {
-    dev_t device;               /* Device number. */
-    ino_t inode;                /* Inode number. */
-  };
+{
+  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
@@ -938,9 +942,9 @@ fn_compare_file_identities (const struct file_identity *a,
 #else /* not unix */
 /* A file's identity. */
 struct file_identity 
-  {
-    char *normalized_filename;  /* File's normalized name. */
-  };
+{
+  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