m4-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Changes to m4/src/Attic/builtin.c,v [branch-1_4]


From: Eric Blake
Subject: Changes to m4/src/Attic/builtin.c,v [branch-1_4]
Date: Sun, 30 Jul 2006 03:18:13 +0000

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      06/07/30 03:18:12

Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.28
retrieving revision 1.1.1.1.2.29
diff -u -b -r1.1.1.1.2.28 -r1.1.1.1.2.29
--- src/builtin.c       27 Jul 2006 21:41:12 -0000      1.1.1.1.2.28
+++ src/builtin.c       30 Jul 2006 03:18:12 -0000      1.1.1.1.2.29
@@ -1049,7 +1049,7 @@
                    "non-numeric argument to builtin `%s'", ARG (0)));
        else
          {
-           fp = path_search (ARG (i));
+           fp = path_search (ARG (i), NULL);
            if (fp != NULL)
              {
                insert_file (fp);
@@ -1154,11 +1154,12 @@
 include (int argc, token_data **argv, boolean silent)
 {
   FILE *fp;
+  const char *name;
 
   if (bad_argc (argv[0], argc, 2, 2))
     return;
 
-  fp = path_search (ARG (1));
+  fp = path_search (ARG (1), &name);
   if (fp == NULL)
     {
       if (!silent)
@@ -1167,7 +1168,8 @@
       return;
     }
 
-  push_file (fp, ARG (1));
+  push_file (fp, name);
+  free ((char *) name);
 }
 
 /*------------------------------------------------.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]