svn commit: trunk/busybox/archival

aldot at busybox.net aldot at busybox.net
Thu Sep 25 12:18:49 UTC 2008


Author: aldot
Date: 2008-09-25 05:18:49 -0700 (Thu, 25 Sep 2008)
New Revision: 23495

Log:
- add dpkg -l <packagepattern> (Peter Korsgaard)


Modified:
   trunk/busybox/archival/dpkg.c


Changeset:
Modified: trunk/busybox/archival/dpkg.c
===================================================================
--- trunk/busybox/archival/dpkg.c	2008-09-25 12:13:34 UTC (rev 23494)
+++ trunk/busybox/archival/dpkg.c	2008-09-25 12:18:49 UTC (rev 23495)
@@ -25,6 +25,7 @@
  */
 
 #include "libbb.h"
+#include <fnmatch.h>
 #include "unarchive.h"
 
 /* note: if you vary hash_prime sizes be aware,
@@ -1293,7 +1294,7 @@
  * the status_hashtable to retrieve the info. This results in smaller code than
  * scanning the status file. The resulting list, however, is unsorted.
  */
-static void list_packages(void)
+static void list_packages(const char *pattern)
 {
 	int i;
 
@@ -1314,6 +1315,9 @@
 			name_str = name_hashtable[package_hashtable[status_hashtable[i]->package]->name];
 			vers_str = name_hashtable[package_hashtable[status_hashtable[i]->package]->version];
 
+			if (pattern && fnmatch(pattern, name_str, 0))
+				continue;
+
 			/* get abbreviation for status field 1 */
 			s1 = stat_str[0] == 'i' ? 'i' : 'r';
 
@@ -1626,7 +1630,7 @@
 
 	/* if the list action was given print the installed packages and exit */
 	if (opt & OPT_list_installed) {
-		list_packages();
+		list_packages(argv[0]);
 		return EXIT_SUCCESS;
 	}
 




More information about the busybox-cvs mailing list