* Makefile.maint: Fix typo.

diff --git a/ChangeLog b/ChangeLog
index d7b1839ce5bd423bae54c274b86c4362a3953a25..af11cdcb0ab1994d05472ebb2e3d843a3b12d4f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * Makefile.maint: Fix typo.
+
 2004-10-22  Gary V. Vaughan  <gary@gnu.org>
 
        * clcommit.m4sh, config/mailnotify.m4sh: Updated from

diff --git a/Makefile.maint b/Makefile.maint
index 4081e95cb50d35fa735dd9390c6c07789e4b332d..7838a84cc1654a249debd45407977f6a36992832 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -25,7 +25,7 @@ Makefile:
        @echo " *** \`make -f../Makefile.maint' for example, where"
        @echo " *** \`../' is the relative path back to the directory"
        @echo " *** that contains the \`Makefile.maint'.  Alternatively,"
-       @echo " *** run `./configure' in the source tree for an in"
+       @echo " *** run \`./configure' in the source tree for an in"
        @echo " *** tree build."
        @exit 1
 

diff --git a/TODO b/TODO
index 2e211479edc8b3f1e888b19860deb3eea686efc7..d1043ca9066ae51e2c846c6d7e32257f8e1473ad 100644 (file)
--- a/TODO
+++ b/TODO
@@ -51,6 +51,8 @@ GNU Libtool
 1.2. libtldl
 ------------
 
+* Adjust version-info of libltdl before next release.
+
 * Fix the following bugs in libltdl:
  - error reporting of tryall_dlopen():
    if the file actually doesn't exist (stat() fails or it wasn't dlpreopened)
@@ -62,6 +64,16 @@ GNU Libtool
    Also report dlerror() for dlclose and dlsym if available
  - Make sure that the dependency_libs of a dlpreopened module won't be loaded.
 
+* Split out get_line as getline, preferably cooperate with gnulib's version.
+  Otherwise have it use ssize_t for correctness (this needs adding a ssize_t
+  check to m4/ltdl.m4).
+
+* Implement even stricter checking of .la file structure.
+  Especially leading and trailing white space in the right hand side of a
+  variable assignment need checking (in ltdl as well as libtool).
+  Also, add a way of communicating parse errors more verbosely.
+  Add regression tests.
+
 
 2. In the future
 ================

diff --git a/libltdl/lt_error.h b/libltdl/lt_error.h
index 4283b4385d110ac4d732e1e23cd6beeef423fb39..722ad26675f9abafc117739a17679b6e79abfc23 100644 (file)
--- a/libltdl/lt_error.h
+++ b/libltdl/lt_error.h
@@ -57,7 +57,8 @@ LT_BEGIN_C_DECLS
     LT_ERROR(SHUTDOWN,             "library already shutdown")         \
     LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module")     \
     LT_ERROR(INVALID_MUTEX_ARGS,    "internal error (code withdrawn)")  \
-    LT_ERROR(INVALID_POSITION,     "invalid search path insert position")
+    LT_ERROR(INVALID_POSITION,     "invalid search path insert position") \
+    LT_ERROR(INVALID_LALIB,        "malformed library file")
 
 /* Enumerate the symbolic error names. */
 enum {

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 1beca9f0131d923aaf6ed01d18af8a3a06d5be1d..9322c616e54c8e00af979d9104bc916b16e5217f 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1831,7 +1831,7 @@ lt_dlpath_insertdir (char **ppath, char *before, const char *dir)
   size_t argz_len      = 0;
 
   assert (ppath);
-  assert (dir && *dir);
+  assert (dir && *dir);                /* Without DIR, don't call this function!  */
 
   if (canonicalize_path (dir, &canonical) != 0)
     {
@@ -1845,9 +1845,8 @@ lt_dlpath_insertdir (char **ppath, char *before, const char *dir)
   if (*ppath == 0)
     {
       assert (!before);                /* BEFORE cannot be set without PPATH.  */
-      assert (dir);            /* Without DIR, don't call this function!  */
 
-      *ppath = lt__strdup (dir);
+      *ppath = lt__strdup (canonical);
       if (*ppath == 0)
        ++errors;
 
@@ -1875,7 +1874,7 @@ lt_dlpath_insertdir (char **ppath, char *before, const char *dir)
       before = before - *ppath + argz;
     }
 
-  if (lt_argz_insert (&argz, &argz_len, before, dir) != 0)
+  if (lt_argz_insert (&argz, &argz_len, before, canonical) != 0)
     {
       ++errors;
       goto cleanup;
@@ -1892,21 +1891,13 @@ lt_dlpath_insertdir (char **ppath, char *before, const char *dir)
 }
 
 int
-lt_dladdsearchdir (const char *search_dir)
+lt_dladdsearchdir (const char *search_path)
 {
-  int errors = 0;
-
-  if (search_dir && *search_dir)
-    {
-      if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0)
-       ++errors;
-    }
-
-  return errors;
+  return lt_dlinsertsearchdir (NULL, search_path);
 }
 
 int
-lt_dlinsertsearchdir (const char *before, const char *search_dir)
+lt_dlinsertsearchdir (const char *before, const char *search_path)
 {
   int errors = 0;
 
@@ -1920,10 +1911,10 @@ lt_dlinsertsearchdir (const char *before, const char *search_dir)
        }
     }
 
-  if (search_dir && *search_dir)
+  if (search_path && *search_path)
     {
       if (lt_dlpath_insertdir (&user_search_path,
-                              (char *) before, search_dir) != 0)
+                              (char *) before, search_path) != 0)
        {
          ++errors;
        }
@@ -1935,29 +1926,15 @@ lt_dlinsertsearchdir (const char *before, const char *search_dir)
 int
 lt_dlsetsearchpath (const char *search_path)
 {
-  int   errors     = 0;
-
   FREE (user_search_path);
 
-  if (!search_path || !LT_STRLEN (search_path))
-    {
-      return errors;
-    }
-
-  if (canonicalize_path (search_path, &user_search_path) != 0)
-    ++errors;
-
-  return errors;
+  return lt_dlinsertsearchdir(NULL, search_path);
 }
 
 const char *
 lt_dlgetsearchpath (void)
 {
-  const char *saved_path;
-
-  saved_path = user_search_path;
-
-  return saved_path;
+  return user_search_path;
 }
 
 int

diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index dcf88b2d25367700522608a07459d2b120c24aae..7c8588c7037f502d7fd227ba3ecc1025dcaaa2cf 100644 (file)
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -52,9 +52,9 @@ LT_SCOPE int      lt_dlinit           (void);
 LT_SCOPE int       lt_dlexit           (void);
 
 /* Module search path manipulation.  */
-LT_SCOPE int       lt_dladdsearchdir    (const char *search_dir);
+LT_SCOPE int       lt_dladdsearchdir    (const char *search_path);
 LT_SCOPE int       lt_dlinsertsearchdir (const char *before,
-                                                 const char *search_dir);
+                                                 const char *search_path);
 LT_SCOPE int       lt_dlsetsearchpath   (const char *search_path);
 LT_SCOPE const char *lt_dlgetsearchpath         (void);
 LT_SCOPE int       lt_dlforeachfile     (