- yank some debugging stuff

4 files changed, 7 insertions, 88 deletions

diff --git a/Makefile b/Makefile
index e4955251..0a8de051 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Copyright 2005-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.61 2008/01/15 08:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-projects/portage-utils/Makefile,v 1.62 2008/01/16 16:24:49 solar Exp $
 ####################################################################
 
 check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
@@ -26,13 +26,6 @@ STRIP     := strip
 MKDIR     := mkdir -p
 CP        := cp
 
-ifndef STATIC
-LDFLAGS   += -Wl,--export-dynamic
-LIBADD    += $(shell echo | $(CC) -dM -E - | grep -q ' __linux__' && echo '-ldl')
-else
-CFLAGS    += -DSTATIC
-endif
-
 ifdef PV
 HFLAGS    += -DVERSION=\"$(PV)\"
 else
@@ -101,7 +94,6 @@ clean:
 distclean: clean testclean
 	-rm -f *~ core
 	-rm -f `find . -type l`
-	-cd mod ; $(MAKE) distclean
 
 testclean:
 	cd tests && $(MAKE) clean
diff --git a/main.c b/main.c
index e3484f55..2c5e4274 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2008 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.152 2008/01/16 07:09:06 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/main.c,v 1.153 2008/01/16 16:24:49 solar Exp $
  *
  * Copyright 2005-2008 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2008 Mike Frysinger  - <vapier@gentoo.org>
@@ -1011,10 +1011,6 @@ void cleanup()
 	reinitialize_as_needed();
 	free_sets(virtuals);
 	fclose(stderr);
-#ifndef STATIC
-	if (dlhandle != NULL)
-		dlclose(dlhandle);
-#endif
 }
 
 int main(int argc, char **argv)
diff --git a/q.c b/q.c
index 9052b1be..231b7062 100644
--- a/q.c
+++ b/q.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.44 2007/05/25 19:19:40 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/q.c,v 1.45 2008/01/16 16:24:49 solar Exp $
  *
  * Copyright 2005-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2007 Mike Frysinger  - <vapier@gentoo.org>
@@ -22,19 +22,12 @@ static const char *q_opts_help[] = {
 	"Module path",
 	COMMON_OPTS_HELP
 };
-static const char q_rcsid[] = "$Id: q.c,v 1.44 2007/05/25 19:19:40 solar Exp $";
+static const char q_rcsid[] = "$Id: q.c,v 1.45 2008/01/16 16:24:49 solar Exp $";
 #define q_usage(ret) usage(ret, Q_FLAGS, q_long_opts, q_opts_help, lookup_applet_idx("q"))
 
-#ifndef STATIC
-APPLET lookup_dl_applet(char *applet);
-#endif
-
 APPLET lookup_applet(char *applet);
 APPLET lookup_applet(char *applet)
 {
-#ifndef STATIC
-	APPLET dl_func;
-#endif
 	unsigned int i;
 
 	if (strlen(applet) < 1)
@@ -58,73 +51,11 @@ APPLET lookup_applet(char *applet)
 			return applets[i].func;
 		}
 	}
-#ifndef STATIC
-	if ((dl_func = lookup_dl_applet(applet)) != NULL)
-		return dl_func;
-	if (*applet == 'q')
-		if ((dl_func = lookup_dl_applet(applet+1)) != NULL)
-			return dl_func;
-#endif
 	/* still nothing ?  those bastards ... */
 	warn("Unknown applet '%s'", applet);
 	return NULL;
 }
 
-#ifndef STATIC
-APPLET lookup_dl_applet(char *applet) {
-	char *ptr = NULL;
-	APPLET iptr;
-	FILE *fp;
-	char buf[_Q_PATH_MAX];
-
-	if (dlhandle != NULL)
-		return NULL;
-
-	/* modpath can be passed in as a global option */
-	if (modpath == NULL) {
-		DBG("opening /etc/q.conf");
-		if ((fp = fopen("/etc/q.conf", "r")) == NULL)
-			return NULL;
-
-		while ((fgets(buf, sizeof(buf), fp)) != NULL) {
-			rmspace(buf);
-			remove_extra_space(buf);
-			if ((strncmp(buf, "modpath=", 8)) == 0)
-				modpath = &buf[8];
-		}
-		fclose(fp);
-	}
-	if (modpath == NULL)
-		return NULL;
-
-	if (!strlen(modpath))
-		return NULL;
-
-	DBG("module path set to %s", modpath);
-
-	/* fill in the path, check that object exists and open it */
-	xasprintf(&ptr, "%s/lib%s.so", modpath, applet);
-	if ((access(ptr, X_OK)) != 0) {
-		DBG("file does not exist or we dont have perms to mmap %s", ptr);
-		free(ptr);
-		return NULL;
-	}
-	if ((dlhandle = dlopen(ptr, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
-		DBG("unable to load %s : %s", ptr, dlerror());
-		free(ptr);
-		return NULL;
-	}
-	free(ptr);
-
-	xasprintf(&ptr, "%s_main", applet);
-	DBG("symbol lookup %s", ptr);
-	iptr = (APPLET) dlsym(dlhandle, ptr);
-	free(ptr);
-	module_name = applet;
-	return iptr;
-}
-#endif
-
 int lookup_applet_idx(const char *applet)
 {
 	unsigned int i;
diff --git a/qlist.c b/qlist.c
index 20902588..c1ba9e0f 100644
--- a/qlist.c
+++ b/qlist.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2007 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.48 2007/11/24 08:11:49 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.49 2008/01/16 16:24:49 solar Exp $
  *
  * Copyright 2005-2007 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2007 Mike Frysinger  - <vapier@gentoo.org>
@@ -39,7 +39,7 @@ static const char *qlist_opts_help[] = {
 	/* "query filename for pkgname", */
 	COMMON_OPTS_HELP
 };
-static const char qlist_rcsid[] = "$Id: qlist.c,v 1.48 2007/11/24 08:11:49 solar Exp $";
+static const char qlist_rcsid[] = "$Id: qlist.c,v 1.49 2008/01/16 16:24:49 solar Exp $";
 #define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, lookup_applet_idx("qlist"))
 
 extern char *grab_vdb_item(const char *, const char *, const char *);
@@ -209,7 +209,7 @@ int qlist_main(int argc, char **argv)
 				char *name = pkg_name(argv[i]);
 				snprintf(buf, sizeof(buf), "%s/%s", cat[j]->d_name,
 					 de[x]->d_name);
-				printf("buf=%s:%s\n", buf,grab_vdb_item("SLOT", cat[j]->d_name, de[x]->d_name));
+				/* printf("buf=%s:%s\n", buf,grab_vdb_item("SLOT", cat[j]->d_name, de[x]->d_name)); */
 				if (exact) {
 					if ((atom = atom_explode(buf)) == NULL) {
 						warn("invalid atom %s", buf);