- Diego/BSD says. no, need to change the glob*64* to glob* instead.. (its by default 64 bits) on

2 files changed, 32 insertions, 10 deletions

diff --git a/qlist.c b/qlist.c
index 44e0cedd..99933f4c 100644
--- a/qlist.c
+++ b/qlist.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.34 2006/02/09 06:02:15 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qlist.c,v 1.35 2006/02/19 23:25:09 solar Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
@@ -33,7 +33,7 @@ static const char *qlist_opts_help[] = {
 	/* "query filename for pkgname", */
 	COMMON_OPTS_HELP
 };
-static const char qlist_rcsid[] = "$Id: qlist.c,v 1.34 2006/02/09 06:02:15 solar Exp $";
+static const char qlist_rcsid[] = "$Id: qlist.c,v 1.35 2006/02/19 23:25:09 solar Exp $";
 #define qlist_usage(ret) usage(ret, QLIST_FLAGS, qlist_long_opts, qlist_opts_help, lookup_applet_idx("qlist"))
 
 
@@ -155,9 +155,16 @@ int qlist_main(int argc, char **argv)
 					continue;
 				}
 				pkgname = (verbose ? NULL : atom_explode(de[x]->d_name));
-				if ((qlist_all + just_pkgname) < 2)
-				printf("%s%s/%s%s%s\n", BOLD, cat[j]->d_name, BLUE, 
-				       (pkgname ? pkgname->PN : de[x]->d_name), NORM);
+				if ((qlist_all + just_pkgname) < 2) {
+					char *slot = NULL;
+#if 0
+					if (verbose > 1)
+						slot = grab_vdb_item("SLOT", cat[j]->d_name, de[x]->d_name);
+#endif
+					printf("%s%s/%s%s%s%s%s%s\n", BOLD, cat[j]->d_name, BLUE, 
+					       (pkgname ? pkgname->PN : de[x]->d_name), NORM,
+						slot ? " [" : "", slot ? slot : "", slot ? "]" : "");
+				}
 				if (pkgname)
 					atom_implode(pkgname);
 
@@ -218,8 +225,16 @@ int qlist_main(int argc, char **argv)
 				if (!verbose)
 					ok = 0;
 			strncpy(last, atom->PN, sizeof(last));
-			if (ok)	printf("%s%s/%s%s%s\n", BOLD, atom->CATEGORY, BLUE,
-					(verbose ? atom->P : atom->PN), NORM);
+			if (ok)	{
+				char *slot = NULL;
+#if 0
+				if (verbose > 1)
+					slot = (char *) grab_vdb_item("SLOT", (const char *) atom->CATEGORY, (const char *) atom->P);
+#endif
+				printf("%s%s/%s%s%s%s%s%s\n", BOLD, atom->CATEGORY, BLUE,
+					(verbose ? atom->P : atom->PN), NORM,
+					slot ? "[" : "", slot ? slot : "", slot ? "]" : "");
+			}
 			atom_implode(atom);
 		}
 		free_sets(dups);
diff --git a/qmerge.c b/qmerge.c
index fe60db4d..2520b1e2 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2005-2006 Gentoo Foundation
  * Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.31 2006/02/18 22:33:50 solar Exp $
+ * $Header: /var/cvsroot/gentoo-projects/portage-utils/qmerge.c,v 1.32 2006/02/19 23:25:09 solar Exp $
  *
  * Copyright 2005-2006 Ned Ludd        - <solar@gentoo.org>
  * Copyright 2005-2006 Mike Frysinger  - <vapier@gentoo.org>
@@ -9,8 +9,14 @@
 
 #ifdef APPLET_qmerge
 
-#include <glob.h>
 #include <fnmatch.h>
+#include <glob.h>
+
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__NetBSD__)
+# define glob64_t glob_t
+# define globfree64 globfree
+# define glob64 glob
+#endif /* BSD */
 
 /*
   --nofiles                        don't verify files in package
@@ -45,7 +51,7 @@ static const char *qmerge_opts_help[] = {
         COMMON_OPTS_HELP
 };
 
-static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.31 2006/02/18 22:33:50 solar Exp $";
+static const char qmerge_rcsid[] = "$Id: qmerge.c,v 1.32 2006/02/19 23:25:09 solar Exp $";
 #define qmerge_usage(ret) usage(ret, QMERGE_FLAGS, qmerge_long_opts, qmerge_opts_help, lookup_applet_idx("qmerge"))
 
 char pretend = 0;
@@ -249,6 +255,7 @@ static char *grab_vdb_item(const char *item, const char *CATEGORY, const char *P
 	if ((p = strchr(buf, '\n')) != NULL)
 		*p = 0;
 	fclose(fp);
+	rmspace(buf);
 	return buf;
 }