Fix /lib=/usr/lib alias in "cygcheck -f"

Igor Pechtchanski pechtcha@cs.nyu.edu
Mon Dec 19 16:34:00 GMT 2005


Hi,

Due to a missing trailing "/", "cygcheck -f" did not recognize "/lib" as
being the same as "/usr/lib".  The attached patch fixes this.  ChangeLog
below.
	Igor
==============================================================================
2005-12-19  Igor Pechtchanski  <pechtcha@cs.nyu.edu>

	* dump_setup.cc (package_find): Fix is_alias computation for
	"/usr/lib".

-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski, Ph.D.
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"Las! je suis sot... -Mais non, tu ne l'es pas, puisque tu t'en rends compte."
"But no -- you are no fool; you call yourself a fool, there's proof enough in
that!" -- Rostand, "Cyrano de Bergerac"
-------------- next part --------------
Index: dump_setup.cc
===================================================================
RCS file: /cvs/src/src/winsup/utils/dump_setup.cc,v
retrieving revision 1.17
diff -u -p -r1.17 dump_setup.cc
--- dump_setup.cc	25 Oct 2004 15:49:36 -0000	1.17
+++ dump_setup.cc	19 Dec 2005 16:30:01 -0000
@@ -478,7 +478,7 @@ package_find (int verbose, char **argv)
 	    {
 	      // FIXME: verify that /bin is mounted on /usr/bin; ditto for /lib
 	      bool is_alias = !strncmp(filename, "/usr/bin/", 9) ||
-			      !strncmp(filename, "/usr/lib", 9);
+			      !strncmp(filename, "/usr/lib/", 9);
 	      int a = match_argv (argv, filename);
 	      if (!a && is_alias)
 		a = match_argv (argv, filename + 4);


More information about the Cygwin-patches mailing list